movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

systemd: apply patches from Debian

Browse source 
There are some security fixes among those.
This commit is contained in:
Vladimír Čunát 2018-11-03 15:47:44 +01:00
parent 587c3774ab
commit 179b8146e6
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pkgs/os-specific/linux/systemd/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod { stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, pkgconfig, intltool, gperf, libcap, kmod
, xz, pam, acl, libuuid, m4, utillinux, libffi , xz, pam, acl, libuuid, m4, utillinux, libffi
, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor
, audit, lz4, bzip2, libmicrohttpd, pcre2 , audit, lz4, bzip2, libmicrohttpd, pcre2
@ -30,6 +30,22 @@ in stdenv.mkDerivation rec {
sha256 = "1xci0491j95vdjgs397n618zii3sgwnvanirkblqqw6bcvcjvir1"; sha256 = "1xci0491j95vdjgs397n618zii3sgwnvanirkblqqw6bcvcjvir1";
}; };
prePatch = let
# Upstream's maintenance branches are still too intrusive:
# https://github.com/systemd/systemd-stable/tree/v239-stable
patches-deb = fetchurl {
# When the URL disappears, it typically means that Debian has new patches
# (probably security) and updating to new tarball will apply them as well.
name = "systemd-debian-patches.tar.xz";
url = mirror://debian/pool/main/s/systemd/systemd_239-11~bpo9+1.debian.tar.xz;
sha256 = "136f6p4jbi4z94mf4g099dfcacwka8jwhza0wxxw2q5l5q3xiysh";
};
# Note that we skip debian-specific patches, i.e. ./debian/patches/debian/*
in ''
tar xf ${patches-deb}
patches="$patches $(cat debian/patches/series | grep -v '^debian/' | sed 's|^|debian/patches/|')"
'';
outputs = [ "out" "lib" "man" "dev" ]; outputs = [ "out" "lib" "man" "dev" ];
nativeBuildInputs = nativeBuildInputs =