From 80e67835ca1ecf9a6b38e78488874b90a502e884 Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara@procolix.eu>
Date: Sat, 11 Oct 2025 14:14:40 +0200
Subject: [PATCH] use upstreamed python packages

Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>
---
 panel/nix/overlay.nix                         |  5 ++-
 panel/nix/python-packages/default.nix         | 28 ++++++++++---
 .../django-pydantic-field/default.nix         | 36 ----------------
 .../python-packages/drf-pydantic/default.nix  | 42 -------------------
 4 files changed, 26 insertions(+), 85 deletions(-)
 delete mode 100644 panel/nix/python-packages/django-pydantic-field/default.nix
 delete mode 100644 panel/nix/python-packages/drf-pydantic/default.nix

diff --git a/panel/nix/overlay.nix b/panel/nix/overlay.nix
index cbb7b8eb..3265f5e4 100644
--- a/panel/nix/overlay.nix
+++ b/panel/nix/overlay.nix
@@ -1,9 +1,12 @@
 /**
   Nixpkgs overlay adding extra packages needed for the application
 */
+{
+  sources ? import ../../npins,
+}:
 _: prev:
 let
-  extraPython3Packages = prev.callPackage ./python-packages { };
+  extraPython3Packages = prev.callPackage ./python-packages { inherit sources; };
 
 in
 {
diff --git a/panel/nix/python-packages/default.nix b/panel/nix/python-packages/default.nix
index 40d9dcb0..91b2dab5 100644
--- a/panel/nix/python-packages/default.nix
+++ b/panel/nix/python-packages/default.nix
@@ -13,7 +13,10 @@
   }
   ```
 */
-{ pkgs }:
+{
+  pkgs,
+  sources ? import ../../../npins,
+}:
 let
   callPackage = pkgs.lib.callPackageWith (pkgs // pkgs.python3.pkgs // extraPython3Packages);
 
@@ -22,11 +25,24 @@ let
       dir = toString ./.;
     in
     with builtins;
-    listToAttrs (
-      map (name: {
-        inherit name;
-        value = callPackage (dir + "/${name}") { };
-      }) (attrNames (readDir dir))
+    (
+      {
+        django-pydantic-field =
+          pkgs.callPackage
+            "${sources.nixpkgs-unstable}/pkgs/development/python-modules/django-pydantic-field/default.nix"
+            { };
+        drf-pydantic =
+          pkgs.callPackage
+            "${sources.nixpkgs-unstable}/pkgs/development/python-modules/drf-pydantic/default.nix"
+            { };
+      }
+      # will read further packages from sub-dirs here
+      // listToAttrs (
+        map (name: {
+          inherit name;
+          value = callPackage (dir + "/${name}") { };
+        }) (attrNames (readDir dir))
+      )
     );
 in
 extraPython3Packages
diff --git a/panel/nix/python-packages/django-pydantic-field/default.nix b/panel/nix/python-packages/django-pydantic-field/default.nix
deleted file mode 100644
index a1779961..00000000
--- a/panel/nix/python-packages/django-pydantic-field/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  django,
-  pydantic,
-  setuptools,
-}:
-
-buildPythonPackage rec {
-  _class = "package";
-
-  pname = "django-pydantic-field";
-  version = "v0.3.12";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "surenkov";
-    repo = pname;
-    rev = version;
-    hash = "sha256-rlnS67OGljWD8Sbyutb43txAH0jA2+8ju1ntSEP3whM=";
-  };
-
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [
-    django
-    pydantic
-  ];
-
-  meta = with lib; {
-    description = "";
-    homepage = "https://github.com/${src.owner}/${pname}";
-    license = licenses.mit;
-  };
-}
diff --git a/panel/nix/python-packages/drf-pydantic/default.nix b/panel/nix/python-packages/drf-pydantic/default.nix
deleted file mode 100644
index d7a6ef00..00000000
--- a/panel/nix/python-packages/drf-pydantic/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  django,
-  pydantic,
-  hatchling,
-  djangorestframework,
-}:
-
-buildPythonPackage rec {
-  _class = "package";
-
-  pname = "drf-pydantic";
-  version = "v2.9.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "KiaraGrouwstra";
-    repo = pname;
-    rev = "d21c879543bd106242bd7f86e79da1f668109579";
-    hash = "sha256-pk0/6BphIiXxR3cewBJ5nKii3kj3lDHLO9U9xqXDxI8=";
-  };
-
-  nativeBuildInputs = [
-    setuptools
-    hatchling
-  ];
-
-  propagatedBuildInputs = [
-    django
-    pydantic
-    djangorestframework
-  ];
-
-  meta = with lib; {
-    description = "";
-    homepage = "https://github.com/${src.owner}/${pname}";
-    license = licenses.mit;
-  };
-}