diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-11-20 14:32:58 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-11-20 14:32:58 +0100 |
| commit | 333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb (patch) | |
| tree | 0f4757ddd2bb3d73b438eea85828d8e01c049583 /pkgs/os-specific/linux/systemd | |
| parent | bdbbfa0d4247e203ffe3171621b614374da05f70 (diff) | |
| parent | b809f886c0bdbd4665fc65a4c308d38a30c368d8 (diff) | |
| download | nixlib-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar nixlib-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.gz nixlib-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.bz2 nixlib-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.lz nixlib-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.xz nixlib-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.zst nixlib-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.zip | |
Merge staging into closure-size
The most complex problems were from dealing with switches reverted in the meantime (gcc5, gmp6, ncurses6). It's likely that darwin is (still) broken nontrivially.
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index aa15f397f8ac..780b90672974 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -12,20 +12,20 @@ assert stdenv.isLinux; assert pythonSupport -> pythonPackages != null; stdenv.mkDerivation rec { - version = "226"; + version = "227"; name = "systemd-${version}"; src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "16d61e9657b643cc25ff0538688eb870ce2dd4a5"; - sha256 = "07sc1x43j60d5jnps0d7bfka10fihnpgkdrfrh9iskgmc9qangjb"; + rev = "7d94d27801d20278103d8c146633fe81e06697d6"; + sha256 = "0cvzsrazqgbia3zajb0z4ik8myfil4bdy2c29qs6w93d6yvrjfkj"; }; patches = [ ./hwdb-location.diff ]; /* gave up for now! - outputs = [ "out" "libudev" "doc" ]; # TODO: "dev" + outputs = [ "out" "libudev" "doc" ]; # maybe: "dev" # note: there are many references to ${systemd}/... outputDev = "out"; propagatedOutputs = "libudev"; @@ -168,8 +168,6 @@ stdenv.mkDerivation rec { rm $out/lib/*.la - rm -rf $out/share/doc - # "kernel-install" shouldn't be used on NixOS. find $out -name "*kernel-install*" -exec rm {} \; ''; # */ |