overrides: add pillow, psycopg2

modules/dream2nix/WIP-python-pdm/default.nix

@@ -90,21 +90,23 @@ in {
 
       packages = lib.flip lib.mapAttrs transitiveGroupDeps (name: pkg: {
         ${pkg.version}.module = {...} @ depConfig: let
+          cfg = depConfig.config;
           selector =
-            if lib.isFunction depConfig.config.sourceSelector
-            then depConfig.config.sourceSelector
-            else if depConfig.config.sourceSelector == "wheel"
+            if lib.isFunction cfg.sourceSelector
+            then cfg.sourceSelector
+            else if cfg.sourceSelector == "wheel"
             then libpdm.preferWheelSelector
-            else if depConfig.config.sourceSelector == "sdist"
+            else if cfg.sourceSelector == "sdist"
             then libpdm.preferSdistSelector
-            else throw "Invalid sourceSelector: ${depConfig.config.sourceSelector}";
+            else throw "Invalid sourceSelector: ${cfg.sourceSelector}";
           source = pkg.sources.${selector (lib.attrNames pkg.sources)};
         in {
           imports = [
             ./interface-dependency.nix
             dream2nix.modules.dream2nix.buildPythonPackage
             dream2nix.modules.dream2nix.mkDerivation
             dream2nix.modules.dream2nix.package-func
+            (dream2nix.overrides.python.${name} or {})
           ];
           inherit name;
           version = pkg.version;

overrides/python/_template/default.nix

@@ -0,0 +1,6 @@
+{
+  config,
+  lib,
+  ...
+}: {
+}

overrides/python/pillow/default.nix

@@ -0,0 +1,15 @@
+{
+  config,
+  lib,
+  dream2nix,
+  ...
+}: let
+  isSdist = lib.hasSuffix ".tar.gz" config.mkDerivation.src;
+in {
+  # enable overrides from nixpkgs
+  imports = [dream2nix.modules.dream2nix.nixpkgs-overrides];
+  nixpkgs-overrides.enable = isSdist;
+  nixpkgs-overrides.exclude = ["propagatedBuildInputs"];
+  # TODO: upstream: fix setuptools collision (build-hook propagates setuptools)
+  buildPythonPackage.catchConflicts = ! isSdist;
+}

overrides/python/psycopg2/default.nix

@@ -0,0 +1,22 @@
+{
+  config,
+  lib,
+  dream2nix,
+  ...
+}: let
+  isSdist = lib.hasSuffix ".tar.gz" config.mkDerivation.src;
+in {
+  deps = {nixpkgs, ...}: {
+    inherit (nixpkgs) postgresql;
+  };
+
+  # enable overrides from nixpkgs
+  imports = [dream2nix.modules.dream2nix.nixpkgs-overrides];
+  nixpkgs-overrides.enable = isSdist;
+
+  # add postgresql to nativeBuildInputs
+  mkDerivation.nativeBuildInputs = lib.mkIf isSdist [config.deps.postgresql];
+
+  # TODO: upstream: fix setuptools collision (build-hook propagates setuptools)
+  buildPythonPackage.catchConflicts = ! isSdist;
+}