public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

systemd: 238 -> 239

Browse Source
This commit is contained in:
Jörg Thalheim 2018-08-04 11:22:37 +01:00 committed by Robin Gloster
parent 86865392e0
commit 05daf390b3
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/system/boot/systemd.nix
View File

@ -65,6 +65,7 @@ let
"systemd-user-sessions.service" "systemd-user-sessions.service"
"dbus-org.freedesktop.machine1.service" "dbus-org.freedesktop.machine1.service"
"user@.service" "user@.service"
"user-runtime-dir@.service"
# Journal. # Journal.
"systemd-journald.socket" "systemd-journald.socket"

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

@ -19,7 +19,7 @@ let
pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "238"; version = "239";
name = "systemd-${version}"; name = "systemd-${version}";
# When updating, use https://github.com/systemd/systemd-stable tree, not the development one! # When updating, use https://github.com/systemd/systemd-stable tree, not the development one!
@ -27,8 +27,8 @@ in stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "systemd"; repo = "systemd";
rev = "02042d012c4d6c0a2854d8436dd6636d4327774f"; rev = "67c553805a9ebee2dce7c3a350b4abd4d7a489c2";
sha256 = "0iv6fygzac0z6dagbmw1nf8dx7rrr6d9cxp0fr304rn3ir58g5f0"; sha256 = "114vq71gcddi4qm2hyrj5jsas9599s0h5mg65jfpvxhfyaw54cpv";
}; };
outputs = [ "out" "lib" "man" "dev" ]; outputs = [ "out" "lib" "man" "dev" ];
@ -145,16 +145,6 @@ in stdenv.mkDerivation rec {
--replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH" --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH"
''; '';
patches = [
# https://github.com/systemd/systemd/pull/8580
(fetchpatch {
url = https://github.com/systemd/systemd/pull/8580.patch;
sha256 = "1yp07hlpgqq0h2y0qc3kasswzkycz6p8d56d695ck1qa2f5bdfgn";
})
];
hardeningDisable = [ "stackprotector" ];
NIX_CFLAGS_COMPILE = NIX_CFLAGS_COMPILE =
[ # Can't say ${polkit.bin}/bin/pkttyagent here because that would [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would
# lead to a cyclic dependency. # lead to a cyclic dependency.