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

Merge pull request #68096 from andir/systemd-v243

Browse Source 
systemd: 242 -> 243
This commit is contained in:
Andreas Rammhold 2019-09-08 17:16:40 +02:00 committed by GitHub
commit 02e83699bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/tasks/network-interfaces-systemd.nix
View File

@ -72,7 +72,15 @@ in
};
in mkMerge [ {
enable = true;
networks."99-main" = genericNetwork mkDefault;
networks."99-main" = (genericNetwork mkDefault) // {
# We keep the "broken" behaviour of applying this to all interfaces.
# In general we want to get rid of this workaround but there hasn't
# been any work on that.
# See the following issues for details:
# - https://github.com/NixOS/nixpkgs/issues/18962
# - https://github.com/NixOS/nixpkgs/issues/61629
matchConfig = mkDefault { Name = "*"; };
};
}
(mkMerge (forEach interfaces (i: {
netdevs = mkIf i.virtual ({

1
nixos/tests/login.nix
View File

@ -9,6 +9,7 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }:
machine =
{ pkgs, lib, ... }:
{ boot.kernelPackages = lib.mkIf latestKernel pkgs.linuxPackages_latest;
sound.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
};
testScript =

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

@ -18,28 +18,19 @@
let
pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);
in stdenv.mkDerivation rec {
in stdenv.mkDerivation {
version = "243";
pname = "systemd";
# To whoever updates this to 239: check the todo on line 173.
version = "242";
# 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 = "5fb35fbc783516e2014115c3488134a2afb8494c";
sha256 = "0pyjvzzh8nnxv4z58n82lz1mjnzv44sylcjgkvw8sp35vx1ryxfh";
rev = "7019836a26ebdc1ba20c03d06dbb3a613833bd0f";
sha256 = "0ywaq5jfy177k4q5hwr43v66sz62l1bqhgyxs2vk9m1d5kvrjwk6";
};
patches = [
(fetchpatch {
name = "CVE-2019-15718.patch";
url = https://github.com/systemd/systemd/pull/13457/commits/35e528018f315798d3bffcb592b32a0d8f5162bd.patch;
sha256 = "0m0ypnnllx4r6a2qy1586as15i2qrzxwi1sqdp14rzdwajz1rvnv";
})
];
outputs = [ "out" "lib" "man" "dev" ];
nativeBuildInputs =
@ -112,6 +103,13 @@ in stdenv.mkDerivation rec {
"-Dsulogin-path=${utillinux}/bin/sulogin"
"-Dmount-path=${utillinux}/bin/mount"
"-Dumount-path=${utillinux}/bin/umount"
"-Dcreate-log-dirs=false"
# Upstream uses cgroupsv2 by default. To support docker and other
# container managers we still need v1.
"-Ddefault-hierarchy=hybrid"
# Upstream defaulted to disable manpages since they optimize for the much
# more frequent development builds
"-Dman=true"
];
preConfigure = ''
@ -233,6 +231,6 @@ in stdenv.mkDerivation rec {
license = licenses.lgpl21Plus;
platforms = platforms.linux;
priority = 10;
maintainers = [ maintainers.eelco ];
maintainers = with maintainers; [ eelco andir ];
};
}