Skip to content

18.09: backport nix 2.1.1 -> 2.1.2 -> 2.1.3 #49820

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
Merged
merged 2 commits into from
Nov 7, 2018
Merged

18.09: backport nix 2.1.1 -> 2.1.2 -> 2.1.3 #49820

merged 2 commits into from
Nov 7, 2018
+6 −6

Conversation

srhb
Copy link
Contributor

@srhb srhb commented Nov 6, 2018

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 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.

Sorry, something went wrong.

@edolstra @srhb
nix: 2.1.1 -> 2.1.2
4a03292 
(cherry picked from commit 869f615)
@edolstra @srhb
nix: 2.1.2 -> 2.1.3
9f2e2ee 
(cherry picked from commit 2c9265c)
@srhb srhb requested a review from samueldr November 6, 2018 11:17
@srhb
Copy link
Contributor Author

srhb commented Nov 6, 2018

@GrahamcOfBorg build nix

@GrahamcOfBorg GrahamcOfBorg added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Nov 6, 2018
@ElvishJerricco
Copy link
Contributor

The last time I tried bumping Nix on my system, I had problems with nix-plugins. It would build fine, but it'd fail to link as a --plugin-files at runtime. Is there a test in nixpkgs we can have ofborg run?

@srhb
Copy link
Contributor Author

srhb commented Nov 6, 2018

I don't think any of the tests use plugins, currently.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: nix

Partial log (click to expand)

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]
running test tests/plugins.sh... [PASS]
running test tests/search.sh... [PASS]
running test tests/nix-copy-ssh.sh... [PASS]
All tests succeeded
/nix/store/jcn4livg4hf39jmz6pb032m8b85k9k7m-nix-2.1.3

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: nix

Partial log (click to expand)

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]
running test tests/plugins.sh... [PASS]
running test tests/search.sh... [PASS]
running test tests/nix-copy-ssh.sh... [PASS]
All tests succeeded
/nix/store/s0mdf0rlzhqjl50zx94izbh458l70qqb-nix-2.1.3

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: nix

Partial log (click to expand)

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]
running test tests/plugins.sh... [PASS]
running test tests/search.sh... [PASS]
running test tests/nix-copy-ssh.sh... [PASS]
All tests succeeded
/nix/store/jvpmnmkknxa2hg7cxc62nqx8h7pj4x24-nix-2.1.3

@domenkozar
Copy link
Member

afaik @shlevy was fixing that at nixcon

@ElvishJerricco
Copy link
Contributor

ElvishJerricco commented Nov 6, 2018 •
edited
Loading

Hm, seems to work:

$ export NIX_PATH=nixpkgs=https://github.com/NixOS/nixpkgs/archive/9f2e2ee638700fe3b50c17caa9ab25de7e4d3018.tar.gz
$ plugins=$(nix-build --no-out-link "<nixpkgs>" -A nix-plugins)
$ nix run nixpkgs.nix -c nix eval --plugin-files $plugins/lib/nix/plugins '(builtins.extraBuiltins)'
null

@shlevy
Copy link
Member

shlevy commented Nov 6, 2018

@domenkozar I fixed it for master, but it wasn't broken on release-18.09. I can backport the fix if it's broken here?

@samueldr
Copy link
Member

samueldr commented Nov 7, 2018

Verified nix-plugins works using --plugin-files here.

@samueldr samueldr merged commit cf597f0 into NixOS:release-18.09 Nov 7, 2018
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: nix

Partial log (click to expand)

these paths will be fetched (1.64 MiB download, 8.41 MiB unpacked):
  /nix/store/3779bjkb6jl54gq8cilp4i3k9xj896jj-nix-2.1.3-man
  /nix/store/jcn4livg4hf39jmz6pb032m8b85k9k7m-nix-2.1.3
copying path '/nix/store/3779bjkb6jl54gq8cilp4i3k9xj896jj-nix-2.1.3-man' from 'https://cache.nixos.org'...
warning: SQLite database '/nix/var/nix/db/db.sqlite' is busy
copying path '/nix/store/jcn4livg4hf39jmz6pb032m8b85k9k7m-nix-2.1.3' from 'https://cache.nixos.org'...
/nix/store/jcn4livg4hf39jmz6pb032m8b85k9k7m-nix-2.1.3

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: nix

Partial log (click to expand)

these paths will be fetched (1.70 MiB download, 8.26 MiB unpacked):
  /nix/store/jvpmnmkknxa2hg7cxc62nqx8h7pj4x24-nix-2.1.3
  /nix/store/ryhy1px5dj85jahvali407x0r15ncwjk-nix-2.1.3-man
copying path '/nix/store/ryhy1px5dj85jahvali407x0r15ncwjk-nix-2.1.3-man' from 'https://cache.nixos.org'...
copying path '/nix/store/jvpmnmkknxa2hg7cxc62nqx8h7pj4x24-nix-2.1.3' from 'https://cache.nixos.org'...
/nix/store/jvpmnmkknxa2hg7cxc62nqx8h7pj4x24-nix-2.1.3

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: nix

Partial log (click to expand)

/nix/store/s0mdf0rlzhqjl50zx94izbh458l70qqb-nix-2.1.3

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@samueldr samueldr

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 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
7 participants
@srhb @ElvishJerricco @GrahamcOfBorg @domenkozar @shlevy @samueldr @edolstra