refactor(pip): move flattenDependencies and ignoredDependencies to separate module pip-hotfixes

modules/drv-parts/pip-hotfixes/default.nix

@@ -0,0 +1,48 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  l = lib // builtins;
+  cfg = config.pip;
+  metadata = config.lock.content.fetchPipMetadata;
+
+  ignored = l.genAttrs cfg.ignoredDependencies (name: true);
+
+  filterTarget = target:
+    l.filterAttrs (name: target: ! ignored ? ${name}) target;
+
+  # filter out ignored dependencies
+  targets = l.flip l.mapAttrs metadata.targets (
+    targetName: target:
+      l.flip l.mapAttrs (filterTarget target) (
+        packageName: deps:
+          l.filter (dep: ! ignored ? ${dep}) deps
+      )
+  );
+in {
+  imports = [
+    ./interface.nix
+  ];
+  pip.targets = targets;
+  mkDerivation.propagatedBuildInputs =
+    if cfg.flattenDependencies
+    then
+      if targets.default ? ${config.name}
+      then
+        throw ''
+          Top-level package ${config.name} is listed in the lockfile.
+          Set `pip.flattenDependencies` to false to use only the top-level dependencies.
+        ''
+      else let
+        topLevelDepNames = l.attrNames (targets.default);
+      in
+        l.map (name: cfg.drvs.${name}.public.out) topLevelDepNames
+    else if ! targets.default ? ${config.name}
+    then
+      throw ''
+        Top-level package ${config.name} is not listed in the lockfile.
+        Set `pip.flattenDependencies` to true to use all dependencies for the top-level package.
+      ''
+    else [];
+}

modules/drv-parts/pip-hotfixes/interface.nix

@@ -0,0 +1,25 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  l = lib // builtins;
+  t = l.types;
+in {
+  options.pip = {
+    flattenDependencies = l.mkOption {
+      type = t.bool;
+      description = ''
+        Use all dependencies as top-level dependencies
+      '';
+      default = false;
+    };
+    ignoredDependencies = l.mkOption {
+      type = t.listOf t.str;
+      description = ''
+        list of dependencies to ignore
+      '';
+      default = ["wheel"];
+    };
+  };
+}

modules/drv-parts/pip/default.nix

@@ -9,19 +9,8 @@
   python = config.deps.python;
   metadata = config.lock.content.fetchPipMetadata;
 
-  ignored = l.genAttrs cfg.ignoredDependencies (name: true);
-
-  filterTarget = target:
-    l.filterAttrs (name: target: ! ignored ? ${name}) target;
-
   # filter out ignored dependencies
-  targets = l.flip l.mapAttrs metadata.targets (
+  targets = cfg.targets;
-    targetName: target:
-      l.flip l.mapAttrs (filterTarget target) (
-        packageName: deps:
-          l.filter (dep: ! ignored ? ${dep}) deps
-      )
-  );
 
   writers = import ../../../pkgs/writers {
     inherit lib;
@@ -113,6 +102,7 @@ in {
   imports = [
     commonModule
     ./interface.nix
+    ../pip-hotfixes
   ];
 
   config = {
@@ -138,26 +128,6 @@ in {
 
     mkDerivation = {
       dontStrip = l.mkDefault true;
-      propagatedBuildInputs =
-        if cfg.flattenDependencies
-        then
-          if targets.default ? ${config.name}
-          then
-            throw ''
-              Top-level package ${config.name} is listed in the lockfile.
-              Set `pip.flattenDependencies` to false to use only the top-level dependencies.
-            ''
-          else let
-            topLevelDepNames = l.attrNames (targets.default);
-          in
-            l.map (name: cfg.drvs.${name}.public.out) topLevelDepNames
-        else if ! targets.default ? ${config.name}
-        then
-          throw ''
-            Top-level package ${config.name} is not listed in the lockfile.
-            Set `pip.flattenDependencies` to true to use all dependencies for the top-level package.
-          ''
-        else [];
     };
   };
 }

modules/drv-parts/pip/interface.nix

@@ -9,19 +9,11 @@
   t = l.types;
 in {
   options.pip = {
-    flattenDependencies = l.mkOption {
+    # internal options to pass data between pip-hotfixes and pip
-      type = t.bool;
+    targets = l.mkOption {
-      description = ''
+      type = t.raw;
-        Use all dependencies as top-level dependencies
+      internal = true;
-      '';
+      description = "the targets of the lock file to build";
-      default = false;
-    };
-    ignoredDependencies = l.mkOption {
-      type = t.listOf t.str;
-      description = ''
-        list of dependencies to ignore
-      '';
-      default = ["wheel"];
     };
     pypiSnapshotDate = l.mkOption {
       type = t.str;