Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b1e74c01f607
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d1de23b8302d
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 1, 2018

  1. systemd: 239 -> 239.20181031 

    Fixes CVE-2018-15688 and updates latest upstream stable v239 branch.

See NixOS/systemd#24 for details.

Co-authored-by: Andreas Rammhold <andreas@rammhold.de>
(cherry picked from commit a7912ec)
    @fpletz
    fpletz committed Nov 1, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: C5629893DE283C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d1de23b View commit details
Showing with 4 additions and 3 deletions.
  1. +4 −3 pkgs/os-specific/linux/systemd/default.nix
7 changes: 4 additions & 3 deletions pkgs/os-specific/linux/systemd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,16 +18,16 @@ 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!
# Also fresh patches should be cherry-picked from that tree to our current one.
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 = ''