diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-04-11 12:58:43 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-04-11 12:58:43 +0300 |
commit | 52797fc600c9cd5c9dd8c14bfea8cc52518fe5c1 (patch) | |
tree | 78ccad3fbe7dd22d274cc1c984786aa55d0b8a5f /pkgs/os-specific | |
parent | 0b034797e1bde2d57d57410a95f24b19d3f4d8a8 (diff) | |
parent | d84029f2960784938de2bf32d03be367762aec04 (diff) | |
download | nixlib-52797fc600c9cd5c9dd8c14bfea8cc52518fe5c1.tar nixlib-52797fc600c9cd5c9dd8c14bfea8cc52518fe5c1.tar.gz nixlib-52797fc600c9cd5c9dd8c14bfea8cc52518fe5c1.tar.bz2 nixlib-52797fc600c9cd5c9dd8c14bfea8cc52518fe5c1.tar.lz nixlib-52797fc600c9cd5c9dd8c14bfea8cc52518fe5c1.tar.xz nixlib-52797fc600c9cd5c9dd8c14bfea8cc52518fe5c1.tar.zst nixlib-52797fc600c9cd5c9dd8c14bfea8cc52518fe5c1.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 6 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 6 | ||||
-rw-r--r-- | pkgs/os-specific/linux/sysdig/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/wireguard/default.nix | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index b32dfbc4b351..7df48850fd12 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.20"; + version = "4.9.21"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha512 = "3israf7zhq92wi0py8y299f7cz6z6xr0y4i5b1xvb46ljyx39jwrrdjrf5nxngz6c1641l9qalwzg5r15pp4gqyr09ilmwn8i7kbqwi"; + sha512 = "1l1m23qdcz4pqnawq2xxiw8pwapgf84ggvb16696qfsh36dhwr62hmg0k5vip2c7yp74dls2gw9qcwhgv9dp7ki74xhzbhpv3148fjd"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index f56b1df61841..491e006378bb 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.11-rc5"; - modDirVersion = "4.11.0-rc5"; + version = "4.11-rc6"; + modDirVersion = "4.11.0-rc6"; extraMeta.branch = "4.11"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0qmb8sssh4f4zhvasy20k30r8cwc03qm5ql3b25cj16cn3frp0q7"; + sha256 = "1lrljxlx6s9rfwbzsl9ixhihf53rm7bwwah9756ar2siimrncvmr"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index d8676413e82e..0a3b51a4e6e9 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -100,9 +100,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.9.20"; - grrev = "201703310823"; - sha512 = "0pm3wmcip73imjjx13yar5l5bhpii45mjac5vb1snypmbwqmywmikiixqslq84i1yqw0c8pi822znkz7650dhxrmdmagy0yirwfdrhf"; + { kver = "4.9.21"; + grrev = "201704091948"; + sha512 = "1pa9vchnii319w3jarp4aclyjpwpk2s3ddi9facvy0r148xxqsl30hk2l0ihb9wwr9pz5a8l2z85skkkp65hpaz6fr9wmy9d1lb1hwh"; }; # This patch relaxes grsec constraints on the location of usermode helpers, diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index b23da5451d1c..27a0d301acf9 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { stdenv.cc.cc ]; - postInstall = '' + postInstall = optionalString (!stdenv.isDarwin) '' patchelf --set-rpath "$libPath" "$out/bin/sysdig" patchelf --set-rpath "$libPath" "$out/bin/csysdig" '' + optionalString (kernel != null) '' diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 68966dd03998..641fb046c6d0 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.18"; let name = "wireguard-${version}"; - version = "0.0.20170324"; + version = "0.0.20170409"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "2ec08a5d74cb3a63576f06d3cae695b6b8995acd9665e2fa4da91927b467ca51"; + sha256 = "065vxxvdsnxk9paqbafi0c622b4qayfh3ps6zzb853qp2i6kniri"; }; meta = with stdenv.lib; { |