diff options
| author | Will Dietz <github@wdtz.org> | 2018-04-30 13:21:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 13:21:59 -0500 |
| commit | 919dda7aba69cf980a9ac5f3e93cb95bbd16a56c (patch) | |
| tree | a86d8ca93836f208999d39fa1e66ea48d9c48938 /pkgs | |
| parent | a591d28c179398ce8da59a25e7bcac7420a8dd0c (diff) | |
| parent | b341529a354774894306f3890437ec9930fcc265 (diff) | |
| download | nixlib-919dda7aba69cf980a9ac5f3e93cb95bbd16a56c.tar nixlib-919dda7aba69cf980a9ac5f3e93cb95bbd16a56c.tar.gz nixlib-919dda7aba69cf980a9ac5f3e93cb95bbd16a56c.tar.bz2 nixlib-919dda7aba69cf980a9ac5f3e93cb95bbd16a56c.tar.lz nixlib-919dda7aba69cf980a9ac5f3e93cb95bbd16a56c.tar.xz nixlib-919dda7aba69cf980a9ac5f3e93cb95bbd16a56c.tar.zst nixlib-919dda7aba69cf980a9ac5f3e93cb95bbd16a56c.zip | |
Merge pull request #37814 from dtzWill/update/util-linux-2.32
util-linux: 2.31.1 -> 2.32
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/util-linux/default.nix | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 3d8b7cb33227..65e7a4531bfa 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -155,6 +155,14 @@ in stdenv.mkDerivation rec { --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" ]; NIX_CFLAGS_COMPILE = diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 618ba42e7416..9ec6c22d32a5 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -4,15 +4,15 @@ let version = lib.concatStringsSep "." ([ majorVersion ] ++ lib.optional (patchVersion != "") patchVersion); - majorVersion = "2.31"; - patchVersion = "1"; + majorVersion = "2.32"; + patchVersion = ""; in stdenv.mkDerivation rec { name = "util-linux-${version}"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz"; - sha256 = "04fzrnrr3pvqskvjn9f81y0knh0jvvqx4lmbz5pd4lfdm5pv2l8s"; + sha256 = "0d2758kjll5xqm5fpp3sww1h66aahx161sf2b60jxqv4qymrfwvc"; }; patches = [ |