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: 86865392e0a5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 05daf390b3a2
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Aug 6, 2018

  1. systemd: 238 -> 239

    @Mic92 @globin
    Mic92 authored and globin committed Aug 6, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    05daf39 View commit details
Showing with 4 additions and 13 deletions.
  1. +1 −0 nixos/modules/system/boot/systemd.nix
  2. +3 −13 pkgs/os-specific/linux/systemd/default.nix
1 change: 1 addition & 0 deletions nixos/modules/system/boot/systemd.nix
View file
Original file line number Diff line number Diff line change
@@ -65,6 +65,7 @@ let
"systemd-user-sessions.service"
"dbus-org.freedesktop.machine1.service"
"user@.service"
"user-runtime-dir@.service"

# Journal.
"systemd-journald.socket"
16 changes: 3 additions & 13 deletions pkgs/os-specific/linux/systemd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,16 +19,16 @@ 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!
# Also fresh patches should be cherry-picked from that tree to our current one.
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.