From 01578d595acc35de1aad2c5fdc4c649c789a84ef Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 23 Aug 2023 14:36:07 -0700 Subject: tesh: replace poetry with poetry-core --- pkgs/tools/text/tesh/default.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'pkgs/tools/text/tesh') diff --git a/pkgs/tools/text/tesh/default.nix b/pkgs/tools/text/tesh/default.nix index 7961b120d213..0b702ae0052a 100644 --- a/pkgs/tools/text/tesh/default.nix +++ b/pkgs/tools/text/tesh/default.nix @@ -1,4 +1,4 @@ -{ python3Packages, fetchFromGitHub }: +{ python3Packages, fetchFromGitHub, fetchpatch }: let version = "0.3.0"; @@ -12,13 +12,23 @@ in python3Packages.buildPythonPackage rec { owner = "OceanSprint"; repo = "tesh"; rev = version; - sha256 = "sha256-/CSYz2YXbjKZszb1HMOCS+srVJ+TcFSeLeuz9VvtlI4="; + hash = "sha256-/CSYz2YXbjKZszb1HMOCS+srVJ+TcFSeLeuz9VvtlI4="; }; - prePatch = '' - substituteInPlace pyproject.toml \ - --replace "poetry.masonry" "poetry.core.masonry" - ''; + patches = [ + # https://github.com/OceanSprint/tesh/pull/49 + (fetchpatch { + name = "replace-poetry-with-poetry-core-1.patch"; + url = "https://github.com/OceanSprint/tesh/commit/49b90f5a3c9cf111931393248943b1da966dc3ec.patch"; + hash = "sha256-s+eGO4NXTGbyXcLP37kCg4GDrjAsYIlOwNDR1Q7+1Uc="; + }) + # https://github.com/OceanSprint/tesh/pull/50 + (fetchpatch { + name = "replace-poetry-with-poetry-core-2.patch"; + url = "https://github.com/OceanSprint/tesh/commit/66798b54f28dc0b72159ee3a2144895cf945eaf0.patch"; + hash = "sha256-f3uL7TZlkrTOWYihwWNfhrY5/xlBrclAMnbxRNXCGJw="; + }) + ]; checkInputs = [ python3Packages.pytest ]; nativeBuildInputs = [ python3Packages.poetry-core ]; -- cgit 1.4.1