Merge remote-tracking branch 'origin/master' into staging

This commit is contained in:
Shea Levy
2018-03-28 09:36:47 -04:00
196 changed files with 7758 additions and 4938 deletions
-2
View File
@@ -16,8 +16,6 @@ let
kernelPackages.nvidia_x11
else if elem "nvidiaBeta" drivers then
kernelPackages.nvidia_x11_beta
else if elem "nvidiaLegacy173" drivers then
kernelPackages.nvidia_x11_legacy173
else if elem "nvidiaLegacy304" drivers then
kernelPackages.nvidia_x11_legacy304
else if elem "nvidiaLegacy340" drivers then