Merge pull request #267802 from lilyinstarlight/upd/systemd-254.6

authored by Ryan Lahfa and committed by GitHub 3d733b68 a1e27bbf

+2 -10
+2 -10
pkgs/os-specific/linux/systemd/default.nix
··· 159 let 160 wantCurl = withRemote || withImportd; 161 wantGcrypt = withResolved || withImportd; 162 - version = "254.3"; 163 164 # Bump this variable on every (major) version change. See below (in the meson options list) for why. 165 # command: ··· 176 owner = "systemd"; 177 repo = "systemd-stable"; 178 rev = "v${version}"; 179 - hash = "sha256-ObnsAiKwhwEb4ti611eS/wGpg3Sss/pUy/gANPAbXbs="; 180 }; 181 182 # On major changes, or when otherwise required, you *must* reformat the patches, ··· 204 ./0017-core-don-t-taint-on-unmerged-usr.patch 205 ./0018-tpm2_context_init-fix-driver-name-checking.patch 206 ./0019-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch 207 - 208 - # Fix for `RuntimeError: ELF .dynamic section is missing.` 209 - # https://github.com/systemd/systemd/issues/29381 210 - # https://github.com/systemd/systemd/pull/29392 211 - (fetchpatch { 212 - url = "https://github.com/systemd/systemd/commit/cecbb162a3134b43d2ca160e13198c73ff34c3ef.patch"; 213 - hash = "sha256-hWpUosTDA18mYm5nIb9KnjwOlnzbEHgzha/WpyHoC54="; 214 - }) 215 ] ++ lib.optional stdenv.hostPlatform.isMusl ( 216 let 217 oe-core = fetchzip {
··· 159 let 160 wantCurl = withRemote || withImportd; 161 wantGcrypt = withResolved || withImportd; 162 + version = "254.6"; 163 164 # Bump this variable on every (major) version change. See below (in the meson options list) for why. 165 # command: ··· 176 owner = "systemd"; 177 repo = "systemd-stable"; 178 rev = "v${version}"; 179 + hash = "sha256-Ku24ecDeQt0t7A8/adR3Jm47QZ19+wdMPyJRzCxU4uU="; 180 }; 181 182 # On major changes, or when otherwise required, you *must* reformat the patches, ··· 204 ./0017-core-don-t-taint-on-unmerged-usr.patch 205 ./0018-tpm2_context_init-fix-driver-name-checking.patch 206 ./0019-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch 207 ] ++ lib.optional stdenv.hostPlatform.isMusl ( 208 let 209 oe-core = fetchzip {