diff options
| author | joachifm <joachifm@users.noreply.github.com> | 2016-03-24 12:23:53 +0000 |
|---|---|---|
| committer | joachifm <joachifm@users.noreply.github.com> | 2016-03-24 12:23:53 +0000 |
| commit | 8c02233f2c44eef0f8f697c3fca58e026e815b34 (patch) | |
| tree | 75091aaee920425a6da18d74fe49b43a59047fdf | |
| parent | 1f8ffdde5bd1a7f3d985bbb62478c21670e60e11 (diff) | |
| parent | 4fad4d49f616697b06f0ee7351f1223f54339979 (diff) | |
| download | nixlib-8c02233f2c44eef0f8f697c3fca58e026e815b34.tar nixlib-8c02233f2c44eef0f8f697c3fca58e026e815b34.tar.gz nixlib-8c02233f2c44eef0f8f697c3fca58e026e815b34.tar.bz2 nixlib-8c02233f2c44eef0f8f697c3fca58e026e815b34.tar.lz nixlib-8c02233f2c44eef0f8f697c3fca58e026e815b34.tar.xz nixlib-8c02233f2c44eef0f8f697c3fca58e026e815b34.tar.zst nixlib-8c02233f2c44eef0f8f697c3fca58e026e815b34.zip | |
Merge pull request #14158 from aneeshusa/add-icdiff
icdiff: init at 1.7.3
| -rw-r--r-- | pkgs/tools/text/icdiff/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix new file mode 100644 index 000000000000..8469a151aa09 --- /dev/null +++ b/pkgs/tools/text/icdiff/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchFromGitHub, buildPythonApplication }: + +buildPythonApplication rec { + name = "icdiff-${version}"; + version = "1.7.3"; + + src = fetchFromGitHub { + owner = "jeffkaufman"; + repo = "icdiff"; + rev = "release-${version}"; + sha256 = "1k7dlf2i40flsrvkma1k1vii9hsjwdmwryx65q0n0yj4frv7ky6k"; + }; + + meta = with stdenv.lib; { + homepage = https://www.jefftk.com/icdiff; + description = "Side-by-side highlighted command line diffs"; + maintainers = with maintainers; [ aneeshusa ]; + license = licenses.psfl; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c2bb0625fa8b..54ecc374b35f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10327,6 +10327,8 @@ in modules // { }; }; + icdiff = callPackage ../tools/text/icdiff {}; + importlib = buildPythonPackage rec { name = "importlib-1.0.2"; |