diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity-4.4.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity-4.4.nix index 36181308a8b..e51fe642368 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity-4.4.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: +throw "grsecurity stable is no longer supported; please update your configuration" + import ./generic.nix (args // rec { version = "4.4.5"; extraMeta.branch = "4.4"; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 14b0692dbad..c4bc4513395 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -23,9 +23,7 @@ let { name = "grsecurity-${grversion}-${kversion}"; inherit grversion kernel patches kversion revision; patch = fetchurl { - url = if branch == "stable" - then "https://github.com/kdave/grsecurity-patches/blob/master/grsecurity_patches/grsecurity-${grversion}-${kversion}-${revision}.patch?raw=true" - else "https://github.com/slashbeast/grsecurity-scrape/blob/master/${branch}/grsecurity-${grversion}-${kversion}-${revision}.patch?raw=true"; + url = "https://grsecurity.net/${branch}/grsecurity-${grversion}-${kversion}-${revision}.patch"; inherit sha256; }; features.grsecurity = true; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 763e891173c..8b246c5340f 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -323,9 +323,6 @@ let }; linuxPackages_testing = { }; - linuxPackages_grsec_stable_desktop = { }; - linuxPackages_grsec_stable_server = { }; - linuxPackages_grsec_stable_server_xen = { }; linuxPackages_grsec_testing_desktop = { }; linuxPackages_grsec_testing_server = { }; linuxPackages_grsec_testing_server_xen = { };