From 7ad1b2d4e1eb8f7b127271f2540db60eee0c6be0 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 11 Aug 2023 22:59:49 -0700 Subject: [PATCH] python3.pkgs.single-version: use poetry-core instead of poetry (#248626) --- .../single-version/0001-set-poetry-core.patch | 21 ------------------- .../python-modules/single-version/default.nix | 15 +++++++++++-- 2 files changed, 13 insertions(+), 23 deletions(-) delete mode 100644 pkgs/development/python-modules/single-version/0001-set-poetry-core.patch diff --git a/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch b/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch deleted file mode 100644 index 4c6f869c0c27..000000000000 --- a/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch +++ /dev/null @@ -1,21 +0,0 @@ -From d949b37151cd538d4c6a15e1ba6c1343f8bff76d Mon Sep 17 00:00:00 2001 -From: "P. R. d. O" -Date: Mon, 6 Dec 2021 15:26:19 -0600 -Subject: [PATCH] set poetry-core - ---- - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyproject.toml b/pyproject.toml -index d3fdc52..bd7ddc2 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -27,4 +27,4 @@ black = "^19.10b0" - - [build-system] - requires = ["poetry>=0.12"] --build-backend = "poetry.masonry.api" -+build-backend = "poetry.core.masonry.api" --- -2.33.1 diff --git a/pkgs/development/python-modules/single-version/default.nix b/pkgs/development/python-modules/single-version/default.nix index b1ba4adfa120..53989afe94f8 100644 --- a/pkgs/development/python-modules/single-version/default.nix +++ b/pkgs/development/python-modules/single-version/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchFromGitHub, poetry-core, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pytestCheckHook +}: buildPythonPackage rec { pname = "single-version"; @@ -13,7 +19,12 @@ buildPythonPackage rec { }; patches = [ - ./0001-set-poetry-core.patch + # https://github.com/hongquan/single-version/pull/4 + (fetchpatch { + name = "use-poetry-core.patch"; + url = "https://github.com/hongquan/single-version/commit/0cdf9795cb0522e90a8dc00306f1ff7bb85621ad.patch"; + hash = "sha256-eT9G1XvkNF0+NKgx+yN7ei53xIEMvnc7V/KtPLqlWik="; + }) ]; nativeBuildInputs = [ poetry-core ];