summary refs log tree commit diff
path: root/pkgs/os-specific/linux/systemd/default.nix
diff options
context:
space:
mode:
authorajs124 <git@ajs124.de>2021-12-06 14:39:16 +0000
committerajs124 <git@ajs124.de>2021-12-06 14:39:16 +0000
commit84a769c071c5205428de4a57b7fd0c8ed9c6df26 (patch)
tree83dbd00a7b8271ff5f219e8fd10f0a4a8f3d8345 /pkgs/os-specific/linux/systemd/default.nix
parente06734eac7e1fd217c514fa111610bc0f809fd78 (diff)
downloadnixpkgs-84a769c071c5205428de4a57b7fd0c8ed9c6df26.tar
nixpkgs-84a769c071c5205428de4a57b7fd0c8ed9c6df26.tar.gz
nixpkgs-84a769c071c5205428de4a57b7fd0c8ed9c6df26.tar.bz2
nixpkgs-84a769c071c5205428de4a57b7fd0c8ed9c6df26.tar.lz
nixpkgs-84a769c071c5205428de4a57b7fd0c8ed9c6df26.tar.xz
nixpkgs-84a769c071c5205428de4a57b7fd0c8ed9c6df26.tar.zst
nixpkgs-84a769c071c5205428de4a57b7fd0c8ed9c6df26.zip
systemd: 249.5 -> 249.7
Diffstat (limited to 'pkgs/os-specific/linux/systemd/default.nix')
-rw-r--r--pkgs/os-specific/linux/systemd/default.nix12
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 28ce620ccee..f0a3c6e65fe 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -122,7 +122,7 @@ assert withHomed -> withCryptsetup;
 assert withCryptsetup -> (cryptsetup != null);
 let
   wantCurl = withRemote || withImportd;
-  version = "249.5";
+  version = "249.7";
 in
 stdenv.mkDerivation {
   inherit pname version;
@@ -133,7 +133,7 @@ stdenv.mkDerivation {
     owner = "systemd";
     repo = "systemd-stable";
     rev = "v${version}";
-    sha256 = "0bir2syy20rdi59sv8xp8nw1c92zl9z0wmv7ggsll8dca7niqwbp";
+    sha256 = "sha256-y33/BvvI+JyhsvuT1Cbm6J2Z72j71oXgLw6X9NwCMPE=";
   };
 
   # If these need to be regenerated, `git am path/to/00*.patch` them into a
@@ -166,14 +166,6 @@ stdenv.mkDerivation {
     # all our root unit dirs if they are symlinks. This does exactly what we
     # need (AFAICT).
     ./0019-core-handle-lookup-paths-being-symlinks.patch
-
-    # In v248 compiler weirdness and refactoring lead to the bootloader
-    # erroring out handling keyboard input on some systems. See
-    # https://github.com/systemd/systemd/issues/19191
-    # This should be redundant in v249.6 when it offically gets tagged in
-    # systemd-stable
-    ./0020-sd-boot-Unify-error-handling.patch
-    ./0021-sd-boot-Rework-console-input-handling.patch
   ] ++ lib.optional stdenv.hostPlatform.isMusl (let
     oe-core = fetchzip {
       url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-14c6e5a4b72d0e4665279158a0740dd1dc21f72f.tar.bz2";