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

Merge pull request #37814 from dtzWill/update/util-linux-2.32 

util-linux: 2.31.1 -> 2.32
This commit is contained in:
Will Dietz 2018-04-30 13:21:59 -05:00 committed by GitHub
parent a591d28c17 b341529a35
commit 919dda7aba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,6 +155,14 @@ in stdenv.mkDerivation rec {
--replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH" --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH"
''; '';
patches = [
# https://github.com/systemd/systemd/pull/8580
(fetchpatch {
url = https://github.com/systemd/systemd/pull/8580.patch;
sha256 = "1yp07hlpgqq0h2y0qc3kasswzkycz6p8d56d695ck1qa2f5bdfgn";
})
];
hardeningDisable = [ "stackprotector" ]; hardeningDisable = [ "stackprotector" ];
NIX_CFLAGS_COMPILE = NIX_CFLAGS_COMPILE =

6
pkgs/os-specific/linux/util-linux/default.nix
View File

@ -4,15 +4,15 @@
let let
version = lib.concatStringsSep "." ([ majorVersion ] version = lib.concatStringsSep "." ([ majorVersion ]
++ lib.optional (patchVersion != "") patchVersion); ++ lib.optional (patchVersion != "") patchVersion);
majorVersion = "2.31"; majorVersion = "2.32";
patchVersion = "1"; patchVersion = "";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "util-linux-${version}"; name = "util-linux-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz"; url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
sha256 = "04fzrnrr3pvqskvjn9f81y0knh0jvvqx4lmbz5pd4lfdm5pv2l8s"; sha256 = "0d2758kjll5xqm5fpp3sww1h66aahx161sf2b60jxqv4qymrfwvc";
}; };
patches = [ patches = [