alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Revert "systemd: 239 -> 239.20181031"

Browse source 
This reverts commit d1de23b830.
The changes turned out to be too intrusive, so we'll patch instead.
This commit is contained in:
Vladimír Čunát 2018-11-03 15:07:45 +01:00
parent 5b94195d21
commit 0744358a7e
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/os-specific/linux/systemd/default.nix
View file

@ -18,7 +18,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 = "239.20181031"; 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!
@ -26,8 +26,8 @@ in stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "systemd"; repo = "systemd";
rev = "nixos-v${version}"; rev = "31859ddd35fc3fa82a583744caa836d356c31d7f";
sha256 = "1rzl0iqrpa4ajvama5k3cb3yc7893c55kzcxkl3cyavpdzsw5505"; sha256 = "1xci0491j95vdjgs397n618zii3sgwnvanirkblqqw6bcvcjvir1";
}; };
outputs = [ "out" "lib" "man" "dev" ]; outputs = [ "out" "lib" "man" "dev" ];
@ -91,7 +91,6 @@ in stdenv.mkDerivation rec {
"-Dsulogin-path=${utillinux}/bin/sulogin" "-Dsulogin-path=${utillinux}/bin/sulogin"
"-Dmount-path=${utillinux}/bin/mount" "-Dmount-path=${utillinux}/bin/mount"
"-Dumount-path=${utillinux}/bin/umount" "-Dumount-path=${utillinux}/bin/umount"
"-Ddns-over-tls=false"
]; ];
preConfigure = '' preConfigure = ''