movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-25 10:36:36 +03:00
Code Activity

Revert "nixos/systemd-boot: skip EFI update to 252"

Browse source 
This reverts commit 80665d606a.

Parsing the package version broke our systemd-boot builder test.

i.e. it won't be able to parse systemd-boot efi binaries coming from
ubuntu

We no longer use the faulty systemd-boot version so this code should no
longer be needed.
This commit is contained in:
Jörg Thalheim 2023-10-10 10:12:41 +02:00 • committed by Jörg Thalheim
parent b7fbd1ffd4
commit 865a2cf8c1
2 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
View file

@ -7,14 +7,12 @@ let
efi = config.boot.loader.efi;
python3 = pkgs.python3.withPackages (ps: [ ps.packaging ]);
systemdBootBuilder = pkgs.substituteAll {
src = ./systemd-boot-builder.py;
isExecutable = true;
inherit python3;
inherit (pkgs) python3;
systemd = config.systemd.package;
@ -52,7 +50,7 @@ let
};
checkedSystemdBootBuilder = pkgs.runCommand "systemd-boot" {
nativeBuildInputs = [ pkgs.mypy python3 ];
nativeBuildInputs = [ pkgs.mypy ];
} ''
install -m755 ${systemdBootBuilder} $out
mypy \