diff options
| author | Michael Brantley <nixpkgs-commits@deshaw.com> | 2020-02-10 08:11:56 -0500 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-02-14 14:52:44 -0800 |
| commit | ce8d1c2adfcbc9dd2dd7ad5aa801b6d0886408e4 (patch) | |
| tree | 41c233c560745aadfe1ac8088c3d4b944722a7f7 | |
| parent | ee936405b73f9047f8acb68013486f2086a422d8 (diff) | |
pythonPackages.ydiff: init at 1.1
| -rw-r--r-- | pkgs/development/python-modules/ydiff/default.nix | 29 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 31 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix new file mode 100644 index 000000000000..ea30e62546fe --- /dev/null +++ b/pkgs/development/python-modules/ydiff/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "ydiff"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0mxcl17sx1d4vaw22ammnnn3y19mm7r6ljbarcjzi519klz26bnf"; + }; + + # test suite requires a multitude of other version control tooling + # currently only a single file, an import/usage should suffice + checkPhase = '' + $out/bin/ydiff --help + ''; + + meta = with stdenv.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 Git/Mercurial/Svn + workspace 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 = [ maintainers.limeytexan ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ed8f513db86a..3adaab1c33f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5770,6 +5770,8 @@ in { xxhash = callPackage ../development/python-modules/xxhash { }; + ydiff = callPackage ../development/python-modules/ydiff { }; + yoda = toPythonModule (pkgs.yoda.override { inherit python; }); |