diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-05-07 19:27:19 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-05-07 20:32:24 -0700 |
| commit | 0e4057b167702a5450da09123260f2e453f092cb (patch) | |
| tree | 469cbb4996672bebead3c2126c3922e3f7556eaf | |
| parent | 5b4cd639ddb988c2acbee113b6a8a4b74ecd9ea1 (diff) | |
| download | nixlib-0e4057b167702a5450da09123260f2e453f092cb.tar nixlib-0e4057b167702a5450da09123260f2e453f092cb.tar.gz nixlib-0e4057b167702a5450da09123260f2e453f092cb.tar.bz2 nixlib-0e4057b167702a5450da09123260f2e453f092cb.tar.lz nixlib-0e4057b167702a5450da09123260f2e453f092cb.tar.xz nixlib-0e4057b167702a5450da09123260f2e453f092cb.tar.zst nixlib-0e4057b167702a5450da09123260f2e453f092cb.zip | |
kernel: 4.0.1 -> 4.0.2
| -rw-r--r-- | pkgs/build-support/grsecurity/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.0.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index e82792be033a..0fd3df6d5f5f 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -33,7 +33,7 @@ let grKernel = if cfg.stable then mkKernel pkgs.linux_3_14 stable-patch - else mkKernel pkgs.linux_3_19 test-patch; + else mkKernel pkgs.linux_4_0 test-patch; ## -- grsecurity configuration --------------------------------------------- diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix index 161861d6f067..9f5280774fca 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.0.1"; + version = "4.0.2"; extraMeta.branch = "4.0"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1ggj26p1bm5v5kaviz6brfkjk32f8rib1mh61ns77gjlx5vsvc7z"; + sha256 = "1jq4583wwqmwqkqlkck57fxw18xszng92b6ma3avf0djd11b2izz"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 9ed7633e7a3b..fc9fca26c353 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -72,10 +72,10 @@ rec { }; grsecurity_unstable = grsecPatch - { kversion = "3.19.6"; - revision = "201504302119"; + { kversion = "4.0.2"; + revision = "201505072057"; branch = "test"; - sha256 = "03yj8011i6mkf33npa7all0c33r95mgiic6zjg494x56279s701s"; + sha256 = "0njvgd6n9z35hyxnligb8aq9shxzbwrkrdvpbxc0qxmwya0midv2"; }; grsec_fix_path = |