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

Nix2 on 17.09 #35468

Merged
merged 3 commits into from Feb 24, 2018
Merged

Nix2 on 17.09 #35468

merged 3 commits into from Feb 24, 2018

Conversation

obadz
Copy link
Contributor

@obadz obadz commented Feb 24, 2018 •
edited

Motivation for this change

Wanted to play with Nix 2.0 on 17.09. In case anybody else wants to, just need to add this to your NixOS configuration.nix

{
  nix.package = pkgs.nixStable2;
}
Things done
  • 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.

edolstra and others added 3 commits February 24, 2018 12:27
@edolstra @obadz
nix-daemon.nix: Updates for Nix 2.0
de02b5e 
* The environment variables NIX_CONF_DIR, NIX_BUILD_HOOK and
  NIX_REMOTE are no longer needed.

* A /bin/sh (from busybox) is provided by default in sandboxes.

* Various options were renamed.

(cherry picked from commit 700e21d)
@edolstra @obadz
nixUnstable: 1.12pre5873_b76e282d -> 2.0pre5889_c287d731
fd16136 
(cherry picked from commit 75a2028)
@obadz
nix: add nixStable2
0b2a32e
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

running test tests/fetchGit.sh... [SKIP]
running test tests/fetchMercurial.sh... [SKIP]
running test tests/signing.sh... [PASS]
running test tests/run.sh... [PASS]
running test tests/brotli.sh... [PASS]
running test tests/pure-eval.sh... [PASS]
running test tests/check.sh... [PASS]
All tests succeeded
/nix/store/8bn6hwb4i7qb77mglv627xqwlz01rwql-nix-1.11.16
/nix/store/5srnd5qynsq4af1z95y14cxlb138qmsj-nix-2.0pre5889_c287d731

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

running test tests/fetchGit.sh... [SKIP]
running test tests/fetchMercurial.sh... [SKIP]
running test tests/signing.sh... [PASS]
running test tests/run.sh... [PASS]
running test tests/brotli.sh... [PASS]
running test tests/pure-eval.sh... [PASS]
running test tests/check.sh... [PASS]
All tests succeeded
/nix/store/ny62xjh4jysdnw0pfpk52d1crvrr92vd-nix-1.11.16
/nix/store/n1zz8cx0c1mv7qdm9bfm29p2xmx50h2f-nix-2.0pre5889_c287d731

@copumpkin copumpkin mentioned this pull request Feb 24, 2018
Merged
zimbatm
zimbatm reviewed Feb 24, 2018
View reviewed changes
pkgs/tools/package-management/nix/default.nix
@@ -39,23 +39,23 @@ let
inherit name src;
version = lib.getVersion name;

is112 = lib.versionAtLeast version "1.12pre";
is20 = lib.versionAtLeast version "2.0pre";
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure if this needs to be changed. 2.0 is bigger than 1.12 right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is a commit I merely cherry-picked from master :)

@zimbatm zimbatm merged commit 84201ff into NixOS:release-17.09 Feb 24, 2018
@obadz obadz deleted the nix2-on-17.09 branch December 24, 2018 00:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zimbatm zimbatm zimbatm left review comments

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@obadz @GrahamcOfBorg @zimbatm @edolstra