diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2018-08-04 11:22:37 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-08-06 11:03:09 +0200 |
| commit | 05daf390b3a2d391d8990cb647e2ab3ab6487cf3 (patch) | |
| tree | 36f828bfd2ad61f12b74d9e5272f95bafb13deba /pkgs/os-specific/linux/systemd | |
| parent | 86865392e0a5373193a5d484ea5c0dfbff9bf8a3 (diff) | |
| download | nixlib-05daf390b3a2d391d8990cb647e2ab3ab6487cf3.tar nixlib-05daf390b3a2d391d8990cb647e2ab3ab6487cf3.tar.gz nixlib-05daf390b3a2d391d8990cb647e2ab3ab6487cf3.tar.bz2 nixlib-05daf390b3a2d391d8990cb647e2ab3ab6487cf3.tar.lz nixlib-05daf390b3a2d391d8990cb647e2ab3ab6487cf3.tar.xz nixlib-05daf390b3a2d391d8990cb647e2ab3ab6487cf3.tar.zst nixlib-05daf390b3a2d391d8990cb647e2ab3ab6487cf3.zip | |
systemd: 238 -> 239
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index abb6efa29bfb..015aabbacfe6 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -19,7 +19,7 @@ let pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); in stdenv.mkDerivation rec { - version = "238"; + version = "239"; name = "systemd-${version}"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! @@ -27,8 +27,8 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "02042d012c4d6c0a2854d8436dd6636d4327774f"; - sha256 = "0iv6fygzac0z6dagbmw1nf8dx7rrr6d9cxp0fr304rn3ir58g5f0"; + rev = "67c553805a9ebee2dce7c3a350b4abd4d7a489c2"; + sha256 = "114vq71gcddi4qm2hyrj5jsas9599s0h5mg65jfpvxhfyaw54cpv"; }; outputs = [ "out" "lib" "man" "dev" ]; @@ -145,16 +145,6 @@ in stdenv.mkDerivation rec { --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 = [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would # lead to a cyclic dependency. |