From 97ded90c9e30f291034d337f2d375c5494b2d2b9 Mon Sep 17 00:00:00 2001
From: Max <max@privatevoid.net>
Date: Tue, 21 Mar 2023 16:51:59 +0100
Subject: [PATCH] packages/build-support/buildPythonPackage: fix for new
 drv-parts version

---
 .../buildPythonPackage/implementation.nix     | 103 ++++++++++--------
 packages/servers/reflex-cache/project.nix     |  16 +--
 2 files changed, 64 insertions(+), 55 deletions(-)

diff --git a/packages/build-support/drv-parts/backends/buildPythonPackage/implementation.nix b/packages/build-support/drv-parts/backends/buildPythonPackage/implementation.nix
index 09259b7..cc7cc6d 100644
--- a/packages/build-support/drv-parts/backends/buildPythonPackage/implementation.nix
+++ b/packages/build-support/drv-parts/backends/buildPythonPackage/implementation.nix
@@ -1,4 +1,4 @@
-{ config, dependencySets, lib, ... }:
+{ config, dependencySets, drv-parts, lib, ... }:
 
 let
   inherit (config) deps;
@@ -19,7 +19,11 @@ let
 in
 
 {
-  pname = lib.mkIf hasPyproject (lib.mkDefault pyproject.tool.poetry.name);
+  imports = [
+    drv-parts.modules.drv-parts.mkDerivation
+  ];
+
+  name = lib.mkIf hasPyproject (lib.mkDefault pyproject.tool.poetry.name);
   version = lib.mkIf hasPyproject (lib.mkDefault pyproject.tool.poetry.version);
 
   deps = { pkgs, python3Packages, ... }: {
@@ -46,56 +50,59 @@ in
     ;
   };
 
-  nativeBuildInputs = with deps; [
-    python
-    wrapPython
-    ensureNewerSourcesForZipFilesHook
-    pythonRemoveTestsDirHook
-  ] ++ lib.optionals config.catchConflicts [
-    pythonCatchConflictsHook
-  ] ++ lib.optionals config.removeBinByteCode [
-    pythonRemoveBinBytecodeHook
-  ] ++ lib.optionals (lib.hasSuffix "zip" (config.src.name or "")) [
-    unzip
-  ] ++ lib.optionals (config.format == "setuptools") [
-    setuptoolsBuildHook
-  ] ++ lib.optionals (config.format == "flit") [
-    flitBuildHook
-  ] ++ lib.optionals (config.format == "pyproject") [
-    pipBuildHook
-  ] ++ lib.optionals (config.format == "wheel") [
-    wheelUnpackHook
-  ] ++ lib.optionals (config.format == "egg") [
-    eggUnpackHook eggBuildHook eggInstallHook
-  ] ++ lib.optionals (!(config.format == "other") || config.dontUsePipInstall) [
-    pipInstallHook
-  ] ++ lib.optionals (python.stdenv.buildPlatform == python.stdenv.hostPlatform) [
-    # This is a test, however, it should be ran independent of the checkPhase and checkInputs
-    pythonImportsCheckHook
-  ] ++ lib.optionals (python.pythonAtLeast "3.3") [
-    # Optionally enforce PEP420 for python3
-    pythonNamespacesHook
-  ] ++ lib.optionals withDistOutput [
-    pythonOutputDistHook
-  ];
-
-  propagatedBuildInputs = with deps; [
-    python
-  ];
-
   env = {
     LANG = "${if deps.python.stdenv.isDarwin then "en_US" else "C"}.UTF-8";
   };
 
-  doCheck = false;
-  doInstallCheck = lib.mkDefault true;
-  installCheckInputs = lib.optionals (config.format == "setuptools") [
-    deps.setuptoolsCheckHook
-  ];
+  mkDerivation = {
 
-  postFixup = lib.mkBefore (lib.optionalString (!config.dontWrapPythonPrograms) ''
-    wrapPythonPrograms
-  '');
+    nativeBuildInputs = with deps; [
+      python
+      wrapPython
+      ensureNewerSourcesForZipFilesHook
+      pythonRemoveTestsDirHook
+    ] ++ lib.optionals config.catchConflicts [
+      pythonCatchConflictsHook
+    ] ++ lib.optionals config.removeBinByteCode [
+      pythonRemoveBinBytecodeHook
+    ] ++ lib.optionals (lib.hasSuffix "zip" (config.src.name or "")) [
+      unzip
+    ] ++ lib.optionals (config.format == "setuptools") [
+      setuptoolsBuildHook
+    ] ++ lib.optionals (config.format == "flit") [
+      flitBuildHook
+    ] ++ lib.optionals (config.format == "pyproject") [
+      pipBuildHook
+    ] ++ lib.optionals (config.format == "wheel") [
+      wheelUnpackHook
+    ] ++ lib.optionals (config.format == "egg") [
+      eggUnpackHook eggBuildHook eggInstallHook
+    ] ++ lib.optionals (!(config.format == "other") || config.dontUsePipInstall) [
+      pipInstallHook
+    ] ++ lib.optionals (python.stdenv.buildPlatform == python.stdenv.hostPlatform) [
+      # This is a test, however, it should be ran independent of the checkPhase and checkInputs
+      pythonImportsCheckHook
+    ] ++ lib.optionals (python.pythonAtLeast "3.3") [
+      # Optionally enforce PEP420 for python3
+      pythonNamespacesHook
+    ] ++ lib.optionals withDistOutput [
+      pythonOutputDistHook
+    ];
 
-  outputs = [ "out" ] ++ lib.optional withDistOutput "dist";
+    propagatedBuildInputs = with deps; [
+      python
+    ];
+
+    doCheck = false;
+    doInstallCheck = lib.mkDefault true;
+    installCheckInputs = lib.optionals (config.format == "setuptools") [
+      deps.setuptoolsCheckHook
+    ];
+
+    postFixup = lib.mkBefore (lib.optionalString (!config.dontWrapPythonPrograms) ''
+      wrapPythonPrograms
+    '');
+
+    outputs = [ "out" ] ++ lib.optional withDistOutput "dist";
+  };
 }
diff --git a/packages/servers/reflex-cache/project.nix b/packages/servers/reflex-cache/project.nix
index 801f22b..05f9e14 100644
--- a/packages/servers/reflex-cache/project.nix
+++ b/packages/servers/reflex-cache/project.nix
@@ -25,14 +25,16 @@
       ];
       pyprojectToml = ./pyproject.toml;
 
-      propagatedBuildInputs = deps;
+      mkDerivation = {
+        propagatedBuildInputs = deps;
 
-      src = with inputs.nix-filter.lib; filter {
-        root = ./.;
-        include = [
-          "pyproject.toml"
-          (inDirectory "reflex_cache")
-        ];
+        src = with inputs.nix-filter.lib; filter {
+          root = ./.;
+          include = [
+            "pyproject.toml"
+            (inDirectory "reflex_cache")
+          ];
+        };
       };
     };
   };