build: Add support for PEP-735 dependency groups

Using overlapping install UX with extras as described in https://peps.python.org/pep-0735/#overlapping-install-ux-with-extras

Author: adisbladis

build/checks/default.nix

@@ -150,13 +150,19 @@ in
       );
 
       venv = testSet.mkVirtualEnv "render-mkderivation-env" {
-        myapp = [ "toml" ];
+        myapp = [
+          "toml" # Extra
+          "round" # PEP-735 dependency group
+        ];
       };
     in
     pkgs.runCommand "render-mkderivation-test" { nativeBuildInputs = [ venv ]; } ''
       # Assert that extra was enabled
       python -c "import tomli_w"
 
+      # Assert that dependency group was enabled
+      python -c "import wheel"
+
       # Script from myapp
       hello
 

build/checks/fixtures/myapp/pyproject.toml

@@ -11,6 +11,9 @@ dependencies = [
 [project.optional-dependencies]
 toml = ["tomli-w"]
 
+[dependency-groups]
+round = ["wheel"]
+
 [project.scripts]
 hello = "myapp:hello"
 

build/lib/renderers.nix

@@ -56,6 +56,7 @@ in
       passthru = {
         dependencies = mkSpec filteredDeps.dependencies;
         optional-dependencies = mapAttrs (_: mkSpec) filteredDeps.extras;
+        dependency-groups = mapAttrs (_: mkSpec) filteredDeps.groups;
       };
 
       nativeBuildInputs = [
@@ -125,41 +126,46 @@ in
       # Synthetic pyproject.toml
       #
       # We don't use the provided build-system to build an editable package, we use hatchling.
-      pyproject = {
-        # PEP-621 project table
-        project =
-          {
-            # Both name and version are required.
-            inherit (project') name version;
-          }
-          // optionalAttrs (project' ? dependencies) {
-            inherit (project') dependencies;
-          }
-          // optionalAttrs (project' ? optional-dependencies) {
-            inherit (project') optional-dependencies;
-          }
-          // optionalAttrs (project' ? scripts) {
-            inherit (project') scripts;
-          }
-          // optionalAttrs (project' ? gui-scripts) {
-            inherit (project') gui-scripts;
-          }
-          // optionalAttrs (project' ? entry-points) {
-            inherit (project') entry-points;
+      pyproject =
+        {
+          # PEP-621 project table
+          project =
+            {
+              # Both name and version are required.
+              inherit (project') name version;
+            }
+            // optionalAttrs (project' ? dependencies) {
+              inherit (project') dependencies;
+            }
+            // optionalAttrs (project' ? optional-dependencies) {
+              inherit (project') optional-dependencies;
+            }
+            // optionalAttrs (project' ? scripts) {
+              inherit (project') scripts;
+            }
+            // optionalAttrs (project' ? gui-scripts) {
+              inherit (project') gui-scripts;
+            }
+            // optionalAttrs (project' ? entry-points) {
+              inherit (project') entry-points;
+            };
+
+          # Allow empty package
+          tool.hatch.build.targets.wheel.bypass-selection = true;
+
+          # Include our editable pointer file in build
+          tool.hatch.build.targets.wheel.force-include."_${pname}.pth" = "_${pname}.pth";
+
+          # Build editable package using hatchling
+          build-system = {
+            requires = [ "hatchling" ];
+            build-backend = "hatchling.build";
           };
-
-        # Allow empty package
-        tool.hatch.build.targets.wheel.bypass-selection = true;
-
-        # Include our editable pointer file in build
-        tool.hatch.build.targets.wheel.force-include."_${pname}.pth" = "_${pname}.pth";
-
-        # Build editable package using hatchling
-        build-system = {
-          requires = [ "hatchling" ];
-          build-backend = "hatchling.build";
+        }
+        // optionalAttrs (project.pyproject ? dependency-groups) {
+          # PEP-735 dependency groups
+          inherit (project.pyproject) dependency-groups;
         };
-      };
     in
     {
       inherit pname;
@@ -172,6 +178,7 @@ in
           )
         );
         optional-dependencies = mapAttrs (_: mkSpec) filteredDeps.extras;
+        dependency-groups = mapAttrs (_: mkSpec) filteredDeps.groups;
       };
 
       # Convert created JSON format pyproject.toml into TOML and include a generated pth file

build/lib/resolvers.nix

@@ -8,6 +8,7 @@ let
     genericClosure
     match
     genAttrs
+    throwIf
     ;
 
 in
@@ -30,16 +31,21 @@ in
         let
           pkg = set.${name};
           dependencies = pkg.passthru.dependencies or { };
-          optional-dependencies = pkg.passthru.optional-dependencies or { };
         in
         [ name ]
         ++ concatMap (name: recurse name dependencies.${name}) (attrNames dependencies)
         ++ concatMap (
-          extra:
+          name':
           let
-            extra' = optional-dependencies.${extra};
+            extra' = pkg.passthru.optional-dependencies.${name'} or { };
+            group' = pkg.passthru.dependency-groups.${name'} or { };
           in
-          concatMap (name: recurse name extra'.${name}) (attrNames extra')
+          throwIf (extra' == { } && group' == { })
+            "Extra/group name '${name'}' does not match either extra or dependency group"
+            concatMap
+            (name: recurse name extra'.${name})
+            (attrNames extra')
+          ++ concatMap (name: recurse name group'.${name}) (attrNames group')
         ) extras;
 
       # Memoise known build systems with no extras enabled for better performance
@@ -74,16 +80,25 @@ in
           let
             m = match "(.+)@(.*)" key;
           in
-          # We're looking for a package with extra
+          # We're looking for a package with extra or dependency group
           if m != null then
             (
               let
                 pkg = set.${elemAt m 0};
-                dependencies = pkg.passthru.optional-dependencies.${elemAt m 1};
+                name' = elemAt m 1;
+                extras' = pkg.passthru.optional-dependencies.${name'} or { };
+                groups' = pkg.passthru.dependency-groups.${name'} or { };
               in
-              concatMap (name: [ (mkKey name) ] ++ map (extra: mkKey "${name}@${extra}") dependencies.${name}) (
-                attrNames dependencies
-              )
+              throwIf (extras' == { } && groups' == { })
+                "Extra/group name '${name'}' does not match either extra or dependency group"
+                (
+                  concatMap (name: [ (mkKey name) ] ++ map (extra: mkKey "${name}@${extra}") extras'.${name}) (
+                    attrNames extras'
+                  )
+                  ++ concatMap (name: [ (mkKey name) ] ++ map (group: mkKey "${name}@${group}") groups'.${name}) (
+                    attrNames groups'
+                  )
+                )
             )
           # Root package with no extra
           else