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

Merge pull request #243245 from arianvp/bump-systemd

Browse Source 
systemd: 253.5 -> 253.6
This commit is contained in:
Florian Klink 2023-07-14 16:03:47 +03:00 committed by GitHub
commit a6d1b185e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,7 +145,7 @@ assert withUkify -> withEfi;
let let
wantCurl = withRemote || withImportd; wantCurl = withRemote || withImportd;
wantGcrypt = withResolved || withImportd; wantGcrypt = withResolved || withImportd;
version = "253.5"; version = "253.6";
# Bump this variable on every (major) version change. See below (in the meson options list) for why. # Bump this variable on every (major) version change. See below (in the meson options list) for why.
# command: # command:
@ -162,7 +162,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "systemd"; owner = "systemd";
repo = "systemd-stable"; repo = "systemd-stable";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-B3A9AvpfZ8SYsiZvHnWO4RHs1/6EdczWF2NmrSqxQ7c="; hash = "sha256-LZs6QuBe23W643bTuz+MD2pzHiapsBJBHoFXi/QjzG4=";
}; };
# On major changes, or when otherwise required, you *must* reformat the patches, # On major changes, or when otherwise required, you *must* reformat the patches,
@ -190,13 +190,6 @@ stdenv.mkDerivation (finalAttrs: {
./0017-core-don-t-taint-on-unmerged-usr.patch ./0017-core-don-t-taint-on-unmerged-usr.patch
./0018-tpm2_context_init-fix-driver-name-checking.patch ./0018-tpm2_context_init-fix-driver-name-checking.patch
./0019-bootctl-also-print-efi-files-not-owned-by-systemd-in.patch ./0019-bootctl-also-print-efi-files-not-owned-by-systemd-in.patch
# https://github.com/systemd/systemd/pull/28000
(fetchpatch {
name = "fix-service-exit";
url = "https://github.com/systemd/systemd/commit/5f7f82ba625ee48d662c1f0286f44b8b0918d05d.patch";
sha256 = "sha256-pFRXpZjeVl5ZG/mOjHEuMg9zXq4Orwvdp+/LYTbR09I=";
})
] ++ lib.optional stdenv.hostPlatform.isMusl ( ] ++ lib.optional stdenv.hostPlatform.isMusl (
let let
oe-core = fetchzip { oe-core = fetchzip {