summary refs log tree commit diff
path: root/pkgs/os-specific/linux
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-11-03 15:07:45 +0100
committerVladimír Čunát <vcunat@gmail.com>2018-11-04 11:08:03 +0100
commit587c3774abc075f117eb73bf01ef4d582de03411 (patch)
tree7372506328dadda44761189a5607d24dbf3d0b3b /pkgs/os-specific/linux
parent058a3c0806e2148ae3d0519bcaa929b7c2486c17 (diff)
downloadnixlib-587c3774abc075f117eb73bf01ef4d582de03411.tar
nixlib-587c3774abc075f117eb73bf01ef4d582de03411.tar.gz
nixlib-587c3774abc075f117eb73bf01ef4d582de03411.tar.bz2
nixlib-587c3774abc075f117eb73bf01ef4d582de03411.tar.lz
nixlib-587c3774abc075f117eb73bf01ef4d582de03411.tar.xz
nixlib-587c3774abc075f117eb73bf01ef4d582de03411.tar.zst
nixlib-587c3774abc075f117eb73bf01ef4d582de03411.zip
Revert "systemd: 239 -> 239.20181031"
This reverts commit d1de23b8302d02d4699e884533906a3992f370b6.
The changes turned out to be too intrusive, so we'll patch instead.
Discussion: https://github.com/NixOS/systemd/pull/24
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r--pkgs/os-specific/linux/systemd/default.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 2a17a0a2875f..db64b8e6f6de 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -18,7 +18,7 @@ let
   pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);
 
 in stdenv.mkDerivation rec {
-  version = "239.20181031";
+  version = "239";
   name = "systemd-${version}";
 
   # When updating, use https://github.com/systemd/systemd-stable tree, not the development one!
@@ -26,8 +26,8 @@ in stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "systemd";
-    rev = "nixos-v${version}";
-    sha256 = "1rzl0iqrpa4ajvama5k3cb3yc7893c55kzcxkl3cyavpdzsw5505";
+    rev = "31859ddd35fc3fa82a583744caa836d356c31d7f";
+    sha256 = "1xci0491j95vdjgs397n618zii3sgwnvanirkblqqw6bcvcjvir1";
   };
 
   outputs = [ "out" "lib" "man" "dev" ];
@@ -91,7 +91,6 @@ in stdenv.mkDerivation rec {
     "-Dsulogin-path=${utillinux}/bin/sulogin"
     "-Dmount-path=${utillinux}/bin/mount"
     "-Dumount-path=${utillinux}/bin/umount"
-    "-Ddns-over-tls=false"
   ];
 
   preConfigure = ''