···

       
78
       
78
       
 
       
          HOME = "/root";

     

       
79
       
79
       
 
       
        };

     

       
80
       
80
       
 
       


     

       
81
       
81
       
-
       
      path = [ pkgs.gnutar pkgs.xz.bin config.nix.package ];

     

       
81
       
81
       
+
       
      path = [ pkgs.gnutar pkgs.xz.bin config.nix.package.out ];

     

       
82
       
82
       
 
       


     

       
83
       
83
       
 
       
      script = ''

     

       
84
       
84
       
 
       
        ${config.system.build.nixos-rebuild}/bin/nixos-rebuild switch ${toString cfg.flags}

     

···

       
271
       
271
       
 
       
if [ -n "$buildNix" ]; then

     

       
272
       
272
       
 
       
    echo "building Nix..." >&2

     

       
273
       
273
       
 
       
    nixDrv=

     

       
274
       
274
       
-
       
    if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A config.nix.package "${extraBuildFlags[@]}")"; then

     

       
274
       
274
       
+
       
    if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then

     

       
275
       
275
       
 
       
        if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A nixFallback "${extraBuildFlags[@]}")"; then

     

       
276
       
276
       
 
       
            if ! nixDrv="$(nix-instantiate '<nixpkgs>' --add-root $tmpDir/nix.drv --indirect -A nix "${extraBuildFlags[@]}")"; then

     

       
277
       
277
       
 
       
                nixStorePath="$(prebuiltNix "$(uname -m)")"

     

···

       
22
       
22
       
 
       
    src = ./nixos-install.sh;

     

       
23
       
23
       
 
       


     

       
24
       
24
       
 
       
    inherit (pkgs) perl pathsFromGraph;

     

       
25
       
25
       
-
       
    nix = config.nix.package;

     

       
25
       
25
       
+
       
    nix = config.nix.package.out;

     

       
26
       
26
       
 
       


     

       
27
       
27
       
 
       
    nixClosure = pkgs.runCommand "closure"

     

       
28
       
28
       
-
       
      { exportReferencesGraph = ["refs" config.nix.package]; }

     

       
28
       
28
       
+
       
      { exportReferencesGraph = ["refs" config.nix.package.out]; }

     

       
29
       
29
       
 
       
      "cp refs $out";

     

       
30
       
30
       
 
       
  };

     

       
31
       
31
       
 
       


     

       
32
       
32
       
 
       
  nixos-rebuild = makeProg {

     

       
33
       
33
       
 
       
    name = "nixos-rebuild";

     

       
34
       
34
       
 
       
    src = ./nixos-rebuild.sh;

     

       
35
       
35
       
-
       
    nix = config.nix.package;

     

       
35
       
35
       
+
       
    nix = config.nix.package.out;

     

       
36
       
36
       
 
       
  };

     

       
37
       
37
       
 
       


     

       
38
       
38
       
 
       
  nixos-generate-config = makeProg {

     

···

       
6
       
6
       
 
       


     

       
7
       
7
       
 
       
  cfg = config.nix;

     

       
8
       
8
       
 
       


     

       
9
       
9
       
-
       
  nix = cfg.package;

     

       
9
       
9
       
+
       
  nix = cfg.package.out;

     

       
10
       
10
       
 
       


     

       
11
       
11
       
 
       
  makeNixBuildUser = nr:

     

       
12
       
12
       
 
       
    { name = "nixbld${toString nr}";

     

···

       
50
       
50
       
 
       
      after = [ "network.target" ];

     

       
51
       
51
       
 
       
      wantedBy = [ "multi-user.target" ];

     

       
52
       
52
       
 
       


     

       
53
       
53
       
-
       
      path = [ config.nix.package pkgs.bzip2.bin ];

     

       
53
       
53
       
+
       
      path = [ config.nix.package.out pkgs.bzip2.bin ];

     

       
54
       
54
       
 
       
      environment.NIX_REMOTE = "daemon";

     

       
55
       
55
       
 
       
      environment.NIX_SECRET_KEY_FILE = cfg.secretKeyFile;

     

       
56
       
56
       
 
       


     

···

       
14
       
14
       
 
       


     

       
15
       
15
       
 
       
    inherit (pkgs) python gummiboot;

     

       
16
       
16
       
 
       


     

       
17
       
17
       
-
       
    nix = config.nix.package;

     

       
17
       
17
       
+
       
    nix = config.nix.package.out;

     

       
18
       
18
       
 
       


     

       
19
       
19
       
 
       
    timeout = if cfg.timeout != null then cfg.timeout else "";

     

       
20
       
20