JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #97989 from flokli/systemd-246.5

Browse Source 
systemd: 246.4 -> 246.6
This commit is contained in:
Andreas Rammhold 2020-10-05 15:02:39 +02:00 committed by GitHub
commit 2d92e695ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
View File

@ -200,9 +200,7 @@ def main():
else: else:
# Update bootloader to latest if needed # Update bootloader to latest if needed
systemd_version = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[1] systemd_version = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[1]
# Ideally this should use check_output as well, but as a temporary sdboot_status = subprocess.check_output(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "status"], universal_newlines=True)
# work-around for #97433 we ignore any errors.
sdboot_status = subprocess.run(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "status"], universal_newlines=True, stdout=subprocess.PIPE).stdout
# See status_binaries() in systemd bootctl.c for code which generates this # See status_binaries() in systemd bootctl.c for code which generates this
m = re.search("^\W+File:.*/EFI/(BOOT|systemd)/.*\.efi \(systemd-boot (\d+)\)$", m = re.search("^\W+File:.*/EFI/(BOOT|systemd)/.*\.efi \(systemd-boot (\d+)\)$",

4
pkgs/os-specific/linux/systemd/default.nix
View File

@ -18,7 +18,7 @@
}: }:
let let
version = "246.4"; version = "246.6";
in stdenv.mkDerivation { in stdenv.mkDerivation {
inherit version; inherit version;
pname = "systemd"; pname = "systemd";
@ -29,7 +29,7 @@ in stdenv.mkDerivation {
owner = "systemd"; owner = "systemd";
repo = "systemd-stable"; repo = "systemd-stable";
rev = "v${version}"; rev = "v${version}";
sha256 = "0ns12w55yv680p4l7f2i9il7scdph7hips68d9k8cyvxk2w9xg0x"; sha256 = "1yhj2jlighqqpw1xk9q52f3pncjn47ipi224k35d6syb94q2b988";
}; };
# If these need to be regenerated, `git am path/to/00*.patch` them into a # If these need to be regenerated, `git am path/to/00*.patch` them into a