98c3490196
We were packaging ydiff twice! In this patch, I've merged the two expressions into one, trying to take the best of each. ydiff (top-level) didn't support being used as a Python library, which is required by one other package (patroni), so I chose gitAndTools.ydiff as the starting point, then moved in the longDescription from the top-level one, as well as the code used to run the tests. While I was there, I fixed the tests, which were intended to be run by the top-level ydiff but actually were not, because unlike mkDerivation buildPythonApplication will not run `make test' by default. Also, top-level ydiff previously propagated less and patchutils, meaning they'd have been installed globally instead of just referenced by ydiff. gitAndTools.ydiff just did nothing. Both also expected to find git, hg, and svn in the environment, which was impure. So now all these programs are referenced by store path from ydiff, for purity.
49 lines
1.6 KiB
Nix
49 lines
1.6 KiB
Nix
{ stdenv, lib, buildPythonPackage, fetchPypi, docutils, pygments
|
|
, gitMinimal, mercurial, subversion, patchutils, less
|
|
}:
|
|
|
|
buildPythonPackage rec {
|
|
pname = "ydiff";
|
|
version = "1.2";
|
|
|
|
src = fetchPypi {
|
|
inherit pname version;
|
|
sha256 = "f5430577ecd30974d766ee9b8333e06dc76a947b4aae36d39612a0787865a121";
|
|
};
|
|
|
|
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
|
|
substituteInPlace tests/test_ydiff.py \
|
|
--replace /bin/rm rm \
|
|
--replace /bin/sh sh
|
|
patchShebangs setup.py
|
|
patchShebangs tests/*.sh
|
|
'';
|
|
|
|
checkInputs = [ docutils pygments ];
|
|
|
|
checkPhase = ''
|
|
runHook preCheck
|
|
make doc-check reg # We don't want the linter or coverage check.
|
|
runHook postCheck
|
|
'';
|
|
|
|
meta = with lib; {
|
|
description = "View colored, incremental diff in workspace or from stdin with side by side and auto pager support (Was \"cdiff\")";
|
|
longDescription = ''
|
|
Term based tool to view colored, incremental diff in a version
|
|
controlled workspace (supports Git, Mercurial, Perforce and Svn
|
|
so far) or from stdin, with side by side (similar to diff -y)
|
|
and auto pager support.
|
|
'';
|
|
homepage = "https://github.com/ymattw/ydiff";
|
|
license = licenses.bsd3;
|
|
maintainers = (with maintainers; [ leenaars ]) ++ teams.deshaw.members;
|
|
};
|
|
}
|