commit 60f5659dad9ee8dc8b55f5ec814cd50cd6a8ca96 · pyrox.dev/nixpkgs

+3 -3

nixos/lib/make-disk-image.nix

···

       81
       81
        
       

     

       82
       82
        
             # Register the paths in the Nix database.

     

       83
       83
        
             printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \

     

       84
       84
       -
                 chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group ""

     

       84
       84
       +
                 chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group ""

     

       85
       85
        
       

     

       86
       86
        
             # Add missing size/hash fields to the database. FIXME:

     

       87
       87
        
             # exportReferencesGraph should provide these directly.

     

       88
       88
       -
             chroot /mnt ${config.nix.package}/bin/nix-store --verify --check-contents

     

       88
       88
       +
             chroot /mnt ${config.nix.package.out}/bin/nix-store --verify --check-contents

     

       89
       89
        
       

     

       90
       90
        
             # Create the system profile to allow nixos-rebuild to work.

     

       91
       91
       -
             chroot /mnt ${config.nix.package}/bin/nix-env --option build-users-group "" \

     

       91
       91
       +
             chroot /mnt ${config.nix.package.out}/bin/nix-env --option build-users-group "" \

     

       92
       92
        
                 -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}

     

       93
       93
        
       

     

       94
       94
        
             # `nixos-rebuild' requires an /etc/NIXOS.

+1 -1

nixos/modules/installer/cd-dvd/channel.nix

···

       34
       34
        
             if ! [ -e /var/lib/nixos/did-channel-init ]; then

     

       35
       35
        
               echo "unpacking the NixOS/Nixpkgs sources..."

     

       36
       36
        
               mkdir -p /nix/var/nix/profiles/per-user/root

     

       37
       37
       -
               ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels \

     

       37
       37
       +
               ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels \

     

       38
       38
        
                 -i ${channelSources} --quiet --option build-use-substitutes false

     

       39
       39
        
               mkdir -m 0700 -p /root/.nix-defexpr

     

       40
       40
        
               ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels

+2 -2

nixos/modules/installer/cd-dvd/iso-image.nix

···

       364
       364
        
             ''

     

       365
       365
        
               # After booting, register the contents of the Nix store on the

     

       366
       366
        
               # CD in the Nix database in the tmpfs.

     

       367
       367
       -
               ${config.nix.package}/bin/nix-store --load-db < /nix/store/nix-path-registration

     

       367
       367
       +
               ${config.nix.package.out}/bin/nix-store --load-db < /nix/store/nix-path-registration

     

       368
       368
        
       

     

       369
       369
        
               # nixos-rebuild also requires a "system" profile and an

     

       370
       370
        
               # /etc/NIXOS tag.

     

       371
       371
        
               touch /etc/NIXOS

     

       372
       372
       -
               ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system

     

       372
       372
       +
               ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system

     

       373
       373
        
             '';

     

       374
       374
        
       

     

       375
       375
        
           # Add vfat support to the initrd to enable people to copy the

+2 -2

nixos/modules/installer/cd-dvd/sd-image.nix

···

       113
       113
        
               ${pkgs.e2fsprogs}/bin/resize2fs $rootPart

     

       114
       114
        
       

     

       115
       115
        
               # Register the contents of the initial Nix store

     

       116
       116
       -
               ${config.nix.package}/bin/nix-store --load-db < /nix-path-registration

     

       116
       116
       +
               ${config.nix.package.out}/bin/nix-store --load-db < /nix-path-registration

     

       117
       117
        
       

     

       118
       118
        
               # nixos-rebuild also requires a "system" profile and an /etc/NIXOS tag.

     

       119
       119
        
               touch /etc/NIXOS

     

       120
       120
       -
               ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system

     

       120
       120
       +
               ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system

     

       121
       121
        
       

     

       122
       122
        
               # Prevents this from running on later boots.

     

       123
       123
        
               rm -f /nix-path-registration

+2 -2

nixos/modules/installer/cd-dvd/system-tarball.nix

···

       78
       78
        
               # After booting, register the contents of the Nix store on the

     

       79
       79
        
               # CD in the Nix database in the tmpfs.

     

       80
       80
        
               if [ -f /nix-path-registration ]; then

     

       81
       81
       -
                 ${config.nix.package}/bin/nix-store --load-db < /nix-path-registration &&

     

       81
       81
       +
                 ${config.nix.package.out}/bin/nix-store --load-db < /nix-path-registration &&

     

       82
       82
        
                 rm /nix-path-registration

     

       83
       83
        
               fi

     

       84
       84
        
       

     

       85
       85
        
               # nixos-rebuild also requires a "system" profile and an

     

       86
       86
        
               # /etc/NIXOS tag.

     

       87
       87
        
               touch /etc/NIXOS

     

       88
       88
       -
               ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system

     

       88
       88
       +
               ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system

     

       89
       89
        
             '';

     

       90
       90
        
       

     

       91
       91
        
         };

+2 -2

nixos/modules/profiles/docker-container.nix

···

       37
       37
        
             # After booting, register the contents of the Nix store in the Nix

     

       38
       38
        
             # database.

     

       39
       39
        
             if [ -f /nix-path-registration ]; then

     

       40
       40
       -
               ${config.nix.package}/bin/nix-store --load-db < /nix-path-registration &&

     

       40
       40
       +
               ${config.nix.package.out}/bin/nix-store --load-db < /nix-path-registration &&

     

       41
       41
        
               rm /nix-path-registration

     

       42
       42
        
             fi

     

       43
       43
        
       

     

       44
       44
        
             # nixos-rebuild also requires a "system" profile

     

       45
       45
       -
             ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system

     

       45
       45
       +
             ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system

     

       46
       46
        
           '';

     

       47
       47
        
       

     

       48
       48
        
         # Install new init script

+1 -1

nixos/modules/services/misc/nix-gc.nix

···

       52
       52
        
       

     

       53
       53
        
           systemd.services.nix-gc =

     

       54
       54
        
             { description = "Nix Garbage Collector";

     

       55
       55
       -
               script = "exec ${config.nix.package}/bin/nix-collect-garbage ${cfg.options}";

     

       55
       55
       +
               script = "exec ${config.nix.package.out}/bin/nix-collect-garbage ${cfg.options}";

     

       56
       56
        
               startAt = optionalString cfg.automatic cfg.dates;

     

       57
       57
        
             };

     

       58
       58

+1 -1

nixos/modules/services/misc/nix-ssh-serve.nix

···

       41
       41
        
               PermitTTY no

     

       42
       42
        
               PermitTunnel no

     

       43
       43
        
               X11Forwarding no

     

       44
       44
       -
               ForceCommand ${config.nix.package}/bin/nix-store --serve

     

       44
       44
       +
               ForceCommand ${config.nix.package.out}/bin/nix-store --serve

     

       45
       45
        
             Match All

     

       46
       46
        
           '';

     

       47
       47

+2 -2

nixos/modules/virtualisation/azure-image.nix

···

       62
       62
        
       

     

       63
       63
        
                 echo Register the paths in the Nix database.

     

       64
       64
        
                 printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \

     

       65
       65
       -
                     chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group ""

     

       65
       65
       +
                     chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group ""

     

       66
       66
        
       

     

       67
       67
        
                 echo Create the system profile to allow nixos-rebuild to work.

     

       68
       68
       -
                 chroot /mnt ${config.nix.package}/bin/nix-env \

     

       68
       68
       +
                 chroot /mnt ${config.nix.package.out}/bin/nix-env \

     

       69
       69
        
                     -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} --option build-users-group ""

     

       70
       70
        
       

     

       71
       71
        
                 echo nixos-rebuild requires an /etc/NIXOS.

+2 -2

nixos/modules/virtualisation/brightbox-image.nix

···

       62
       62
        
       

     

       63
       63
        
                 # Register the paths in the Nix database.

     

       64
       64
        
                 printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \

     

       65
       65
       -
                     chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group ""

     

       65
       65
       +
                     chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group ""

     

       66
       66
        
       

     

       67
       67
        
                 # Create the system profile to allow nixos-rebuild to work.

     

       68
       68
       -
                 chroot /mnt ${config.nix.package}/bin/nix-env \

     

       68
       68
       +
                 chroot /mnt ${config.nix.package.out}/bin/nix-env \

     

       69
       69
        
                     -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} \

     

       70
       70
        
                     --option build-users-group ""

     

       71
       71

+2 -2

nixos/modules/virtualisation/google-compute-image.nix

···

       66
       66
        
       

     

       67
       67
        
                 # Register the paths in the Nix database.

     

       68
       68
        
                 printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \

     

       69
       69
       -
                     chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group ""

     

       69
       69
       +
                     chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group ""

     

       70
       70
        
       

     

       71
       71
        
                 # Create the system profile to allow nixos-rebuild to work.

     

       72
       72
       -
                 chroot /mnt ${config.nix.package}/bin/nix-env \

     

       72
       72
       +
                 chroot /mnt ${config.nix.package.out}/bin/nix-env \

     

       73
       73
        
                     -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} \

     

       74
       74
        
                     --option build-users-group ""

     

       75
       75

+1 -1

nixos/modules/virtualisation/qemu-vm.nix

···

       403
       403
        
           boot.postBootCommands =

     

       404
       404
        
             ''

     

       405
       405
        
               if [[ "$(cat /proc/cmdline)" =~ regInfo=([^ ]*) ]]; then

     

       406
       406
       -
                 ${config.nix.package}/bin/nix-store --load-db < ''${BASH_REMATCH[1]}

     

       406
       406
       +
                 ${config.nix.package.out}/bin/nix-store --load-db < ''${BASH_REMATCH[1]}

     

       407
       407
        
               fi

     

       408
       408
        
             '';

     

       409
       409