From b3d99bf063b8ef3ea162edaf766333ab41ffdbee Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 25 Nov 2019 13:16:48 +0100 Subject: [PATCH 1/2] systemd: add flokli to maintainers --- pkgs/os-specific/linux/systemd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 3cc976a909d..e266b0d48ce 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -263,6 +263,6 @@ in stdenv.mkDerivation { license = licenses.lgpl21Plus; platforms = platforms.linux; priority = 10; - maintainers = with maintainers; [ eelco andir mic92 ]; + maintainers = with maintainers; [ andir eelco flokli mic92 ]; }; } From fef59ca3a814310163b3a38d9c0f380c5d4a0917 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 25 Nov 2019 13:15:37 +0100 Subject: [PATCH 2/2] systemd: v243.3 -> v243.4 --- pkgs/os-specific/linux/systemd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index e266b0d48ce..ffb1fb59d21 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -36,10 +36,10 @@ in stdenv.mkDerivation { # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! # Also fresh patches should be cherry-picked from that tree to our current one. src = fetchFromGitHub { - owner = "NixOS"; + owner = "nixos"; repo = "systemd"; - rev = "491a247eff9b7ce1e5877f5f3431517c95f3222f"; - sha256 = "1xqiahapg480m165glrwqbfmc1fxw5sacdlm933cwyi1q8x4537g"; + rev = "d8853d39a28b9884e0acd3ae5732a1e7caaf08af"; + sha256 = "1wqm51i2czbbb3nara11mnxzqng4na1l8fvz7qnbxcrjsqm7hz18"; }; outputs = [ "out" "lib" "man" "dev" ];