Merge master into staging-next

2021-01-18 01:16:03 +00:00
parent 4bdb892722 3fc28a93b0
commit b7f20dcd02
270 changed files with 1545 additions and 952 deletions
@@ -10,14 +10,14 @@
 # hardware problems with a new one.

 # Configuration
-{ stdenv, version
+{ lib, stdenv, version

 , features ? { grsecurity = false; xen_dom0 = false; }
 }:

-with stdenv.lib;
-with stdenv.lib.kernel;
-with (stdenv.lib.kernel.whenHelpers version);
+with lib;
+with lib.kernel;
+with (lib.kernel.whenHelpers version);

 let