From ef651975fe612f85a9b09cece5d6dc2cdd52a818 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 21:59:07 +0100 Subject: [PATCH] ydiff: fix build --- .../python-modules/ydiff/default.nix | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix index 4b0d10f6b161..753d6e35f3f0 100644 --- a/pkgs/development/python-modules/ydiff/default.nix +++ b/pkgs/development/python-modules/ydiff/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pygments, gitMinimal, mercurial, subversion, - patchutils, + p4, less, }: @@ -15,21 +15,23 @@ buildPythonPackage rec { version = "1.4.2"; format = "setuptools"; - src = fetchPypi { - inherit pname version; - hash = "sha256-NpvmI9zeeVTZiXP7nbF4DWTwNTmCvzrIWBjz1i/0UrA="; + src = fetchFromGitHub { + owner = "ymattw"; + repo = "ydiff"; + tag = version; + hash = "sha256-JaGkABroj+/7MrgpFYI2vE1bndsilIodopMUnfmNhwA="; }; patchPhase = '' substituteInPlace ydiff.py \ - --replace "['git'" "['${gitMinimal}/bin/git'" \ - --replace "['hg'" "['${mercurial}/bin/hg'" \ - --replace "['svn'" "['${subversion}/bin/svn'" \ - --replace "['filterdiff'" "['${patchutils}/bin/filterdiff'" \ - --replace "['less'" "['${less}/bin/less'" # doesn't support PAGER from env + --replace-fail "['git'" "['${lib.getExe gitMinimal}'" \ + --replace-fail "['hg'" "['${lib.getExe mercurial}'" \ + --replace-fail "['svn'" "['${lib.getExe subversion}'" \ + --replace-fail "['p4'" "['${lib.getExe p4}'" \ + --replace-fail "['less'" "['${lib.getExe less}'" # doesn't support PAGER from env substituteInPlace tests/test_ydiff.py \ - --replace /bin/rm rm \ - --replace /bin/sh sh + --replace-fail /bin/rm rm \ + --replace-fail /bin/sh sh patchShebangs setup.py patchShebangs tests/*.sh '';