diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-01-10 10:48:42 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-01-11 23:58:19 -0800 |
| commit | 33651bb86595fcb5489798d37947e68ad3bf2b8c (patch) | |
| tree | 2d8c743d27afc6918e2b647b25de40b1f5954635 /pkgs/os-specific | |
| parent | 6521141d09a2238331a43bf69716dd5b57ab3787 (diff) | |
| download | nixpkgs-33651bb86595fcb5489798d37947e68ad3bf2b8c.tar nixpkgs-33651bb86595fcb5489798d37947e68ad3bf2b8c.tar.gz nixpkgs-33651bb86595fcb5489798d37947e68ad3bf2b8c.tar.bz2 nixpkgs-33651bb86595fcb5489798d37947e68ad3bf2b8c.tar.lz nixpkgs-33651bb86595fcb5489798d37947e68ad3bf2b8c.tar.xz nixpkgs-33651bb86595fcb5489798d37947e68ad3bf2b8c.tar.zst nixpkgs-33651bb86595fcb5489798d37947e68ad3bf2b8c.zip | |
kernel: 3.18.1 -> 3.18.2
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.18.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index e12588e052b..b3e46a8ef8b 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.18.1"; + version = "3.18.2"; # Remember to update grsecurity! extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "13m0s2m0zg304w86yvcmxgbjl41c4kc420044avi8rnr1xwcscsq"; + sha256 = "1gqs5c3s2qm5slhmqwdrrnkjn0w4mwaj71q79x8qxhyxvnagm40h"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 0d6b615cc62..24fbc0f4e50 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -67,10 +67,10 @@ rec { }; grsecurity_unstable = grsecPatch - { kversion = "3.18.1"; - revision = "201501042021"; + { kversion = "3.18.2"; + revision = "201501111422"; branch = "test"; - sha256 = "0x9sbxflmpvqki9n5gpxmmkf8043xbfg87glcwk3xc7kzjaqhcq3"; + sha256 = "1scr69zkg1w28923s43rfvip1f7kg2f4w7gb3n2f3sdwyd7zg2bc"; }; grsec_fix_path = |