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

Conflicts:
	pkgs/by-name/me/meson/package.nix

pkgs/development/interpreters/python/mk-python-derivation.nix

@@ -211,7 +211,7 @@ let
         else if format != null then
           format
         else
-          "setuptools";
+          throw "${name} does not configure a `format`. To build with setuptools as before, set `pyproject = true` and `build-system = [ setuptools ]`.`";
 
       withDistOutput = withDistOutput' format';
 
@@ -268,11 +268,12 @@ let
 
       isSetuptoolsDependency = isSetuptoolsDependency' (attrs.pname or null);
 
+      name = namePrefix + attrs.name or "${finalAttrs.pname}-${finalAttrs.version}";
+
     in
     (cleanAttrs attrs)
     // {
-
-      name = namePrefix + attrs.name or "${finalAttrs.pname}-${finalAttrs.version}";
+      inherit name;
 
       inherit catchConflicts;
 

pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix

@@ -8,6 +8,7 @@ buildPythonPackage {
 
   pname = "typeddep";
   version = "1.3.3.7";
+  format = "setuptools";
 
   src = lib.fileset.toSource {
     root = ./.;