summary refs log tree commit diff
path: root/pkgs/os-specific/linux/systemd/default.nix
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2021-03-31 18:24:19 +0200
committerFlorian Klink <flokli@flokli.de>2021-04-01 13:03:28 +0200
commit1c3a4dbc0dd27992d59bd74a35abcc8a43164506 (patch)
treebcabd530402c959dbdfe7ca8972013f9459c477b /pkgs/os-specific/linux/systemd/default.nix
parent4da7569841a53b444ce43a448db54b946d5b9520 (diff)
downloadnixpkgs-1c3a4dbc0dd27992d59bd74a35abcc8a43164506.tar
nixpkgs-1c3a4dbc0dd27992d59bd74a35abcc8a43164506.tar.gz
nixpkgs-1c3a4dbc0dd27992d59bd74a35abcc8a43164506.tar.bz2
nixpkgs-1c3a4dbc0dd27992d59bd74a35abcc8a43164506.tar.lz
nixpkgs-1c3a4dbc0dd27992d59bd74a35abcc8a43164506.tar.xz
nixpkgs-1c3a4dbc0dd27992d59bd74a35abcc8a43164506.tar.zst
nixpkgs-1c3a4dbc0dd27992d59bd74a35abcc8a43164506.zip
systemd: 247.3 -> 247.6
Diffstat (limited to 'pkgs/os-specific/linux/systemd/default.nix')
-rw-r--r--pkgs/os-specific/linux/systemd/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 4f757862897..bd7c646c920 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -113,7 +113,7 @@ assert withCryptsetup ->
 let
   wantCurl = withRemote || withImportd;
 
-  version = "247.3";
+  version = "247.6";
 in
 stdenv.mkDerivation {
   inherit version pname;
@@ -124,12 +124,12 @@ stdenv.mkDerivation {
     owner = "systemd";
     repo = "systemd-stable";
     rev = "v${version}";
-    sha256 = "0zn0b74iwz3vxabqsk4yydwpgky3c5z4dl83wxbs1qi5d2dnbqa7";
+    sha256 = "sha256-7XYEq3Qw25suwjbtPzx9lVPHUu9ZY/1bADXl2wQbkJc=";
   };
 
   # If these need to be regenerated, `git am path/to/00*.patch` them into a
   # systemd worktree, rebase to the more recent systemd version, and export the
-  # patches again via `git format-patch v${version}`.
+  # patches again via `git -c format.signoff=false format-patch v${version}`.
   # Use `find . -name "*.patch" | sort` to get an up-to-date listing of all patches
   patches = [
     ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch
@@ -150,7 +150,7 @@ stdenv.mkDerivation {
     ./0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
     ./0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
     ./0018-logind-seat-debus-show-CanMultiSession-again.patch
-    ./0019-Revert-pkg-config-prefix-is-not-really-configurable-.patch
+    ./0019-pkg-config-derive-prefix-from-prefix.patch
   ];
 
   postPatch = ''