commit e5db79a8597873472c49d18061f6fd9e6f3e7437 · pyrox.dev/nixpkgs

+1 -14

nixos/modules/installer/cd-dvd/installation-cd-base.nix

···

       7
       7
        
       

     

       8
       8
        
       {

     

       9
       9
        
         imports =

     

       10
       10
       -
           [ ./channel.nix

     

       11
       11
       -
             ./iso-image.nix

     

       10
       10
       +
           [ ./iso-image.nix

     

       12
       11
        
       

     

       13
       12
        
             # Profiles of this basic installation CD.

     

       14
       13
        
             ../../profiles/all-hardware.nix

     
···

       20
       19
        
         isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixosVersion}-${pkgs.stdenv.system}.iso";

     

       21
       20
        
       

     

       22
       21
        
         isoImage.volumeID = substring 0 11 "NIXOS_ISO";

     

       23
       23
       -
       

     

       24
       24
       -
         # Make the installer more likely to succeed in low memory

     

       25
       25
       -
         # environments.  The kernel's overcommit heustistics bite us

     

       26
       26
       -
         # fairly often, preventing processes such as nix-worker or

     

       27
       27
       -
         # download-using-manifests.pl from forking even if there is

     

       28
       28
       -
         # plenty of free memory.

     

       29
       29
       -
         boot.kernel.sysctl."vm.overcommit_memory" = "1";

     

       30
       30
       -
       

     

       31
       31
       -
         # To speed up installation a little bit, include the complete stdenv

     

       32
       32
       -
         # in the Nix store on the CD.  Archive::Cpio is needed for the

     

       33
       33
       -
         # initrd builder.  nixos-artwork is needed for the GRUB background.

     

       34
       34
       -
         isoImage.storeContents = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio pkgs.nixos-artwork ];

     

       35
       22
        
       

     

       36
       23
        
         # EFI booting

     

       37
       24
        
         isoImage.makeEfiBootable = true;

+1 -4

nixos/modules/installer/cd-dvd/installation-cd-minimal.nix

···

       1
       1
        
       # This module defines a small NixOS installation CD.  It does not

     

       2
       2
        
       # contain any graphical stuff.

     

       3
       3
        
       

     

       4
       4
       -
       { config, pkgs, lib, ... }:

     

       4
       4
       +
       { config, lib, ... }:

     

       5
       5
        
       

     

       6
       6
        
       {

     

       7
       7
        
         imports =

     

       8
       8
        
           [ ./installation-cd-base.nix

     

       9
       9
        
             ../../profiles/minimal.nix

     

       10
       10
        
           ];

     

       11
       11
       -
       

     

       12
       12
       -
         # Enable in installer, even if minimal profile disables it

     

       13
       13
       -
         services.nixosManual.enable = lib.mkOverride 999 true;

     

       14
       11
        
       }

+21 -2

nixos/modules/profiles/installation-device.nix

···

       1
       1
        
       # Provide a basic configuration for installation devices like CDs.

     

       2
       2
       -
       { config, lib, ... }:

     

       2
       2
       +
       { config, pkgs, lib, ... }:

     

       3
       3
        
       

     

       4
       4
        
       with lib;

     

       5
       5
        
       

     
···

       13
       13
        
             # Allow "nixos-rebuild" to work properly by providing

     

       14
       14
        
             # /etc/nixos/configuration.nix.

     

       15
       15
        
             ./clone-config.nix

     

       16
       16
       +
       

     

       17
       17
       +
             # Include a copy of Nixpkgs so that nixos-install works out of

     

       18
       18
       +
             # the box.

     

       19
       19
       +
             ../installer/cd-dvd/channel.nix

     

       16
       20
        
           ];

     

       17
       21
        
       

     

       18
       22
        
         config = {

     

       19
       23
        
       

     

       24
       24
       +
           # Enable in installer, even if the minimal profile disables it.

     

       25
       25
       +
           services.nixosManual.enable = mkForce true;

     

       26
       26
       +
       

     

       20
       27
        
           # Show the manual.

     

       21
       28
        
           services.nixosManual.showManual = true;

     

       22
       29
        
       

     
···

       43
       50
        
           systemd.services.sshd.wantedBy = mkOverride 50 [];

     

       44
       51
        
       

     

       45
       52
        
           # Enable wpa_supplicant, but don't start it by default.

     

       46
       46
       -
           networking.wireless.enable = true;

     

       53
       53
       +
           networking.wireless.enable = mkDefault true;

     

       47
       54
        
           jobs.wpa_supplicant.startOn = mkOverride 50 "";

     

       48
       55
        
       

     

       49
       56
        
           # Tell the Nix evaluator to garbage collect more aggressively.

     

       50
       57
        
           # This is desirable in memory-constrained environments that don't

     

       51
       58
        
           # (yet) have swap set up.

     

       52
       59
        
           environment.variables.GC_INITIAL_HEAP_SIZE = "100000";

     

       60
       60
       +
       

     

       61
       61
       +
           # Make the installer more likely to succeed in low memory

     

       62
       62
       +
           # environments.  The kernel's overcommit heustistics bite us

     

       63
       63
       +
           # fairly often, preventing processes such as nix-worker or

     

       64
       64
       +
           # download-using-manifests.pl from forking even if there is

     

       65
       65
       +
           # plenty of free memory.

     

       66
       66
       +
           boot.kernel.sysctl."vm.overcommit_memory" = "1";

     

       67
       67
       +
       

     

       68
       68
       +
           # To speed up installation a little bit, include the complete

     

       69
       69
       +
           # stdenv in the Nix store on the CD.  Archive::Cpio is needed for

     

       70
       70
       +
           # the initrd builder.

     

       71
       71
       +
           system.extraDependencies = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio ];

     

       53
       72
        
       

     

       54
       73
        
         };

     

       55
       74
        
       }