nixos-install: add support for flakes #95194

ju1m · 2020-08-11T16:02:04Z

Motivation for this change

Use nixos-install with a flake.nix.

Things done

I've just copied code from nixos-rebuild, not sure whether all this is correct.

Add support for --flake and other options like in nixos-rebuild.
Quote variables to please ShellCheck (I hope I've not done any mistake in doing so).
Pass pkgs.nixFlakes's nix prepended on PATH, to be used only when --flake is involved. This avoids adding all nixUnstable's closure to nixos-install.
Pass --experimental-features 'nix-command flakes' to nix when using --flake in nixos-install and nixos-rebuild.
Document --flake.
Fix documentation by using the URI fragment syntax.

worldofpeace · 2020-08-11T17:38:15Z

I just want to note to nixos devs to please not merge this PR without the documentation. I hope that doesn't sound rigid, but I think it's more likely, if this isn't documented in the same PR, to take a significantly longer time to be documented.

vlaci · 2020-08-30T14:50:02Z

IMHO jq should be added to PATH as it had been done for nixos-rebuild

worldofpeace · 2020-08-30T19:33:47Z

@vlaci tools.nix puts jq into PATH and nixos-install is an output of this.

vlaci · 2020-08-30T20:26:42Z

@worldofpeace are you sure? my installer iso built from unstable does not have it by default, and I only see it scoped to nixos-rebuild in tools.nix

worldofpeace · 2020-08-30T20:33:37Z

@worldofpeace are you sure? my installer iso built from unstable does not have it by default, and I only see it scoped to nixos-rebuild in tools.nix

Ooh, I thought you meant for the wrapped PATH for nixos-install, but actually you mean as a utility available in nixos by default. I think that's excessive, and we certainly wouldn't want to undo the wrapping for the tools as that would make them non-hermetic. So I would consider adding jq out of scope for this particular change as jq isn't really a necessary utility outside of these programs that need them.

vlaci · 2020-08-30T20:41:41Z

@worldofpeace are you sure? my installer iso built from unstable does not have it by default, and I only see it scoped to nixos-rebuild in tools.nix

Ooh, I thought you meant for the wrapped PATH for nixos-install, but actually you mean as a utility available in nixos by default. I think that's excessive, and we certainly wouldn't want to undo the wrapping for the tools as that would make them non-hermetic. So I would consider adding jq out of scope for this particular change as jq isn't really a necessary utility outside of these programs that need them.

No, I have meant nixos-install in the first place then I have misunderstood you :)
Anyway, this PR does not add jq in the path for nixos-install and it isn't already there. What am I missing?
It is set for nixos-rebuild in https://github.com/ju1m/nixpkgs/blob/nixos-install/nixos/modules/installer/tools/tools.nix#L34
but is not for nixos-install at https://github.com/ju1m/nixpkgs/blob/nixos-install/nixos/modules/installer/tools/tools.nix#L23

Sorry I have meant to put the links in the first comment but somehow missed it.
Also see the commit that introduced it for nixos-install I thought that this PR should mirror that change too.

worldofpeace · 2020-08-30T20:55:26Z

Oh, lol @vlaci understood.

worldofpeace

@ju1m Can you add pkgs.jq to https://github.com/ju1m/nixpkgs/blob/nixos-install/nixos/modules/installer/tools/tools.nix#L23

Ma27

First of all thanks a lot for your effort!

Tested with tests.installer.simple and on a local tmpfs mounted to /mnt and this seems to work fine overall 👍
I think that it should be somehow ensured that we're actually using a nixUnstable for nixos-install in the case of flake support.
I'd like to have some kind of default behavior in case of flakes (e.g. nixos-install --flake path:/mnt/etc/nixos#default as default behavior if flake.nix exists).
hardware-configuration.nix imports <nixpkgs/nixos/modules/installer/scan/not-detected.nix>. I'm not sure how, but we should somehow take care of this when using flakes.

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

xaverdh · 2020-08-31T04:21:41Z

hardware-configuration.nix imports <nixpkgs/nixos/modules/installer/scan/not-detected.nix>. I'm not sure how, but we should somehow take care of this when using flakes.

By having a module which does whatever detected.nix / not-detected.nix do (which is not a lot currently) depending on a boolean value which nixos-generate-configshould write inhardware-configuration.nix ?

~~**edit**: or by dropping detected.nix / not-detected.nix all together and just flipping hardware.enableRedistributableFirmwareinnixos-generate-config ..~~

Ok never mind, it uses modulesPath anyway these days. You probably meant the case where people already have a generated hardware-configuration.nix.. I guess they can just regenerate it then?

worldofpeace · 2020-08-31T09:04:30Z

For hardware-configuration not detected and anything that wants to use <nixpkgs> we'll have to conditionally change the syntax to like inputs.nixpkgs.nixosModules.notDetected. IIRC at a glance there's a lot of code that would have to be different.

Ma27 · 2020-08-31T10:02:32Z

Ok never mind, it uses modulesPath anyway these days. You probably meant the case where people already have a generated hardware-configuration.nix.. I guess they can just regenerate it then?

You're absolutely right! I actually generated a fresh config in my temporary /mnt mount, but I used the default nixos-generate-config from my 20.03 system for that purpose, so never mind then :)

worldofpeace · 2020-08-31T14:26:15Z

@Ma27 Oh awesome c45295d#diff-14ed97ea0350115b36b0b8d884db5667 no action needed ✨

ju1m · 2020-09-02T02:37:40Z

I've tried to incorporate your feedbacks as I could. Please let me know if something is missing or wrong.

nixos/doc/manual/man-nixos-rebuild.xml

nixos/modules/installer/tools/tools.nix

cole-h

Diff LGTM (did all of my reviewing on IRC).

(Note that a slight difference from previous revisions of this PR is the addition of --experimental-features flags where necessary, so that we don't rely on a nix.conf with the proper settings enabled.)

worldofpeace · 2020-09-04T20:08:59Z

I think there's tests to run here for nixos-install to check nothing broke

cole-h · 2020-09-05T07:02:59Z

@ofborg test installer.simple

(Feel free to check additional installer tests, but I believe this is the simplest (heh) of the bunch that tests nixos-install.)

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

stale, see above

worldofpeace · 2020-09-05T19:30:50Z

So @cole-h cleared up on IRC that my reading skills aren't that great today 🤣

worldofpeace: btw we went over that yesterday -- in a trap, single quotes don't prevent expansion unless the variable is single-quoted inside those single-quotes (iirc)

xaverdh · 2020-09-11T16:01:34Z

I think jq is still missing from

nixpkgs/nixos/modules/installer/tools/tools.nix

Line 25 in 607f5a6

path = makeBinPath [ pkgs.nixUnstable nixos-enter ];

(just stumbled upon this, as jq is not in my default PATH)

worldofpeace · 2020-09-11T17:01:30Z

I think jq is still missing from

nixpkgs/nixos/modules/installer/tools/tools.nix

Line 25 in 607f5a6

path = makeBinPath [ pkgs.nixUnstable nixos-enter ];

(just stumbled upon this, as jq is not in my default PATH)

You're right. I think it just disappeared from the diff at some point.

worldofpeace · 2020-09-11T17:03:25Z

fixed in a39ad85

worldofpeace · 2020-09-11T17:04:29Z

backported to 20.09 281c899

ncfavier · 2020-10-03T12:48:49Z

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

Lines 155 to 157 in c8ccfdb

    
           nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.toplevel" \ 
        
               --extra-substituters "$sub" "${verbosity[@]}" \ 
        
               "${extraBuildFlags[@]}" "${lockFlags[@]}" --out-link "$outLink"

This builds the flake in /nix instead of /mnt/nix, which makes nixos-install run out of memory for me on a live CD.

It doesn't seem like nix build has something like a --store flag, should I open a separate issue?

cole-h · 2020-10-03T17:05:47Z

Actually, all nix commands have a --store flag, because --store ... is shorthand for --option store .... I'll have a PR ready shortly.

EDIT: PR opened: #99493

ju1m force-pushed the nixos-install branch from ce9feeb to 9087779 Compare August 11, 2020 16:22

Ma27 self-requested a review August 11, 2020 17:33

ofborg bot added 6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 labels Aug 11, 2020

worldofpeace previously requested changes Aug 30, 2020

View reviewed changes

Ma27 reviewed Aug 30, 2020

View reviewed changes

nixos/modules/installer/tools/nixos-install.sh Show resolved Hide resolved

nixos/modules/installer/tools/nixos-install.sh Show resolved Hide resolved

ju1m force-pushed the nixos-install branch from 9087779 to 953bca6 Compare September 2, 2020 02:20

ofborg bot added the 8.has: documentation label Sep 2, 2020

jtojnar requested a review from edolstra September 2, 2020 02:52

edolstra reviewed Sep 2, 2020

View reviewed changes

nixos/doc/manual/man-nixos-rebuild.xml Outdated Show resolved Hide resolved

edolstra reviewed Sep 2, 2020

View reviewed changes

nixos/modules/installer/tools/tools.nix Outdated Show resolved Hide resolved

ju1m force-pushed the nixos-install branch 4 times, most recently from d694851 to 4962dd3 Compare September 4, 2020 04:17

nixos-rebuild: do not depend on nix.conf to activate flakes

c6a3a0f

nixos-install: add support for flakes

b03c506

ju1m force-pushed the nixos-install branch from 4962dd3 to b03c506 Compare September 4, 2020 04:57

cole-h approved these changes Sep 4, 2020

View reviewed changes

worldofpeace reviewed Sep 5, 2020

View reviewed changes

nixos/modules/installer/tools/nixos-install.sh Show resolved Hide resolved

worldofpeace approved these changes Sep 5, 2020

View reviewed changes

worldofpeace merged commit d0972c9 into NixOS:master Sep 5, 2020

cole-h mentioned this pull request Oct 3, 2020

nixos-install: use mountpoint as store #99493

Merged

10 tasks

chkno mentioned this pull request Jun 10, 2021

nixos-rebuild: Pass flakes flags when doing local flakes build #126513

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

nixos-install: add support for flakes #95194

nixos-install: add support for flakes #95194

ju1m commented Aug 11, 2020 •

edited

Loading

worldofpeace commented Aug 11, 2020

vlaci commented Aug 30, 2020

worldofpeace commented Aug 30, 2020

vlaci commented Aug 30, 2020

worldofpeace commented Aug 30, 2020

vlaci commented Aug 30, 2020 •

edited

Loading

worldofpeace commented Aug 30, 2020

worldofpeace left a comment

Ma27 left a comment

xaverdh commented Aug 31, 2020 •

edited

Loading

worldofpeace commented Aug 31, 2020

Ma27 commented Aug 31, 2020

worldofpeace commented Aug 31, 2020 •

edited

Loading

ju1m commented Sep 2, 2020

cole-h left a comment

worldofpeace commented Sep 4, 2020

cole-h commented Sep 5, 2020

worldofpeace commented Sep 5, 2020

xaverdh commented Sep 11, 2020

worldofpeace commented Sep 11, 2020

worldofpeace commented Sep 11, 2020

worldofpeace commented Sep 11, 2020

ncfavier commented Oct 3, 2020

cole-h commented Oct 3, 2020 •

edited

Loading

nixos-install: add support for flakes #95194

nixos-install: add support for flakes #95194

Conversation

ju1m commented Aug 11, 2020 • edited Loading

Motivation for this change

Things done

worldofpeace commented Aug 11, 2020

vlaci commented Aug 30, 2020

worldofpeace commented Aug 30, 2020

vlaci commented Aug 30, 2020

worldofpeace commented Aug 30, 2020

vlaci commented Aug 30, 2020 • edited Loading

worldofpeace commented Aug 30, 2020

worldofpeace left a comment

Choose a reason for hiding this comment

Ma27 left a comment

Choose a reason for hiding this comment

xaverdh commented Aug 31, 2020 • edited Loading

worldofpeace commented Aug 31, 2020

Ma27 commented Aug 31, 2020

worldofpeace commented Aug 31, 2020 • edited Loading

ju1m commented Sep 2, 2020

cole-h left a comment

Choose a reason for hiding this comment

worldofpeace commented Sep 4, 2020

cole-h commented Sep 5, 2020

worldofpeace commented Sep 5, 2020

xaverdh commented Sep 11, 2020

worldofpeace commented Sep 11, 2020

worldofpeace commented Sep 11, 2020

worldofpeace commented Sep 11, 2020

ncfavier commented Oct 3, 2020

cole-h commented Oct 3, 2020 • edited Loading

ju1m commented Aug 11, 2020 •

edited

Loading

vlaci commented Aug 30, 2020 •

edited

Loading

xaverdh commented Aug 31, 2020 •

edited

Loading

worldofpeace commented Aug 31, 2020 •

edited

Loading

cole-h commented Oct 3, 2020 •

edited

Loading