public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

systemd: 237 -> 238

Browse Source
This commit is contained in:
Nikolay Amiantov 2018-03-22 22:16:30 +03:00
parent 26256ead32
commit 0ccab4946d
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/system/boot/systemd.nix
View File

@ -137,7 +137,6 @@ let
# Slices / containers. # Slices / containers.
"slices.target" "slices.target"
"system.slice"
"user.slice" "user.slice"
"machine.slice" "machine.slice"
"machines.target" "machines.target"
@ -821,7 +820,8 @@ in
system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled
[ "DEVTMPFS" "CGROUPS" "INOTIFY_USER" "SIGNALFD" "TIMERFD" "EPOLL" "NET" [ "DEVTMPFS" "CGROUPS" "INOTIFY_USER" "SIGNALFD" "TIMERFD" "EPOLL" "NET"
"SYSFS" "PROC_FS" "FHANDLE" "DMIID" "AUTOFS4_FS" "TMPFS_POSIX_ACL" "SYSFS" "PROC_FS" "FHANDLE" "CRYPTO_USER_API_HASH" "CRYPTO_HMAC"
"CRYPTO_SHA256" "DMIID" "AUTOFS4_FS" "TMPFS_POSIX_ACL"
"TMPFS_XATTR" "SECCOMP" "TMPFS_XATTR" "SECCOMP"
]; ];

13
pkgs/os-specific/linux/systemd/default.nix
View File

@ -18,14 +18,14 @@ 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 = "237"; version = "238";
name = "systemd-${version}"; name = "systemd-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "systemd"; repo = "systemd";
rev = "98067cc806ae0d2759cdd2334f230cd8548e5317"; rev = "243d65d38f2df82d4a39f6a9970337803dff65a1";
sha256 = "077svfs2xy3g30s62q69wcv5pb9vfhzh8i7lhfri73vvhwbpzd5q"; sha256 = "098hxlkh6q17rxa178adylksxnnd4x9rxb8amjnlbiydcc6kaa5n";
}; };
outputs = [ "out" "lib" "man" "dev" ]; outputs = [ "out" "lib" "man" "dev" ];
@ -177,13 +177,6 @@ in stdenv.mkDerivation rec {
rm -rf $out/etc/systemd/system rm -rf $out/etc/systemd/system
# Install SysV compatibility commands.
mkdir -p $out/sbin
ln -s $out/lib/systemd/systemd $out/sbin/telinit
for i in init halt poweroff runlevel reboot shutdown; do
ln -s $out/bin/systemctl $out/sbin/$i
done
# Fix reference to /bin/false in the D-Bus services. # Fix reference to /bin/false in the D-Bus services.
for i in $out/share/dbus-1/system-services/*.service; do for i in $out/share/dbus-1/system-services/*.service; do
substituteInPlace $i --replace /bin/false ${coreutils}/bin/false substituteInPlace $i --replace /bin/false ${coreutils}/bin/false