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

nix: 2.3.16 -> 2.4 #144197

Merged
merged 15 commits into from
Nov 9, 2021
Merged

nix: 2.3.16 -> 2.4 #144197

merged 15 commits into from
Nov 9, 2021

Conversation

lovesegfault
Copy link
Member

Motivation for this change

https://discourse.nixos.org/t/nix-2-4-released/15822

I'm keeping the previous release around in the nix_2_3 package. This moves
nix and nixStable to point to nix_2_4 now.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@Synthetica9
Copy link
Member

So that's why I couldn't find the commit that bumped Nix to 2.4

@xaverdh xaverdh mentioned this pull request Nov 2, 2021
Closed
12 tasks
@cdepillabout
Copy link
Member

cc @domenkozar and @roberth for the cachix and hercules-ci changes.

@roberth
Copy link
Member

roberth commented Nov 2, 2021

@cdepillabout Thanks for the ping! The Nix binding packages, haskellPackages.hercules-ci-cnix-*, that are used by Cachix and Hercules CI are prepared for Nix 2.4 compatibility, so they can be switched very very soon, but considering that you've already pinned it to Nix 2.3, it seems best to speed up the Nix update itself and to have a transitional revision of Nixpkgs.
I can take care of that part of the upgrade in a follow-up PR.

@lovesegfault
Copy link
Member Author

Result of nixpkgs-review pr 144197 run on x86_64-linux 1

1 package failed to build:
  • nixos-install-tools
46 packages built:
  • bundix
  • cabal2nix
  • common-updater-scripts
  • crate2nix
  • crystal2nix
  • dep2nix
  • dydisnix
  • fusionInventory
  • go2nix
  • hubstaff
  • libnixxml
  • lispPackages.quicklisp-to-nix
  • lispPackages.quicklisp-to-nix-system-info
  • nix (nixFlakes ,nixStable ,nix_2_4)
  • nix-binary-cache
  • nix-bundle
  • nix-direnv
  • nix-du
  • nix-index
  • nix-pin
  • nix-prefetch
  • nix-prefetch-bzr
  • nix-prefetch-cvs
  • nix-prefetch-docker
  • nix-prefetch-git
  • nix-prefetch-hg
  • nix-prefetch-scripts
  • nix-prefetch-svn
  • nix-serve
  • nix-simple-deploy
  • nix-template
  • nix-update
  • nix-update-source
  • nix_2_3
  • nixos-generators
  • nixos-rebuild
  • nixos-shell
  • nixui
  • nvfetcher
  • prefetch-yarn-deps
  • python38Packages.nix-kernel
  • python39Packages.nix-kernel
  • update-nix-fetchgit
  • vgo2nix
  • vulnix
  • yarn2nix

@lovesegfault
Copy link
Member Author

I think the nixos-install-tools failure is a false-positive, I can build it fine outside of nixpkgs-review

@lovesegfault
Copy link
Member Author

Also, pkgsStatic.nix_2_4 is broken.

@roberth
Copy link
Member

roberth commented Nov 2, 2021

nixos-install-tools false-positive

Mic92/nixpkgs-review#200

@lovesegfault
Copy link
Member Author

Result of nixpkgs-review pr 144197 run on aarch64-linux 1

1 package failed to build:
  • nixos-install-tools
41 packages built:
  • bundix
  • cabal2nix
  • common-updater-scripts
  • crate2nix
  • dep2nix
  • dydisnix
  • fusionInventory
  • go2nix
  • libnixxml
  • lispPackages.quicklisp-to-nix
  • lispPackages.quicklisp-to-nix-system-info
  • nix (nixFlakes ,nixStable ,nix_2_4)
  • nix-binary-cache
  • nix-bundle
  • nix-direnv
  • nix-du
  • nix-index
  • nix-pin
  • nix-prefetch
  • nix-prefetch-bzr
  • nix-prefetch-cvs
  • nix-prefetch-docker
  • nix-prefetch-git
  • nix-prefetch-hg
  • nix-prefetch-scripts
  • nix-prefetch-svn
  • nix-serve
  • nix-simple-deploy
  • nix-template
  • nix-update
  • nix-update-source
  • nix_2_3
  • nixos-generators
  • nixos-rebuild
  • nixos-shell
  • nvfetcher
  • prefetch-yarn-deps
  • update-nix-fetchgit
  • vgo2nix
  • vulnix
  • yarn2nix

@lovesegfault
Copy link
Member Author

Help will be needed to test this on x86_64-darwin and aarch64-darwin since I do not have access to hosts with those arches.

@lovesegfault
Copy link
Member Author

@GrahamcOfBorg eval

@andersk
Copy link
Contributor

andersk commented Nov 2, 2021 •
edited
Loading

See also

@andersk andersk mentioned this pull request Nov 2, 2021
Closed
12 tasks
@Kranzes
Copy link
Member

Kranzes commented Nov 2, 2021 •
edited
Loading

Are we keeping nixFlakes just for backwards compatibility now? Since the default Nix package will now already support flakes.

@lovesegfault
nixpkgs-basic-release-checks: set NIX_STORE_DIR
ca5ecbe 
With nix 2.4 the fact that we set NIX_STATE_DIR, but kept the original
store became a hard error. We work around it here by forcing the use of
a fresh, sandbox-local, store.

See regnat's wonderful analysis for more information:
NixOS/nix#5495 (comment)
@lovesegfault
Copy link
Member Author

lovesegfault commented Nov 9, 2021 •
edited
Loading

Thanks to @regnat the last remaining eval failure has been worked around. For an analysis of the cause and solution see their comment: NixOS/nix#5495 (comment)

@domenkozar domenkozar merged commit a658747 into master Nov 9, 2021
@lovesegfault lovesegfault deleted the nix-2.4 branch November 9, 2021 19:23
@lovesegfault lovesegfault mentioned this pull request Nov 9, 2021
Merged
12 tasks
@roberth
Copy link
Member

roberth commented Nov 9, 2021

I've created an upstream PR to record the breaking change NixOS/nix#5529
Merge seems in order. 👍 🎉

lovesegfault added a commit to lovesegfault/nixpkgs that referenced this pull request Nov 9, 2021
@lovesegfault
rnix-lsp: use nix (2.4)
e654810 
Follow-up to NixOS#144197 since nixUnstable is no longer needed for flake
support.
@lovesegfault lovesegfault mentioned this pull request Nov 9, 2021
Merged
12 tasks
lovesegfault added a commit to lovesegfault/nixpkgs that referenced this pull request Nov 9, 2021
@lovesegfault
nixpkgs-review: use nix (2.4)
a942e10 
Follow-up to NixOS#144197 since nixUnstable is no longer for many new
features.
@lovesegfault lovesegfault mentioned this pull request Nov 9, 2021
Merged
12 tasks
@lovesegfault
Copy link
Member Author

Thanks for everyone who helped test and debug this in the past week, I most definitely could not have gotten this in a mergeable state without all of you pitching in :)

@lovesegfault lovesegfault mentioned this pull request Nov 9, 2021
Merged
7 tasks
lovesegfault added a commit to lovesegfault/home-manager that referenced this pull request Nov 9, 2021
@lovesegfault
direnv.nix-direnv: remove enableFlakes
247d781 
Since NixOS/nixpkgs#144197 flake support is
always available. The upstream `enableFlakes` option is scheduled to be
removed altogether in NixOS/nixpkgs#145236
lovesegfault added a commit to lovesegfault/nixpkgs that referenced this pull request Nov 10, 2021
@lovesegfault
nix-direnv: use nix (2.4) and remove enableFlakes
c03040c 
Follow-up to NixOS#144197 since nixUnstable is no longer needed for flake
support.
@lovesegfault lovesegfault mentioned this pull request Nov 10, 2021
Merged
12 tasks
berbiche pushed a commit to nix-community/home-manager that referenced this pull request Nov 10, 2021
@lovesegfault
direnv.nix-direnv: remove enableFlakes (#2458)
1e5c8e9 
Since NixOS/nixpkgs#144197 flake support is
always available. The upstream `enableFlakes` option is scheduled to be
removed altogether in NixOS/nixpkgs#145236
@roberth
Copy link
Member

roberth commented Nov 10, 2021

For the fix, Eelco suggests --store instead. Did you try that?

@thufschmitt
Copy link
Member

For the fix, Eelco suggests --store instead. Did you try that?

I didn’t try it, but I think this isn’t gonna work, because --store foo will bind-mount foo on top of /nix (so hide $src). --store local?store=$PWD/.store should work, but it’s essentially the same as setting NIX_STORE_DIR

@roberth roberth mentioned this pull request Nov 10, 2021
Merged
12 tasks
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/tweag-nix-dev-update-21/16032/1

@PedroRegisPOAR PedroRegisPOAR mentioned this pull request Nov 16, 2021
Open
@bobby285271 bobby285271 mentioned this pull request Nov 27, 2021
Merged
10 tasks
peterhoeg pushed a commit to peterhoeg/home-manager that referenced this pull request Nov 29, 2021
@lovesegfault @peterhoeg
direnv.nix-direnv: remove enableFlakes (nix-community#2458)
0a0d64a 
Since NixOS/nixpkgs#144197 flake support is
always available. The upstream `enableFlakes` option is scheduled to be
removed altogether in NixOS/nixpkgs#145236
@chkno chkno mentioned this pull request Mar 28, 2022
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@roberth roberth roberth left review comments

@thiagokokada thiagokokada thiagokokada left review comments

@kubukoz kubukoz kubukoz left review comments

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@Atemu Atemu Atemu left review comments

@uri-canva uri-canva uri-canva left review comments

@siraben siraben siraben approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@edolstra edolstra Awaiting requested review from edolstra

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

@expipiplus1 expipiplus1 Awaiting requested review from expipiplus1

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

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

@prusnak prusnak Awaiting requested review from prusnak

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

@nbp nbp Awaiting requested review from nbp

Assignees
No one assigned
Labels
6.topic: haskell 6.topic: nixos 6.topic: python 8.has: changelog 8.has: documentation 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