From 71efd09c071d488cc6978a9f6dccb4ec6f072ca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=98=D0=B0=D0=BD=20=D0=93=D0=B5=D0=BE?= =?UTF-8?q?=D1=80=D0=B3=D0=B8=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?= Date: Wed, 9 Nov 2022 14:54:11 +0100 Subject: [PATCH] systemd: 250.4 -> 250.7 removed the pull/22174.patch`, it has been backported in v250, see https://github.com/systemd/systemd-stable/pull/195 src/test/test-load-fragment.c got some `/bin/echo` invocations in https://github.com/systemd/systemd-stable/commit/9727b9ee7b90afb8fa0e6328dcb6c34b1522d4fd --- pkgs/os-specific/linux/systemd/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index dad537a1564d..e51799f47729 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -4,7 +4,6 @@ , lib , nixosTests , fetchFromGitHub -, fetchpatch , fetchzip , buildPackages , ninja @@ -127,7 +126,7 @@ assert withCryptsetup -> (cryptsetup != null); let wantCurl = withRemote || withImportd; wantGcrypt = withResolved || withImportd; - version = "250.4"; + version = "250.7"; # Bump this variable on every (major) version change. See below (in the meson options list) for why. # command: @@ -144,7 +143,7 @@ stdenv.mkDerivation { owner = "systemd"; repo = "systemd-stable"; rev = "v${version}"; - sha256 = "sha256-AdzPh7dGVrGbbjL9+PqytQOpRzNDUUEftmKZAbFH3L4="; + sha256 = "sha256-dyKRo8ktaI/sGA98X6d6bqToN1ehDF3obA98N24uoqI="; }; # On major changes, or when otherwise required, you *must* reformat the patches, @@ -178,13 +177,6 @@ stdenv.mkDerivation { # need (AFAICT). # See https://github.com/systemd/systemd/pull/20479 for upstream discussion. ./0019-core-handle-lookup-paths-being-symlinks.patch - - # fixes reproducability of dbus xml files - # Should no longer be necessary with v251. - (fetchpatch { - url = "https://github.com/systemd/systemd/pull/22174.patch"; - sha256 = "sha256-RVhxUEUiISgRlIP/AhU+w1VHfDQw2W16cFl2TXXyxno="; - }) ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { @@ -546,6 +538,7 @@ stdenv.mkDerivation { "src/analyze/test-verify.c" "src/test/test-env-file.c" "src/test/test-fileio.c" + "src/test/test-load-fragment.c" ]; } {