commit 65481ecfef4dda8f8248e0428ac8c41f66cb32fc · pyrox.dev/nixpkgs

+14 -3

nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py

···

       88
       88
        
       

     

       89
       89
        
       

     

       90
       90
        
       def get_bootspec(profile: str | None, generation: int) -> BootSpec:

     

       91
       91
       -
           boot_json_path = os.path.realpath("%s/%s" % (system_dir(profile, generation, None), "boot.json"))

     

       92
       92
       -
           boot_json_f = open(boot_json_path, 'r')

     

       93
       93
       -
           bootspec_json = json.load(boot_json_f)

     

       91
       91
       +
           system_directory = system_dir(profile, generation, None)

     

       92
       92
       +
           boot_json_path = os.path.realpath("%s/%s" % (system_directory, "boot.json"))

     

       93
       93
       +
           if os.path.isfile(boot_json_path):

     

       94
       94
       +
               boot_json_f = open(boot_json_path, 'r')

     

       95
       95
       +
               bootspec_json = json.load(boot_json_f)

     

       96
       96
       +
           else:

     

       97
       97
       +
               boot_json_str = subprocess.check_output([

     

       98
       98
       +
               "@bootspecTools@/bin/synthesize",

     

       99
       99
       +
               "--version",

     

       100
       100
       +
               "1",

     

       101
       101
       +
               system_directory,

     

       102
       102
       +
               "/dev/stdout"],

     

       103
       103
       +
               universal_newlines=True)

     

       104
       104
       +
               bootspec_json = json.loads(boot_json_str)

     

       94
       105
        
           return bootspec_from_json(bootspec_json)

     

       95
       106
        
       

     

       96
       107
        
       def bootspec_from_json(bootspec_json: Dict) -> BootSpec:

+2

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

···

       16
       16
        
       

     

       17
       17
        
           systemd = config.systemd.package;

     

       18
       18
        
       

     

       19
       19
       +
           bootspecTools = pkgs.bootspec;

     

       20
       20
       +
       

     

       19
       21
        
           nix = config.nix.package.out;

     

       20
       22
        
       

     

       21
       23
        
           timeout = optionalString (config.boot.loader.timeout != null) config.boot.loader.timeout;

+16

nixos/tests/systemd-boot.nix

···

       277
       277
        
             machine.wait_for_unit("multi-user.target")

     

       278
       278
        
           '';

     

       279
       279
        
         };

     

       280
       280
       +
       

     

       281
       281
       +
         no-bootspec = makeTest

     

       282
       282
       +
           {

     

       283
       283
       +
             name = "systemd-boot-no-bootspec";

     

       284
       284
       +
             meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ];

     

       285
       285
       +
       

     

       286
       286
       +
             nodes.machine = {

     

       287
       287
       +
               imports = [ common ];

     

       288
       288
       +
               boot.bootspec.enable = false;

     

       289
       289
       +
             };

     

       290
       290
       +
       

     

       291
       291
       +
             testScript = ''

     

       292
       292
       +
               machine.start()

     

       293
       293
       +
               machine.wait_for_unit("multi-user.target")

     

       294
       294
       +
             '';

     

       295
       295
       +
           };

     

       280
       296
        
       }

+12

pkgs/tools/misc/bootspec/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , rustPlatform

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       +
       , fetchpatch

     

       4
       5
        
       }:

     

       5
       6
        
       rustPlatform.buildRustPackage rec {

     

       6
       7
        
         pname = "bootspec";

     
···

       12
       13
        
           rev = "v${version}";

     

       13
       14
        
           hash = "sha256-5IGSMHeL0eKfl7teDejAckYQjc8aeLwfwIQSzQ8YaAg=";

     

       14
       15
        
         };

     

       16
       16
       +
       

     

       17
       17
       +
         patches = [

     

       18
       18
       +
           # https://github.com/DeterminateSystems/bootspec/pull/127

     

       19
       19
       +
           # Fixes the synthesize tool for aarch64-linux

     

       20
       20
       +
           (fetchpatch {

     

       21
       21
       +
             name = "aarch64-support.patch";

     

       22
       22
       +
             url = "https://github.com/DeterminateSystems/bootspec/commit/1d0e925f360f0199f13422fb7541225fd162fd4f.patch";

     

       23
       23
       +
             sha256 = "sha256-wU/jWnOqVBrU2swANdXbQfzRpNd/JIS4cxSyCvixZM0=";

     

       24
       24
       +
           })

     

       25
       25
       +
       

     

       26
       26
       +
         ];

     

       15
       27
        
       

     

       16
       28
        
         cargoHash = "sha256-eGSKVHjPnHK7WyGkO5LIjocNGHawahYQR3H5Lgk1C9s=";

     

       17
       29