commit 139bfb5b5e8bb345e908a00c31a6d79a73243dee · pyrox.dev/nixpkgs

nixos/modules/system/activation/bootspec.nix

···

       111
       111
        
                   Enable this option if you want to ascertain that your documents are correct

     

       112
       112
        
           '';

     

       113
       113
        
       

     

       114
       114
       +
           package = lib.mkPackageOption pkgs "bootspec" { };

     

       115
       115
       +
       

     

       114
       116
        
           extensions = lib.mkOption {

     

       115
       117
        
             # NOTE(RaitoBezarius): this is not enough to validate: extensions."osRelease" = drv; those are picked up by cue validation.

     

       116
       118
        
             type = lib.types.attrsOf lib.types.anything; # <namespace>: { ...namespace-specific fields }

+1 -1

nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix

···

       47
       47
        
       

     

       48
       48
        
             systemd = config.systemd.package;

     

       49
       49
        
       

     

       50
       50
       -
             bootspecTools = pkgs.bootspec;

     

       50
       50
       +
             bootspecTools = config.boot.bootspec.package;

     

       51
       51
        
       

     

       52
       52
        
             nix = config.nix.package.out;

     

       53
       53

+82 -80

nixos/tests/installer.nix

···

       680
       680
        
               in

     

       681
       681
        
               {

     

       682
       682
        
                 # The configuration of the system used to run "nixos-install".

     

       683
       683
       -
                 installer = {

     

       684
       684
       -
                   imports = [

     

       685
       685
       -
                     commonConfig

     

       686
       686
       -
                     ../modules/profiles/installation-device.nix

     

       687
       687
       -
                     ../modules/profiles/base.nix

     

       688
       688
       -
                     extraInstallerConfig

     

       689
       689
       -
                     ./common/auto-format-root-device.nix

     

       690
       690
       -
                   ];

     

       683
       683
       +
                 installer =

     

       684
       684
       +
                   { config, ... }:

     

       685
       685
       +
                   {

     

       686
       686
       +
                     imports = [

     

       687
       687
       +
                       commonConfig

     

       688
       688
       +
                       ../modules/profiles/installation-device.nix

     

       689
       689
       +
                       ../modules/profiles/base.nix

     

       690
       690
       +
                       extraInstallerConfig

     

       691
       691
       +
                       ./common/auto-format-root-device.nix

     

       692
       692
       +
                     ];

     

       691
       693
        
       

     

       692
       692
       -
                   # In systemdStage1, also automatically format the device backing the

     

       693
       693
       -
                   # root filesystem.

     

       694
       694
       -
                   virtualisation.fileSystems."/".autoFormat = systemdStage1;

     

       694
       694
       +
                     # In systemdStage1, also automatically format the device backing the

     

       695
       695
       +
                     # root filesystem.

     

       696
       696
       +
                     virtualisation.fileSystems."/".autoFormat = systemdStage1;

     

       695
       697
        
       

     

       696
       696
       -
                   boot.initrd.systemd.enable = systemdStage1;

     

       698
       698
       +
                     boot.initrd.systemd.enable = systemdStage1;

     

       697
       699
        
       

     

       698
       698
       -
                   # Use a small /dev/vdb as the root disk for the

     

       699
       699
       -
                   # installer. This ensures the target disk (/dev/vda) is

     

       700
       700
       -
                   # the same during and after installation.

     

       701
       701
       -
                   virtualisation.emptyDiskImages = [ 512 ];

     

       702
       702
       -
                   virtualisation.rootDevice = "/dev/vdb";

     

       700
       700
       +
                     # Use a small /dev/vdb as the root disk for the

     

       701
       701
       +
                     # installer. This ensures the target disk (/dev/vda) is

     

       702
       702
       +
                     # the same during and after installation.

     

       703
       703
       +
                     virtualisation.emptyDiskImages = [ 512 ];

     

       704
       704
       +
                     virtualisation.rootDevice = "/dev/vdb";

     

       703
       705
        
       

     

       704
       704
       -
                   hardware.enableAllFirmware = mkForce false;

     

       705
       705
       -
                   nix.package = selectNixPackage pkgs;

     

       706
       706
       +
                     nix.package = selectNixPackage pkgs;

     

       707
       707
       +
                     hardware.enableAllFirmware = mkForce false;

     

       706
       708
        
       

     

       707
       707
       -
                   # The test cannot access the network, so any packages we

     

       708
       708
       -
                   # need must be included in the VM.

     

       709
       709
       -
                   system.extraDependencies =

     

       710
       710
       -
                     with pkgs;

     

       711
       711
       -
                     [

     

       712
       712
       -
                       bintools

     

       713
       713
       -
                       brotli

     

       714
       714
       -
                       brotli.dev

     

       715
       715
       -
                       brotli.lib

     

       716
       716
       -
                       desktop-file-utils

     

       717
       717
       -
                       docbook5

     

       718
       718
       -
                       docbook_xsl_ns

     

       719
       719
       -
                       kbd.dev

     

       720
       720
       -
                       kmod.dev

     

       721
       721
       -
                       libarchive.dev

     

       722
       722
       -
                       libxml2.bin

     

       723
       723
       -
                       libxslt.bin

     

       724
       724
       -
                       nixos-artwork.wallpapers.simple-dark-gray-bottom

     

       725
       725
       -
                       ntp

     

       726
       726
       -
                       perlPackages.ConfigIniFiles

     

       727
       727
       -
                       perlPackages.FileSlurp

     

       728
       728
       -
                       perlPackages.JSON

     

       729
       729
       -
                       perlPackages.ListCompare

     

       730
       730
       -
                       perlPackages.XMLLibXML

     

       731
       731
       -
                       # make-options-doc/default.nix

     

       732
       732
       -
                       (python3.withPackages (p: [ p.mistune ]))

     

       733
       733
       -
                       shared-mime-info

     

       734
       734
       -
                       sudo

     

       735
       735
       -
                       switch-to-configuration-ng

     

       736
       736
       -
                       texinfo

     

       737
       737
       -
                       unionfs-fuse

     

       738
       738
       -
                       xorg.lndir

     

       739
       739
       -
                       shellcheck-minimal

     

       740
       740
       -
       

     

       741
       741
       -
                       # add curl so that rather than seeing the test attempt to download

     

       742
       742
       -
                       # curl's tarball, we see what it's trying to download

     

       743
       743
       -
                       curl

     

       744
       744
       -
                     ]

     

       745
       745
       -
                     ++ optionals (bootLoader == "grub") (

     

       746
       746
       -
                       let

     

       747
       747
       -
                         zfsSupport = extraInstallerConfig.boot.supportedFilesystems.zfs or false;

     

       748
       748
       -
                       in

     

       709
       709
       +
                     # The test cannot access the network, so any packages we

     

       710
       710
       +
                     # need must be included in the VM.

     

       711
       711
       +
                     system.extraDependencies =

     

       712
       712
       +
                       with pkgs;

     

       749
       713
        
                       [

     

       750
       750
       -
                         (pkgs.grub2.override { inherit zfsSupport; })

     

       751
       751
       -
                         (pkgs.grub2_efi.override { inherit zfsSupport; })

     

       752
       752
       -
                         pkgs.nixos-artwork.wallpapers.simple-dark-gray-bootloader

     

       753
       753
       -
                         pkgs.perlPackages.FileCopyRecursive

     

       754
       754
       -
                         pkgs.perlPackages.XMLSAX

     

       755
       755
       -
                         pkgs.perlPackages.XMLSAXBase

     

       714
       714
       +
                         bintools

     

       715
       715
       +
                         brotli

     

       716
       716
       +
                         brotli.dev

     

       717
       717
       +
                         brotli.lib

     

       718
       718
       +
                         desktop-file-utils

     

       719
       719
       +
                         docbook5

     

       720
       720
       +
                         docbook_xsl_ns

     

       721
       721
       +
                         kbd.dev

     

       722
       722
       +
                         kmod.dev

     

       723
       723
       +
                         libarchive.dev

     

       724
       724
       +
                         libxml2.bin

     

       725
       725
       +
                         libxslt.bin

     

       726
       726
       +
                         nixos-artwork.wallpapers.simple-dark-gray-bottom

     

       727
       727
       +
                         ntp

     

       728
       728
       +
                         perlPackages.ConfigIniFiles

     

       729
       729
       +
                         perlPackages.FileSlurp

     

       730
       730
       +
                         perlPackages.JSON

     

       731
       731
       +
                         perlPackages.ListCompare

     

       732
       732
       +
                         perlPackages.XMLLibXML

     

       733
       733
       +
                         # make-options-doc/default.nix

     

       734
       734
       +
                         (python3.withPackages (p: [ p.mistune ]))

     

       735
       735
       +
                         shared-mime-info

     

       736
       736
       +
                         sudo

     

       737
       737
       +
                         switch-to-configuration-ng

     

       738
       738
       +
                         texinfo

     

       739
       739
       +
                         unionfs-fuse

     

       740
       740
       +
                         xorg.lndir

     

       741
       741
       +
                         shellcheck-minimal

     

       742
       742
       +
       

     

       743
       743
       +
                         # add curl so that rather than seeing the test attempt to download

     

       744
       744
       +
                         # curl's tarball, we see what it's trying to download

     

       745
       745
       +
                         curl

     

       746
       746
       +
                       ]

     

       747
       747
       +
                       ++ optionals (bootLoader == "grub") (

     

       748
       748
       +
                         let

     

       749
       749
       +
                           zfsSupport = extraInstallerConfig.boot.supportedFilesystems.zfs or false;

     

       750
       750
       +
                         in

     

       751
       751
       +
                         [

     

       752
       752
       +
                           (pkgs.grub2.override { inherit zfsSupport; })

     

       753
       753
       +
                           (pkgs.grub2_efi.override { inherit zfsSupport; })

     

       754
       754
       +
                           pkgs.nixos-artwork.wallpapers.simple-dark-gray-bootloader

     

       755
       755
       +
                           pkgs.perlPackages.FileCopyRecursive

     

       756
       756
       +
                           pkgs.perlPackages.XMLSAX

     

       757
       757
       +
                           pkgs.perlPackages.XMLSAXBase

     

       758
       758
       +
                         ]

     

       759
       759
       +
                       )

     

       760
       760
       +
                       ++ optionals (bootLoader == "systemd-boot") [

     

       761
       761
       +
                         pkgs.zstd.bin

     

       762
       762
       +
                         pkgs.mypy

     

       763
       763
       +
                         config.boot.bootspec.package

     

       756
       764
        
                       ]

     

       757
       757
       -
                     )

     

       758
       758
       -
                     ++ optionals (bootLoader == "systemd-boot") [

     

       759
       759
       -
                       pkgs.zstd.bin

     

       760
       760
       -
                       pkgs.mypy

     

       761
       761
       -
                       pkgs.bootspec

     

       762
       762
       -
                     ]

     

       763
       763
       -
                     ++ optionals clevisTest [ pkgs.klibc ]

     

       764
       764
       -
                     ++ optional systemdStage1 pkgs.chroot-realpath;

     

       765
       765
       +
                       ++ optionals clevisTest [ pkgs.klibc ]

     

       766
       766
       +
                       ++ optional systemdStage1 pkgs.chroot-realpath;

     

       765
       767
        
       

     

       766
       766
       -
                   nix.settings = {

     

       767
       767
       -
                     substituters = mkForce [ ];

     

       768
       768
       -
                     hashed-mirrors = null;

     

       769
       769
       -
                     connect-timeout = 1;

     

       768
       768
       +
                     nix.settings = {

     

       769
       769
       +
                       substituters = mkForce [ ];

     

       770
       770
       +
                       hashed-mirrors = null;

     

       771
       771
       +
                       connect-timeout = 1;

     

       772
       772
       +
                     };

     

       770
       773
        
                   };

     

       771
       771
       -
                 };

     

       772
       774
        
       

     

       773
       775
        
                 target = {

     

       774
       776
        
                   imports = [ commonConfig ];