Merge branch 'staging-next' into staging

pkgs/development/interpreters/python/cpython/default.nix

@@ -849,9 +849,10 @@ stdenv.mkDerivation (finalAttrs: {
       hierarchical packages; exception-based error handling; and very
       high level dynamic data types.
     '';
-    license = licenses.psfl;
+    license = lib.licenses.psfl;
     pkgConfigModules = [ "python3" ];
-    platforms = platforms.linux ++ platforms.darwin ++ platforms.windows ++ platforms.freebsd;
+    platforms =
+      lib.platforms.linux ++ lib.platforms.darwin ++ lib.platforms.windows ++ lib.platforms.freebsd;
     mainProgram = executable;
     teams = [ lib.teams.python ];
     # static build on x86_64-darwin/aarch64-darwin breaks with:

pkgs/development/interpreters/python/pypy/default.nix

@@ -390,12 +390,12 @@ stdenv.mkDerivation rec {
   inherit passthru;
   enableParallelBuilding = true; # almost no parallelization without STM
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.pypy.org/";
     changelog = "https://doc.pypy.org/en/stable/release-v${version}.html";
     description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
     mainProgram = "pypy";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     platforms = [
       "aarch64-linux"
       "x86_64-linux"
@@ -403,7 +403,7 @@ stdenv.mkDerivation rec {
       "x86_64-darwin"
     ];
     broken = optimizationLevel == "0"; # generates invalid code
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       andersk
       fliegendewurst
     ];

pkgs/development/interpreters/python/pypy/prebuilt.nix

@@ -176,11 +176,11 @@ stdenv.mkDerivation {
 
   inherit passthru;
 
-  meta = with lib; {
+  meta = {
     homepage = "http://pypy.org/";
     description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
     mainProgram = "pypy";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     platforms = lib.attrNames downloadUrls;
   };
 

pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix

@@ -171,10 +171,10 @@ stdenv.mkDerivation {
 
   inherit passthru;
 
-  meta = with lib; {
+  meta = {
     homepage = "http://pypy.org/";
     description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     platforms = lib.attrNames downloadUrls;
   };