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

linux bootstrap: remove assertion failure from dev, fixes 'nix eval' #39562

Merged
merged 1 commit into from Apr 26, 2018
Merged

linux bootstrap: remove assertion failure from dev, fixes 'nix eval' #39562

merged 1 commit into from Apr 26, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Apr 26, 2018

As in:

$ nix eval -f . bash

Also remove the glibc propagation inherit that made these necessary,
stages handle propagating libc themselves (apparently) and
AFAICT no hashes are changed as a result of this.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

This doesn't seem to change hashes or break anything,
testing less-common confgurations appreciated.

@dtzWill
linux bootstrap: remove assertion failure from dev, fixes 'nix eval'
f31b147 
As in:

$ nix eval -f . bash

Also remove the glibc propagation inherit that made these necessary,
stages handle propagating libc themselves (apparently) and
AFAICT no hashes are changed as a result of this.
@dtzWill
Copy link
Member Author

dtzWill commented Apr 26, 2018

(not sure who should review this, github chose you! :D)

@GrahamcOfBorg GrahamcOfBorg added the 6.topic: stdenv Standard environment label Apr 26, 2018
Ericson2314
Ericson2314 approved these changes Apr 26, 2018
View reviewed changes
Copy link
Member

@Ericson2314 Ericson2314 left a comment

Choose a reason for hiding this comment

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

Yay! Now stdenv.glibc is used elsewhere and I forget where it comes from, but that should go anyways. Definitely want to ofborg this, but then let it rip!

@Ericson2314 Ericson2314 merged commit 893bf70 into NixOS:staging Apr 26, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ericson2314 Ericson2314 Ericson2314 approved these changes

Assignees
No one assigned
Labels
6.topic: stdenv Standard environment 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@dtzWill @Ericson2314 @GrahamcOfBorg