nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 02:42:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ryan Lahfa 2023-11-21 10:38:39 +01:00 committed by GitHub
commit 3d733b683a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,7 +159,7 @@ assert !withPasswordQuality;
let let
wantCurl = withRemote || withImportd; wantCurl = withRemote || withImportd;
wantGcrypt = withResolved || withImportd; wantGcrypt = withResolved || withImportd;
version = "254.3"; version = "254.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:
@ -176,7 +176,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "systemd"; owner = "systemd";
repo = "systemd-stable"; repo = "systemd-stable";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-ObnsAiKwhwEb4ti611eS/wGpg3Sss/pUy/gANPAbXbs="; hash = "sha256-Ku24ecDeQt0t7A8/adR3Jm47QZ19+wdMPyJRzCxU4uU=";
}; };
# On major changes, or when otherwise required, you *must* reformat the patches, # On major changes, or when otherwise required, you *must* reformat the patches,
@ -204,14 +204,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-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch ./0019-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
# Fix for `RuntimeError: ELF .dynamic section is missing.`
# https://github.com/systemd/systemd/issues/29381
# https://github.com/systemd/systemd/pull/29392
(fetchpatch {
url = "https://github.com/systemd/systemd/commit/cecbb162a3134b43d2ca160e13198c73ff34c3ef.patch";
hash = "sha256-hWpUosTDA18mYm5nIb9KnjwOlnzbEHgzha/WpyHoC54=";
})
] ++ lib.optional stdenv.hostPlatform.isMusl ( ] ++ lib.optional stdenv.hostPlatform.isMusl (
let let
oe-core = fetchzip { oe-core = fetchzip {