commit 2dc2699ca4e1ef5ba5bd6993de563d9bcc52285b · pyrox.dev/nixpkgs

+2 -2

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

···

       1
       1
        
       { stdenv, fetchurl, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       import ./generic.nix (args // rec {

     

       4
       4
       -
         version = "3.12.26";

     

       4
       4
       +
         version = "3.12.27";

     

       5
       5
        
         extraMeta.branch = "3.12";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";

     

       9
       9
       -
           sha256 = "1gp6brk2ix30g8dznd5yv1fq7yx82295va6cn7lwv6jj9w287s6c";

     

       9
       9
       +
           sha256 = "0c8psz9k6k413b48dphclqs6wkh9wiwf5nslykg27afdqd6v4ycc";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         features.iwlwifi = true;

+4 -5

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

···

       1
       1
        
       { stdenv, fetchurl, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       import ./generic.nix (args // rec {

     

       4
       4
       -
         # Reason to add:  RTL8192EE

     

       5
       5
       -
         version = "3.16-rc3";

     

       6
       6
       -
         modDirVersion = "3.16.0-rc3";

     

       7
       7
       -
         extraMeta.branch = "3.16";

     

       4
       4
       +
         version = "3.17-rc2";

     

       5
       5
       +
         modDirVersion = "3.17.0-rc2";

     

       6
       6
       +
         extraMeta.branch = "3.17";

     

       8
       7
        
       

     

       9
       8
        
         src = fetchurl {

     

       10
       9
        
           url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz";

     

       11
       11
       -
           sha256 = "17jgv1hnx2im68f8721x11yfg8mpas7lsxg0j00qxv2fc6km2glm";

     

       10
       10
       +
           sha256 = "094r4kqp7bj1wcdfsgdmv73law4zb7d0sd8lw82v3rz944mlm9y3";

     

       12
       11
        
         };

     

       13
       12
        
       

     

       14
       13
        
         features.iwlwifi = true;

+6 -6

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

···

       60
       60
        
         };

     

       61
       61
        
       

     

       62
       62
        
         grsecurity_stable = grsecPatch

     

       63
       63
       -
           { kversion  = "3.14.10";

     

       64
       64
       -
             revision  = "201407012152";

     

       63
       63
       +
           { kversion  = "3.14.17";

     

       64
       64
       +
             revision  = "201408260041";

     

       65
       65
        
             branch    = "stable";

     

       66
       66
       -
             sha256    = "1119044lzkr9wpr1gpl1g0bz67c2xpdd9bkddllij7ja24jv8sx1";

     

       66
       66
       +
             sha256    = "1brcfxbdd5f29vci3bj2dk3878z24ncrjw268j4i1n8ms65jqda0";

     

       67
       67
        
           };

     

       68
       68
        
       

     

       69
       69
        
         grsecurity_unstable = grsecPatch

     

       70
       70
       -
           { kversion  = "3.15.3";

     

       71
       71
       -
             revision  = "201407012153";

     

       70
       70
       +
           { kversion  = "3.15.10";

     

       71
       71
       +
             revision  = "201408212335";

     

       72
       72
        
             branch    = "test";

     

       73
       73
       -
             sha256    = "0bccayakprc77530crxfr9v2hbs6hlcf290pj1ywlh1p861ljgbm";

     

       73
       73
       +
             sha256    = "0ynnci7jms5a1acn8cpdw4w2j4jz5xai1da5w1l5r65909kwmx0k";

     

       74
       74
        
           };

     

       75
       75
        
       

     

       76
       76
        
         grsec_fix_path =