diff options
author | K900 <me@0upti.me> | 2023-08-27 20:22:51 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-27 20:22:51 +0300 |
commit | f900e733c1602b4c46064a9ef0514bb2345a8949 (patch) | |
tree | bc00848dd275f6bd73d91bfe7b40543261a4fc60 /pkgs/tools/text | |
parent | 6ddd81bf116f33f66d1a72747bb75bd3e30d3e61 (diff) | |
parent | a7533453d96edf214c115963ae5840dbbc9fadcf (diff) | |
download | nixpkgs-f900e733c1602b4c46064a9ef0514bb2345a8949.tar nixpkgs-f900e733c1602b4c46064a9ef0514bb2345a8949.tar.gz nixpkgs-f900e733c1602b4c46064a9ef0514bb2345a8949.tar.bz2 nixpkgs-f900e733c1602b4c46064a9ef0514bb2345a8949.tar.lz nixpkgs-f900e733c1602b4c46064a9ef0514bb2345a8949.tar.xz nixpkgs-f900e733c1602b4c46064a9ef0514bb2345a8949.tar.zst nixpkgs-f900e733c1602b4c46064a9ef0514bb2345a8949.zip |
Merge pull request #250778 from NixOS/staging-next
staging-next 2023-08-22
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r-- | pkgs/tools/text/tesh/default.nix | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/pkgs/tools/text/tesh/default.nix b/pkgs/tools/text/tesh/default.nix index 7961b120d21..0b702ae0052 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 ]; |