From 16f2c654c6673a2b72225c81fb73af830139e33c Mon Sep 17 00:00:00 2001
From: DavHau <hsngrmpf+github@gmail.com>
Date: Wed, 24 Jan 2024 15:06:03 +0700
Subject: [PATCH] pdm: stop using config.deps.python3 in favor of
 config.deps.python

---
 .../single-language/python-pdm/default.nix    |  7 +++++--
 modules/dream2nix/WIP-python-pdm/default.nix  | 19 +++++++++----------
 .../dream2nix/WIP-python-pdm/interface.nix    |  3 ---
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/examples/packages/single-language/python-pdm/default.nix b/examples/packages/single-language/python-pdm/default.nix
index 67de09b4..ccc6d2c4 100644
--- a/examples/packages/single-language/python-pdm/default.nix
+++ b/examples/packages/single-language/python-pdm/default.nix
@@ -7,13 +7,16 @@
   imports = [
     dream2nix.modules.dream2nix.WIP-python-pdm
   ];
+  # select python 3.10
+  deps = {nixpkgs, ...}: {
+    python = nixpkgs.python310;
+  };
   pdm.lockfile = ./pdm.lock;
   pdm.pyproject = ./pyproject.toml;
-  pdm.pythonInterpreter = config.deps.python3;
   mkDerivation = {
     src = ./.;
     buildInputs = [
-      config.deps.python3.pkgs.pdm-backend
+      config.deps.python.pkgs.pdm-backend
     ];
   };
 }
diff --git a/modules/dream2nix/WIP-python-pdm/default.nix b/modules/dream2nix/WIP-python-pdm/default.nix
index d0b758e1..269c2aa7 100644
--- a/modules/dream2nix/WIP-python-pdm/default.nix
+++ b/modules/dream2nix/WIP-python-pdm/default.nix
@@ -6,9 +6,9 @@
 }: let
   libpdm = import ./lib.nix {
     inherit lib libpyproject;
-    python3 = config.deps.python3;
+    python3 = config.deps.python;
     targetPlatform =
-      lib.systems.elaborate config.deps.python3.stdenv.targetPlatform;
+      lib.systems.elaborate config.deps.python.stdenv.targetPlatform;
   };
 
   libpyproject = import (dream2nix.inputs.pyproject-nix + "/lib") {inherit lib;};
@@ -16,13 +16,13 @@
     inherit lib;
     curl = config.deps.curl;
     jq = config.deps.jq;
-    python3 = config.deps.python3;
+    python3 = config.deps.python;
     runCommand = config.deps.runCommand;
     stdenvNoCC = config.deps.stdenvNoCC;
   };
 
   lock_data = lib.importTOML config.pdm.lockfile;
-  environ = libpyproject.pep508.mkEnviron config.deps.python3;
+  environ = libpyproject.pep508.mkEnviron config.deps.python;
 
   pyproject = libpdm.loadPdmPyProject (lib.importTOML config.pdm.pyproject);
 
@@ -79,13 +79,12 @@ in {
       stdenvNoCC
       stdenv
       ;
-    python = config.deps.python3;
+    python = lib.mkDefault config.deps.python3;
   };
   overrideAll = {
     imports = [commonModule];
     deps = {nixpkgs, ...}: {
-      python3 = lib.mkDefault config.deps.python3;
-      python = lib.mkDefault config.deps.python3;
+      python = lib.mkDefault config.deps.python;
     };
     sourceSelector = lib.mkOptionDefault config.pdm.sourceSelector;
   };
@@ -94,7 +93,7 @@ in {
     format = lib.mkDefault "pyproject";
   };
   mkDerivation = {
-    buildInputs = map (name: config.deps.python3.pkgs.${name}) buildSystemNames;
+    buildInputs = map (name: config.deps.python.pkgs.${name}) buildSystemNames;
     propagatedBuildInputs =
       map
       (x: (lib.head (lib.attrValues x)).public)
@@ -160,8 +159,8 @@ in {
             doCheck = lib.mkDefault false;
             dontStrip = lib.mkDefault true;
           };
-          # required for python3.withPackages to recognize it as a python package.
-          public.pythonModule = config.deps.python3;
+          # required for python.withPackages to recognize it as a python package.
+          public.pythonModule = config.deps.python;
         };
       });
     in {inherit packages;};
diff --git a/modules/dream2nix/WIP-python-pdm/interface.nix b/modules/dream2nix/WIP-python-pdm/interface.nix
index e37098ac..670a6657 100644
--- a/modules/dream2nix/WIP-python-pdm/interface.nix
+++ b/modules/dream2nix/WIP-python-pdm/interface.nix
@@ -14,9 +14,6 @@ in {
     pyproject = l.mkOption {
       type = t.path;
     };
-    pythonInterpreter = l.mkOption {
-      type = t.package;
-    };
 
     sourceSelector = import ./sourceSelectorOption.nix {inherit lib;};
   };