commit d999872b8d097af7639b609cec041a348a2364fd · pyrox.dev/nixpkgs

+7 -7

pkgs/os-specific/linux/kernel/patches.nix

···

       81
        
         grsecurity_3_0_3_2_55 =

     

       82
        
           { name = "grsecurity-3.0-3.2.55";

     

       83
        
             patch = fetchurl {

     

       84
       -
               url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403022154.patch;

     

       85
       -
               sha256 = "0pqp8mfj4zbgb94c7g6ykh0amlwlilxjiqsyc6smmwwbg6klgvkr";

     

       86
        
             };

     

       87
        
             features.grsecurity = true;

     

       88
        
             # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.55

     

       89
        
             features.apparmor = true;

     

       90
        
           };

     

       91
        
       

     

       92
       -
         grsecurity_3_0_3_13_5 =

     

       93
       -
           { name = "grsecurity-3.0-3.13.5";

     

       94
        
             patch = fetchurl {

     

       95
       -
               url = http://grsecurity.net/test/grsecurity-3.0-3.13.5-201403031445.patch;

     

       96
       -
               sha256 = "0b22jbm9swghhj7a9c07z5yprk88bgp0iv3c8xmfqqyy0yighq1l";

     

       97
        
             };

     

       98
        
             features.grsecurity = true;

     

       99
       -
             # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.5

     

       100
        
             features.apparmor = true;

     

       101
        
           };

     

       102

···

       81
        
         grsecurity_3_0_3_2_55 =

     

       82
        
           { name = "grsecurity-3.0-3.2.55";

     

       83
        
             patch = fetchurl {

     

       84
       +
               url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403072107.patch;

     

       85
       +
               sha256 = "128dbspwg8hvshz6rjykcl42kam5g0db50rbyaagskh9jm9a0zyz";

     

       86
        
             };

     

       87
        
             features.grsecurity = true;

     

       88
        
             # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.55

     

       89
        
             features.apparmor = true;

     

       90
        
           };

     

       91
        
       

     

       92
       +
         grsecurity_3_0_3_13_6 =

     

       93
       +
           { name = "grsecurity-3.0-3.13.6";

     

       94
        
             patch = fetchurl {

     

       95
       +
               url = http://grsecurity.net/test/grsecurity-3.0-3.13.6-201403072241.patch;

     

       96
       +
               sha256 = "006w89pvb9jasb7413nnphz5mrdmq10mkpmjcglbhs5ps915jczy";

     

       97
        
             };

     

       98
        
             features.grsecurity = true;

     

       99
       +
             # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.6

     

       100
        
             features.apparmor = true;

     

       101
        
           };

     

       102

+1 -1

pkgs/top-level/all-packages.nix

···

       6740
        
         })) (args: grsecurityOverrider args));

     

       6741
        
       

     

       6742
        
         linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: {

     

       6743
       -
           kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_5 kernelPatches.grsec_path ];

     

       6744
        
           argsOverride = {

     

       6745
        
             modDirVersion = "${linux_3_13.modDirVersion}-grsec";

     

       6746
        
           };

···

       6740
        
         })) (args: grsecurityOverrider args));

     

       6741
        
       

     

       6742
        
         linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: {

     

       6743
       +
           kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_6 kernelPatches.grsec_path ];

     

       6744
        
           argsOverride = {

     

       6745
        
             modDirVersion = "${linux_3_13.modDirVersion}-grsec";

     

       6746
        
           };