diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-10-31 16:12:00 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2018-10-31 16:12:00 +0100 |
| commit | a7912ecc85af6cd9091eb913a114a08baf5312e6 (patch) | |
| tree | 6e8aa8bdfba5a89a8ad0d7a34da205c68721aa72 /pkgs/os-specific/linux/systemd | |
| parent | 3d5f7e368f31a201d0151b90e4508aa0f693110e (diff) | |
| download | nixpkgs-a7912ecc85af6cd9091eb913a114a08baf5312e6.tar nixpkgs-a7912ecc85af6cd9091eb913a114a08baf5312e6.tar.gz nixpkgs-a7912ecc85af6cd9091eb913a114a08baf5312e6.tar.bz2 nixpkgs-a7912ecc85af6cd9091eb913a114a08baf5312e6.tar.lz nixpkgs-a7912ecc85af6cd9091eb913a114a08baf5312e6.tar.xz nixpkgs-a7912ecc85af6cd9091eb913a114a08baf5312e6.tar.zst nixpkgs-a7912ecc85af6cd9091eb913a114a08baf5312e6.zip | |
systemd: 239 -> 239.20181031
Fixes CVE-2018-15688 and updates latest upstream stable v239 branch. See https://github.com/NixOS/systemd/pull/24 for details. Co-authored-by: Andreas Rammhold <andreas@rammhold.de>
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index db64b8e6f6d..2a17a0a2875 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"; + version = "239.20181031"; 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 = "31859ddd35fc3fa82a583744caa836d356c31d7f"; - sha256 = "1xci0491j95vdjgs397n618zii3sgwnvanirkblqqw6bcvcjvir1"; + rev = "nixos-v${version}"; + sha256 = "1rzl0iqrpa4ajvama5k3cb3yc7893c55kzcxkl3cyavpdzsw5505"; }; outputs = [ "out" "lib" "man" "dev" ]; @@ -91,6 +91,7 @@ in stdenv.mkDerivation rec { "-Dsulogin-path=${utillinux}/bin/sulogin" "-Dmount-path=${utillinux}/bin/mount" "-Dumount-path=${utillinux}/bin/umount" + "-Ddns-over-tls=false" ]; preConfigure = '' |