commit 1f89aa6c7f2f16c8c0834cfa65b8484fecd72af3 · pyrox.dev/nixpkgs

+1 -1

nixos/release-combined.nix

···

       63
       63
        
               (all nixos.tests.installer.btrfsSimple)

     

       64
       64
        
               (all nixos.tests.installer.btrfsSubvols)

     

       65
       65
        
               (all nixos.tests.installer.btrfsSubvolDefault)

     

       66
       66
       -
               (all nixos.tests.boot.bootBiosCdrom)

     

       66
       66
       +
               (all nixos.tests.boot.biosCdrom)

     

       67
       67
        
               (all nixos.tests.ipv6)

     

       68
       68
        
               (all nixos.tests.kde4)

     

       69
       69
        
               #(all nixos.tests.lightdm)

+4 -4

nixos/tests/boot.nix

···

       30
       30
        
               '';

     

       31
       31
        
           };

     

       32
       32
        
       in {

     

       33
       33
       -
           bootBiosCdrom = makeBootTest "bios-cdrom" ''

     

       33
       33
       +
           biosCdrom = makeBootTest "bios-cdrom" ''

     

       34
       34
        
               cdrom => glob("${iso}/iso/*.iso")

     

       35
       35
        
             '';

     

       36
       36
       -
           bootBiosUsb = makeBootTest "bios-usb" ''

     

       36
       36
       +
           biosUsb = makeBootTest "bios-usb" ''

     

       37
       37
        
               usb => glob("${iso}/iso/*.iso")

     

       38
       38
        
             '';

     

       39
       39
       -
           bootUefiCdrom = makeBootTest "uefi-cdrom" ''

     

       39
       39
       +
           uefiCdrom = makeBootTest "uefi-cdrom" ''

     

       40
       40
        
               cdrom => glob("${iso}/iso/*.iso"),

     

       41
       41
        
               bios => '${pkgs.OVMF}/FV/OVMF.fd'

     

       42
       42
        
             '';

     

       43
       43
       -
           bootUefiUsb = makeBootTest "uefi-usb" ''

     

       43
       43
       +
           uefiUsb = makeBootTest "uefi-usb" ''

     

       44
       44
        
               usb => glob("${iso}/iso/*.iso"),

     

       45
       45
        
               bios => '${pkgs.OVMF}/FV/OVMF.fd'

     

       46
       46
        
             '';