From 92b08b27dc0960e4d2f6e8305053149fb514f7e9 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Sun, 14 Dec 2025 01:24:46 -0800 Subject: [PATCH] Add new nixpkgs-25.11 pyproject boilerplate --- Changelog | 1 + default.nix | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index 702eefb..c36277a 100644 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ ## [Unreleased] +- Keep up with nixpkgs 25.11 ## [3.3.1] - 2025-07-09 diff --git a/default.nix b/default.nix index c0903a1..6618324 100644 --- a/default.nix +++ b/default.nix @@ -6,7 +6,8 @@ let checkInputsName = if checkInputsAreNative then "nativeCheckInputs" else "checkInputs"; - git-cache-fallback = { buildPythonPackage, fetchgit, git, backoff, mypy, }: + git-cache-fallback = + { buildPythonPackage, setuptools, fetchgit, git, backoff, mypy, }: buildPythonPackage rec { pname = "git-cache"; version = "1.5.0"; @@ -15,18 +16,22 @@ let rev = "v${version}"; hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww="; }; + pyproject = true; + build-system = [ setuptools ]; propagatedBuildInputs = [ backoff ]; "${checkInputsName}" = [ git mypy ]; doCheck = true; checkPhase = "./test.sh"; }; -in pkgs.python3Packages.callPackage -({ lib, buildPythonPackage, nix, git, autopep8, mypy, pylint, git-cache, }: +in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, setuptools, nix + , git, autopep8, mypy, pylint, git-cache, }: buildPythonPackage rec { pname = "pinch"; version = "3.3.2-pre"; src = lib.cleanSource ./.; + pyproject = true; + build-system = [ setuptools ]; propagatedBuildInputs = [ git-cache ]; "${checkInputsName}" = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ]; -- 2.50.1