use upstreamed python packages

Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>

deployment/check/data-model-tf/default.nix

@@ -6,7 +6,9 @@
 
 let
   overlay = _: prev: {
-    terraform-backend = prev.callPackage ../../modules/terraform-backend/package.nix { };
+    terraform-backend =
+      prev.callPackage "${sources.nixpkgs-unstable}/pkgs/by-name/te/terraform-backend/package.nix"
+        { };
     # FIXME centralize overlays
     # XXX using recent revision for https://github.com/NixOS/nixpkgs/pull/447849
     opentofu =

deployment/modules/terraform-backend/package.nix

@@ -1,32 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-}:
-
-# FIXME upstream: https://github.com/NixOS/nixpkgs/pull/447753
-buildGoModule rec {
-  pname = "terraform-backend";
-  version = "0.1.3";
-
-  src = fetchFromGitHub {
-    owner = "nimbolus";
-    repo = "terraform-backend";
-    tag = "v${version}";
-    hash = "sha256-S3ih7dLSQs3xJMHyQyWy43OG1maizBPVT8IsrWcSRUM=";
-  };
-
-  vendorHash = "sha256-5L8MNhjEPI3OOmtHdkB9ZQp02d7nzPp5h0/gVHTiCws=";
-
-  ldflags = [
-    "-s"
-    "-w"
-  ];
-
-  meta = {
-    description = "State backend server which implements the Terraform HTTP backend API with pluggable modules for authentication, storage, locking and state encryption";
-    homepage = "https://github.com/nimbolus/terraform-backend";
-    license = lib.licenses.bsd3;
-    mainProgram = "cmd";
-  };
-}

npins/sources.json

@@ -189,9 +189,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10",
+      "revision": "2dad7af78a183b6c486702c18af8a9544f298377",
-      "url": "https://github.com/nixos/nixpkgs/archive/d7f52a7a640bc54c7bb414cca603835bf8dd4b10.tar.gz",
+      "url": "https://github.com/nixos/nixpkgs/archive/2dad7af78a183b6c486702c18af8a9544f298377.tar.gz",
-      "hash": "0c9kjncpmbdx6gwww9fn81hyr3bngi4hg51g4n2q4808c321kf4j"
+      "hash": "12icrzyc8h6yh5c60wdhaypzc17ygwz664h92jj112pf6whgi2id"
     },
     "proxmox-nixos": {
       "type": "Git",

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
 {

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;
+        django-pydantic-field =
-        value = callPackage (dir + "/${name}") { };
+          pkgs.callPackage
-      }) (attrNames (readDir dir))
+            "${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

panel/nix/python-packages/django-pydantic-field/default.nix

@@ -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;
-  };
-}

panel/nix/python-packages/drf-pydantic/default.nix

@@ -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;
-  };
-}