Merge branch 'staging-next' into staging

pkgs/development/libraries/sqlite/default.nix

@@ -144,15 +144,15 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://www.sqlite.org/releaselog/${lib.replaceStrings [ "." ] [ "_" ] version}.html";
     description = "Self-contained, serverless, zero-configuration, transactional SQL database engine";
     downloadPage = "https://sqlite.org/download.html";
     homepage = "https://www.sqlite.org/";
-    license = licenses.publicDomain;
+    license = lib.licenses.publicDomain;
     mainProgram = "sqlite3";
-    maintainers = with maintainers; [ np ];
-    platforms = platforms.unix ++ platforms.windows;
+    maintainers = with lib.maintainers; [ np ];
+    platforms = lib.platforms.unix ++ lib.platforms.windows;
     pkgConfigModules = [ "sqlite3" ];
   };
 }

pkgs/development/libraries/sqlite/sqlar.nix

@@ -36,11 +36,11 @@ stdenv.mkDerivation {
     install -D -t $out/bin sqlarfs
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://sqlite.org/sqlar";
     description = "SQLite Archive utilities";
-    license = licenses.bsd2;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ dtzWill ];
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ dtzWill ];
   };
 }

pkgs/development/libraries/sqlite/tools.nix

@@ -36,12 +36,12 @@ let
 
       installPhase = "install -Dt $out/bin ${makeTarget}";
 
-      meta = with lib; {
+      meta = {
         inherit description homepage mainProgram;
         downloadPage = "http://sqlite.org/download.html";
-        license = licenses.publicDomain;
-        maintainers = with maintainers; [ johnazoidberg ];
-        platforms = platforms.unix;
+        license = lib.licenses.publicDomain;
+        maintainers = with lib.maintainers; [ johnazoidberg ];
+        platforms = lib.platforms.unix;
       };
     };
 in