build: update uv2nix usage

mirkolenz · Nov 25, 2024 · 6f3ee12 · 6f3ee12
1 parent ba24e4d
commit 6f3ee12
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 11 deletions.
diff --git a/default.nix b/default.nix
@@ -9,6 +9,7 @@
   asciinema-agg,
   uv2nix,
   pyproject-nix,
+  pyproject-build-systems,
 }:
 let
   pdocRepo = fetchFromGitHub {
@@ -98,6 +99,7 @@ let
   };
   pythonSet = baseSet.overrideScope (
     lib.composeManyExtensions [
+      pyproject-build-systems.overlays.default
       pyprojectOverlay
       pyprojectOverrides
     ]

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -12,14 +12,20 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     pyproject-nix = {
-      url = "github:nix-community/pyproject.nix";
+      url = "github:pyproject-nix/pyproject.nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     uv2nix = {
-      url = "github:adisbladis/uv2nix";
+      url = "github:pyproject-nix/uv2nix";
       inputs.pyproject-nix.follows = "pyproject-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    pyproject-build-systems = {
+      url = "github:pyproject-nix/build-system-pkgs";
+      inputs.pyproject-nix.follows = "pyproject-nix";
+      inputs.uv2nix.follows = "uv2nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
   outputs =
     inputs@{
@@ -28,7 +34,6 @@
       flake-parts,
       systems,
       flocken,
-      pyproject-nix,
       uv2nix,
       ...
     }:
@@ -74,7 +79,7 @@
             };
           };
           legacyPackages.pythonSet = pkgs.callPackage ./default.nix {
-            inherit (inputs) uv2nix pyproject-nix;
+            inherit (inputs) uv2nix pyproject-nix pyproject-build-systems;
           };
           packages = {
             inherit (pythonSet.makejinja.passthru) docs;