diff options
| author | Austin Seipp <aseipp@pobox.com> | 2014-08-27 15:13:53 -0500 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2014-08-27 15:14:19 -0500 |
| commit | 2dc2699ca4e1ef5ba5bd6993de563d9bcc52285b (patch) | |
| tree | 4ebc4ae11b2b0e01fc6877b27cdb407b28c209ae /pkgs/os-specific/linux | |
| parent | f2d9783891ccf82079cedd2685b0881d9600c2c6 (diff) | |
| download | nixlib-2dc2699ca4e1ef5ba5bd6993de563d9bcc52285b.tar nixlib-2dc2699ca4e1ef5ba5bd6993de563d9bcc52285b.tar.gz nixlib-2dc2699ca4e1ef5ba5bd6993de563d9bcc52285b.tar.bz2 nixlib-2dc2699ca4e1ef5ba5bd6993de563d9bcc52285b.tar.lz nixlib-2dc2699ca4e1ef5ba5bd6993de563d9bcc52285b.tar.xz nixlib-2dc2699ca4e1ef5ba5bd6993de563d9bcc52285b.tar.zst nixlib-2dc2699ca4e1ef5ba5bd6993de563d9bcc52285b.zip | |
linux/grsec: updates
3.15.10 is EOL soon, but grsecurity/unstable hasn't moved to 3.16.x yet. Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 9 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 12 |
3 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 291e43a98e58..c67c531667a5 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.26"; + version = "3.12.27"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1gp6brk2ix30g8dznd5yv1fq7yx82295va6cn7lwv6jj9w287s6c"; + sha256 = "0c8psz9k6k413b48dphclqs6wkh9wiwf5nslykg27afdqd6v4ycc"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index f44f3d327921..ae9dfc8ef38f 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,14 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - # Reason to add: RTL8192EE - version = "3.16-rc3"; - modDirVersion = "3.16.0-rc3"; - extraMeta.branch = "3.16"; + version = "3.17-rc2"; + modDirVersion = "3.17.0-rc2"; + extraMeta.branch = "3.17"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz"; - sha256 = "17jgv1hnx2im68f8721x11yfg8mpas7lsxg0j00qxv2fc6km2glm"; + sha256 = "094r4kqp7bj1wcdfsgdmv73law4zb7d0sd8lw82v3rz944mlm9y3"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index cfe006fbe4b5..c91b8ddfb44d 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -60,17 +60,17 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.10"; - revision = "201407012152"; + { kversion = "3.14.17"; + revision = "201408260041"; branch = "stable"; - sha256 = "1119044lzkr9wpr1gpl1g0bz67c2xpdd9bkddllij7ja24jv8sx1"; + sha256 = "1brcfxbdd5f29vci3bj2dk3878z24ncrjw268j4i1n8ms65jqda0"; }; grsecurity_unstable = grsecPatch - { kversion = "3.15.3"; - revision = "201407012153"; + { kversion = "3.15.10"; + revision = "201408212335"; branch = "test"; - sha256 = "0bccayakprc77530crxfr9v2hbs6hlcf290pj1ywlh1p861ljgbm"; + sha256 = "0ynnci7jms5a1acn8cpdw4w2j4jz5xai1da5w1l5r65909kwmx0k"; }; grsec_fix_path = |