diff options
author | Michiel Leenaars <ml.software@leenaa.rs> | 2018-08-19 09:33:14 +0200 |
---|---|---|
committer | Michiel Leenaars <ml.software@leenaa.rs> | 2018-08-25 22:52:51 +0200 |
commit | de61d0da203889a6ebd07085a406ac8d3e90ee30 (patch) | |
tree | 4b00192a8cc332a59f4d06313e01c438320df035 | |
parent | 0ad3721616039fa009e487908d16bf7984302cbb (diff) | |
download | nixlib-de61d0da203889a6ebd07085a406ac8d3e90ee30.tar nixlib-de61d0da203889a6ebd07085a406ac8d3e90ee30.tar.gz nixlib-de61d0da203889a6ebd07085a406ac8d3e90ee30.tar.bz2 nixlib-de61d0da203889a6ebd07085a406ac8d3e90ee30.tar.lz nixlib-de61d0da203889a6ebd07085a406ac8d3e90ee30.tar.xz nixlib-de61d0da203889a6ebd07085a406ac8d3e90ee30.tar.zst nixlib-de61d0da203889a6ebd07085a406ac8d3e90ee30.zip |
ydiff: init at 1.1
-rw-r--r-- | pkgs/development/tools/ydiff/default.nix | 45 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 47 insertions, 0 deletions
diff --git a/pkgs/development/tools/ydiff/default.nix b/pkgs/development/tools/ydiff/default.nix new file mode 100644 index 000000000000..c2f72138db5f --- /dev/null +++ b/pkgs/development/tools/ydiff/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, pythonPackages, python3Packages, less, patchutils, git +, subversion, coreutils, which }: + +with pythonPackages; + +buildPythonApplication rec { + pname = "ydiff"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0mxcl17sx1d4vaw22ammnnn3y19mm7r6ljbarcjzi519klz26bnf"; + }; + + patchPhase = '' + substituteInPlace tests/test_ydiff.py \ + --replace /bin/rm ${coreutils}/bin/rm \ + --replace /bin/sh ${stdenv.shell} + substituteInPlace Makefile \ + --replace "pep8 --ignore" "# pep8 --ignore" \ + --replace "python3 \`which coverage\`" "${python3Packages.coverage}/bin/coverage3" \ + --replace /bin/sh ${stdenv.shell} \ + --replace tests/regression.sh "${stdenv.shell} tests/regression.sh" + patchShebangs tests/*.sh + ''; + + buildInputs = [ docutils pygments ]; + propagatedBuildInputs = [ less patchutils ]; + checkInputs = [ coverage coreutils git subversion which ]; + + checkTarget = if isPy3k then "test3" else "test"; + + meta = { + homepage = https://github.com/ymattw/ydiff; + description = "View colored, incremental diff in workspace or from stdin"; + 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. + ''; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81841abdddf8..2758719a93e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19416,6 +19416,8 @@ with pkgs; yate = callPackage ../applications/misc/yate { }; + ydiff = callPackage ../development/tools/ydiff { }; + yed = callPackage ../applications/graphics/yed {}; inherit (gnome3) yelp; |