alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #37647 from abbradar/systemd-238

Browse source 
[WIP] Update systemd and unbreak staging
This commit is contained in:
Nikolay Amiantov 2018-03-23 01:11:32 +03:00 committed by GitHub
parent e5ab8585e4 0ccab4946d
commit 91072b7b23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 16 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"
]; ];

1
pkgs/os-specific/linux/kernel/common-config.nix
View file

@ -135,6 +135,7 @@ with stdenv.lib;
NETFILTER y NETFILTER y
NETFILTER_ADVANCED y NETFILTER_ADVANCED y
CGROUP_BPF? y # Required by systemd per-cgroup firewalling CGROUP_BPF? y # Required by systemd per-cgroup firewalling
CGROUP_NET_PRIO y # Required by systemd
IP_ROUTE_VERBOSE y IP_ROUTE_VERBOSE y
IP_MROUTE_MULTIPLE_TABLES y IP_MROUTE_MULTIPLE_TABLES y
IP_VS_PROTO_TCP y IP_VS_PROTO_TCP y

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

15
pkgs/tools/filesystems/btrfs-progs/default.nix
View file

@ -1,17 +1,24 @@
{ stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo { stdenv, fetchurl, fetchpatch, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd
}: }:
let version = "4.15.1"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "btrfs-progs-${version}"; name = "btrfs-progs-${version}";
version = "4.15.1";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
sha256 = "15izak6jg6pqr6ha9447cdrdj9k6kfiarvwlrj53cpvrsv02l437"; sha256 = "15izak6jg6pqr6ha9447cdrdj9k6kfiarvwlrj53cpvrsv02l437";
}; };
patches = [
# Fix build with e2fsprogs 1.44.0
(fetchpatch {
url = "https://patchwork.kernel.org/patch/10281327/raw/";
sha256 = "016124hjms220809zjvvr7l1gq23j419d3piaijsaw8n7yd3kksf";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt
]; ];
@ -20,7 +27,7 @@ stdenv.mkDerivation rec {
# gcc bug with -O1 on ARM with gcc 4.8 # gcc bug with -O1 on ARM with gcc 4.8
# This should be fine on all platforms so apply universally # This should be fine on all platforms so apply universally
patchPhase = "sed -i s/-O1/-O2/ configure"; postPatch = "sed -i s/-O1/-O2/ configure";
postInstall = '' postInstall = ''
install -v -m 444 -D btrfs-completion $out/etc/bash_completion.d/btrfs install -v -m 444 -D btrfs-completion $out/etc/bash_completion.d/btrfs