commit dde259dfb5a0787b28e260da7575079bbabad6c3 · pyrox.dev/nixpkgs

+9 -1

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

···

       1
       1
       -
       { stdenv, fetchurl, pkgs }:

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, pkgs }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
       

     
···

       139
       139
        
         qat_common_Makefile =

     

       140
       140
        
           { name = "qat_common_Makefile";

     

       141
       141
        
             patch = ./qat_common_Makefile.patch;

     

       142
       142
       +
           };

     

       143
       143
       +
       

     

       144
       144
       +
         hiddev_CVE_2016_5829 =

     

       145
       145
       +
           { name = "hiddev_CVE_2016_5829";

     

       146
       146
       +
             patch = fetchpatch {

     

       147
       147
       +
               url = "https://sources.debian.net/data/main/l/linux/4.6.3-1/debian/patches/bugfix/all/HID-hiddev-validate-num_values-for-HIDIOCGUSAGES-HID.patch";

     

       148
       148
       +
               sha256 = "14rm1qr87p7a5prz8g5fwbpxzdp3ighj095x8rvhm8csm20wspyy";

     

       149
       149
       +
             };

     

       142
       150
        
           };

     

       143
       151
        
       }

+19 -4

pkgs/top-level/all-packages.nix

···

       10938
       10938
        
         };

     

       10939
       10939
        
       

     

       10940
       10940
        
         linux_4_1 = callPackage ../os-specific/linux/kernel/linux-4.1.nix {

     

       10941
       10941
       -
           kernelPatches = [ kernelPatches.bridge_stp_helper ]

     

       10941
       10941
       +
           kernelPatches =

     

       10942
       10942
       +
             [ kernelPatches.bridge_stp_helper

     

       10943
       10943
       +
               kernelPatches.hiddev_CVE_2016_5829

     

       10944
       10944
       +
             ]

     

       10942
       10945
        
             ++ lib.optionals ((platform.kernelArch or null) == "mips")

     

       10943
       10946
        
             [ kernelPatches.mips_fpureg_emu

     

       10944
       10947
        
               kernelPatches.mips_fpu_sigill

     
···

       10947
       10950
        
         };

     

       10948
       10951
        
       

     

       10949
       10952
        
         linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix {

     

       10950
       10950
       -
           kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.qat_common_Makefile ]

     

       10953
       10953
       +
           kernelPatches =

     

       10954
       10954
       +
             [ kernelPatches.bridge_stp_helper

     

       10955
       10955
       +
               kernelPatches.qat_common_Makefile

     

       10956
       10956
       +
               kernelPatches.hiddev_CVE_2016_5829

     

       10957
       10957
       +
             ]

     

       10951
       10958
        
             ++ lib.optionals ((platform.kernelArch or null) == "mips")

     

       10952
       10959
        
             [ kernelPatches.mips_fpureg_emu

     

       10953
       10960
        
               kernelPatches.mips_fpu_sigill

     
···

       10956
       10963
        
         };

     

       10957
       10964
        
       

     

       10958
       10965
        
         linux_4_5 = callPackage ../os-specific/linux/kernel/linux-4.5.nix {

     

       10959
       10959
       -
           kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.qat_common_Makefile ]

     

       10966
       10966
       +
           kernelPatches =

     

       10967
       10967
       +
             [ kernelPatches.bridge_stp_helper

     

       10968
       10968
       +
               kernelPatches.qat_common_Makefile

     

       10969
       10969
       +
               kernelPatches.hiddev_CVE_2016_5829

     

       10970
       10970
       +
             ]

     

       10960
       10971
        
             ++ lib.optionals ((platform.kernelArch or null) == "mips")

     

       10961
       10972
        
             [ kernelPatches.mips_fpureg_emu

     

       10962
       10973
        
               kernelPatches.mips_fpu_sigill

     
···

       10965
       10976
        
         };

     

       10966
       10977
        
       

     

       10967
       10978
        
         linux_4_6 = callPackage ../os-specific/linux/kernel/linux-4.6.nix {

     

       10968
       10968
       -
           kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.qat_common_Makefile ]

     

       10979
       10979
       +
           kernelPatches =

     

       10980
       10980
       +
             [ kernelPatches.bridge_stp_helper

     

       10981
       10981
       +
               kernelPatches.qat_common_Makefile

     

       10982
       10982
       +
               kernelPatches.hiddev_CVE_2016_5829

     

       10983
       10983
       +
             ]

     

       10969
       10984
        
             ++ lib.optionals ((platform.kernelArch or null) == "mips")

     

       10970
       10985
        
             [ kernelPatches.mips_fpureg_emu

     

       10971
       10986
        
               kernelPatches.mips_fpu_sigill