Switch to Nix 2.0 #34636

edolstra · Feb 5, 2018

Hopefully we can switch to Nix 2.0 for NixOS 18.03. Nix 2.0 should be released in the next few weeks. This PR makes 2.0 the default (by temporarily pointing nix to nixUnstable) and updates nixos-install to work with it. It also adds a command nixos-enter that factors out the functionality of nixos-install --chroot.

Do these installer changes also fix #27307 ?

dezgeg · Feb 7, 2018

Do these installer changes also fix #27307 ?

Mic92 · Feb 9, 2018

Mic92 reviewed Feb 9, 2018

View changes

Mic92 · Feb 9, 2018

nixos/modules/installer/tools/nixos-enter.sh

+
+# Run the activation script. Set $LOCALE_ARCHIVE to supress some Perl locale warnings.
+LOCALE_ARCHIVE=$system/sw/lib/locale/locale-archive chroot "$mountPoint" "$system/activate" >&2 || true
+


Bind mounting /etc/resolv.conf would be nice to have, if this tool is supposed to be a general-purpose tool.

Yeah that would be nice.

dtzWill · Feb 22, 2018

Looks like some copying oversight here:

sha256 hopefully didn't change
perl-bindings probably want to be using nix1 not nixStable, although maybe not.

dtzWill · Feb 22, 2018

dtzWill reviewed Feb 22, 2018

View changes

dtzWill · Feb 22, 2018

pkgs/tools/package-management/nix/default.nix

@@ -155,7 +155,7 @@ in rec {
    name = "nix-1.11.16";
    src = fetchurl {
      url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "7024d327314bf92c1d3e6cccd944929828a44b24093954036bfb0115a92f5a14";
+      sha256 = "0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c";
    };
  }) // { perl-bindings = nixStable; };


Not to nag, but just checking: is this intended to use perl bindings from nixStable (nix 2)?

@dtzWill Thanks, fixed.

edolstra · Feb 22, 2018

@dtzWill Thanks, fixed.

@dezgeg Yes, the entire build is done in the target filesystem.

edolstra · Feb 22, 2018

@dezgeg Yes, the entire build is done in the target filesystem.

Jobset: https://hydra.nixos.org/jobset/nixos/nix-2.0

edolstra · Feb 22, 2018

Jobset: https://hydra.nixos.org/jobset/nixos/nix-2.0

kballard · Feb 23, 2018

kballard reviewed Feb 23, 2018

View changes

kballard · Feb 23, 2018

pkgs/tools/package-management/nix/default.nix

+      url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
+      sha256 = "7024d327314bf92c1d3e6cccd944929828a44b24093954036bfb0115a92f5a14";
+    };
+  }) // { perl-bindings = perl-bindings { nix = nixStable; }; };


I thought Nix 2.0 removed the dependency on Perl?

It does, the perl bindings are for using Nix from perl. Previously nix utilities and such were themselves implemented in perl, which is no longer the case.

Also relevant for 17.09: #35468

copumpkin · Feb 24, 2018

Also relevant for 17.09: #35468

copumpkin · Feb 27, 2018

copumpkin reviewed Feb 27, 2018

View changes

copumpkin · Feb 27, 2018

nixos/modules/installer/tools/nixos-install.sh

+# Copy the NixOS/Nixpkgs sources to the target as the initial contents
+# of the NixOS channel.
+if [[ -z $noChannelCopy ]]; then
+    if [[ -z $channelPath ]]; then


Ooh, does this make the channel optional? I was just thinking of adding that feature to make-disk-image.nix, since it's quite annoying in many situations.

Well, it was already optional since we had the --no-channel-copy flag.

Oh I guess I just haven't exposed that in the disk image machinery. I'll probably take a look after this is merged.

Looks like the hydra job (and of borg) have passed it?!?!?!

Ericson2314 · Feb 27, 2018

Looks like the hydra job (and of borg) have passed it?!?!?!

@vcunat Jobset is all green now so this should be good to merge.

edolstra · Feb 28, 2018

@vcunat Jobset is all green now so this should be good to merge.

shlevy · Mar 2, 2018

shlevy approved these changes Mar 2, 2018

View changes

🚢

....did @vcunat want to have a final say on this, or @edolstra did you just ping him as one of the release managers?

Ericson2314 · Mar 2, 2018

....did @vcunat want to have a final say on this, or @edolstra did you just ping him as one of the release managers?

Yeah, it should be up to the release managers.

edolstra · Mar 2, 2018

Yeah, it should be up to the release managers.

If you feel it's ready, I believe you can go along. I haven't found time to really read the changes yet.

vcunat · Mar 2, 2018

If you feel it's ready, I believe you can go along. I haven't found time to really read the changes yet.

I haven't had a chance to test the image building changes yet, but don't let me hold you up. If something goes wrong, I'll fix it or talk to you 😄

copumpkin · Mar 2, 2018

I haven't had a chance to test the image building changes yet, but don't let me hold you up. If something goes wrong, I'll fix it or talk to you 😄

Now that the builds are performed in the target store, should it be documented that to have /tmp for the build also in the target filesystem, the user should set TMPDIR? (Or do I misunderstand the situation?)

7c6f434c · Mar 2, 2018

Now that the builds are performed in the target store, should it be documented that to have /tmp for the build also in the target filesystem, the user should set TMPDIR? (Or do I misunderstand the situation?)

vcunat · Mar 3, 2018

vcunat reviewed Mar 3, 2018

View changes

vcunat · Mar 3, 2018

pkgs/tools/package-management/nix/default.nix

@@ -116,14 +116,22 @@ in rec {

  nix = nixStable;

-  nixStable = (common rec {
+  nix1 = (common rec {
    name = "nix-1.11.16";
    src = fetchurl {
      url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
      sha256 = "0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c";
    };
  }) // { perl-bindings = nixStable; };


@edolstra: is it intentional that perl-bindings for nix1 ~~come from~~ are nix2?

Well, I see it's wrong, as nixStable itself has no perl stuff inside, but I still don't know surely if it should be nixStable.perl-bindings or perl-bindings { nix = nix1; }.

Yeah that looks like a mistake. That isn't even Nix 2's perl bindings.

vcunat · Mar 3, 2018

vcunat approved these changes Mar 3, 2018

View changes

The binding issue seems a nitpick, really. It's only referenced by hydra and that seems unlikely to be used with nix1 anymore...

I can't see any other problem.

^^ hehe, GitHub confusing people again. I have reported such case to them once or twice during the past year or two, but apparently it still happens sometimes.

vcunat · Mar 3, 2018

^^ hehe, GitHub confusing people again. I have reported such case to them once or twice during the past year or two, but apparently it still happens sometimes.

Possibly a problem: #36268

vcunat · Mar 3, 2018

Possibly a problem: #36268

I think these changes caused #38477. Previously, a mount --rbind /sys was done, but no longer, so I bet efivarfs is not getting mounted inside the nixos-enter chroot anymore.

dezgeg · Apr 14, 2018

I think these changes caused #38477. Previously, a mount --rbind /sys was done, but no longer, so I bet efivarfs is not getting mounted inside the nixos-enter chroot anymore.

GrahamcOfBorg added 6.topic: nixos 8.has: documentation 8.has: module (update) labels Feb 5, 2018

FRidh added this to the 18.03 milestone Feb 5, 2018

grahamc added the 9.needs: changelog label Feb 5, 2018

GrahamcOfBorg added 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels Feb 5, 2018

dezgeg referenced this pull request Feb 19, 2018
Open
use overlayfs by default for netboot and iso #35188
4 of 8 tasks complete

nix: 1.11.16 -> 2.0

Verified

This commit was signed with a verified signature.

edolstra Eelco Dolstra

GPG key ID: 8170B4726D7198DE Learn about signing commits

32af695

Doh

Verified

This commit was signed with a verified signature.

edolstra Eelco Dolstra

GPG key ID: 8170B4726D7198DE Learn about signing commits

bae19ef

GrahamcOfBorg added the 8.has: package (new) label Feb 22, 2018

copumpkin referenced this pull request Feb 23, 2018
Closed
Update nixpkgs.nix for Nix 2.0 #35413

edolstra changed the title from [WIP] Switch to Nix 2.0 to Switch to Nix 2.0 Mar 2, 2018

vcunat added 8.has: changelog and removed 9.needs: changelog labels Mar 3, 2018

vcunat closed this Mar 3, 2018

vcunat deleted the nix-2.0 branch Mar 3, 2018

Mic92 merged commit 729d72f into master Mar 3, 2018

romildo referenced this pull request Mar 3, 2018
Merged
a single version attribute for expressions previously using "majorVersion" #36168

vcunat referenced this pull request Mar 3, 2018
Closed
closure-info broken on nixos-rebuild #36268

vcunat referenced this pull request Mar 4, 2018
Closed
Installer builds derivations on host store #27307

YorikSar referenced this pull request Mar 7, 2018
Closed
Can't build 18.03 GCE image on 17.09 system #36417

lheckemann referenced this pull request Mar 9, 2018
Open
nixos-install doesn't appear to idempotently set passwords #36493

NixOS/nixpkgs

Join GitHub today

Switch to Nix 2.0 #34636

Conversation

edolstra commented Feb 5, 2018

edolstra added some commits Feb 5, 2018

GrahamcOfBorg added 6.topic: nixos 8.has: documentation 8.has: module (update) labels Feb 5, 2018

FRidh added this to the 18.03 milestone Feb 5, 2018

grahamc added the 9.needs: changelog label Feb 5, 2018

GrahamcOfBorg added 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels Feb 5, 2018

edolstra added some commits Feb 5, 2018

This comment has been minimized.

dezgeg commented Feb 7, 2018

Mic92 reviewed Feb 9, 2018 View changes

This comment has been minimized.

This comment has been minimized.

dezgeg referenced this pull request Feb 19, 2018

This comment has been minimized.

dtzWill commented on pkgs/tools/package-management/nix/default.nix in 32af695 Feb 22, 2018

dtzWill reviewed Feb 22, 2018 View changes

This comment has been minimized.

edolstra added some commits Feb 22, 2018

This comment has been minimized.

edolstra commented Feb 22, 2018

This comment has been minimized.

edolstra commented Feb 22, 2018

GrahamcOfBorg added the 8.has: package (new) label Feb 22, 2018

This comment has been minimized.

edolstra commented Feb 22, 2018

copumpkin referenced this pull request Feb 23, 2018

kballard reviewed Feb 23, 2018 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

copumpkin commented Feb 24, 2018

edolstra added some commits Feb 27, 2018

copumpkin reviewed Feb 27, 2018 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Ericson2314 commented Feb 27, 2018

This comment has been minimized.

edolstra commented Feb 28, 2018

edolstra changed the title from [WIP] Switch to Nix 2.0 to Switch to Nix 2.0 Mar 2, 2018

shlevy approved these changes Mar 2, 2018 View changes

This comment has been minimized.

Ericson2314 commented Mar 2, 2018 • edited Edited 1 time Ericson2314 edited Mar 2, 2018 (most recent)

This comment has been minimized.

edolstra commented Mar 2, 2018

This comment has been minimized.

vcunat commented Mar 2, 2018

This comment has been minimized.

copumpkin commented Mar 2, 2018

This comment has been minimized.

7c6f434c commented Mar 2, 2018

vcunat reviewed Mar 3, 2018 View changes

This comment has been minimized.

vcunat Mar 3, 2018 • edited Edited 1 time vcunat edited Mar 3, 2018 (most recent)

This comment has been minimized.

This comment has been minimized.

vcunat added some commits Mar 3, 2018

vcunat added 8.has: changelog and removed 9.needs: changelog labels Mar 3, 2018

vcunat approved these changes Mar 3, 2018 View changes

vcunat closed this Mar 3, 2018

vcunat deleted the nix-2.0 branch Mar 3, 2018

Mic92 merged commit 729d72f into master Mar 3, 2018

This comment has been minimized.

vcunat commented Mar 3, 2018

romildo referenced this pull request Mar 3, 2018

vcunat referenced this pull request Mar 3, 2018

This comment has been minimized.

vcunat commented Mar 3, 2018

vcunat referenced this pull request Mar 4, 2018

YorikSar referenced this pull request Mar 7, 2018

lheckemann referenced this pull request Mar 9, 2018

This comment has been minimized.

dezgeg commented Apr 14, 2018

Mic92 reviewed Feb 9, 2018

View changes

dtzWill commented on `pkgs/tools/package-management/nix/default.nix` in `32af695` Feb 22, 2018

dtzWill reviewed Feb 22, 2018

View changes

kballard reviewed Feb 23, 2018

View changes

copumpkin reviewed Feb 27, 2018

View changes

shlevy approved these changes Mar 2, 2018

View changes

Ericson2314 commented Mar 2, 2018 •

edited

Edited 1 time

Ericson2314 edited Mar 2, 2018 (most recent)

vcunat reviewed Mar 3, 2018

View changes

vcunat Mar 3, 2018 •

edited

Edited 1 time

vcunat edited Mar 3, 2018 (most recent)

vcunat approved these changes Mar 3, 2018

View changes

Mic92 merged commit `729d72f` into master Mar 3, 2018