Merge pull request #25847 from aneeshusa/update-icdiff-to-1.9.0

icdiff: 1.7.3 -> 1.9.0
This commit is contained in:
Jörg Thalheim 2017-05-18 06:50:22 +01:00 committed by GitHub
commit eda502d143
3 changed files with 6 additions and 6 deletions

View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, buildPythonApplication }:
{ stdenv, fetchFromGitHub, pythonPackages }:
buildPythonApplication rec {
pythonPackages.buildPythonApplication rec {
name = "icdiff-${version}";
version = "1.7.3";
version = "1.9.0";
src = fetchFromGitHub {
owner = "jeffkaufman";
repo = "icdiff";
rev = "release-${version}";
sha256 = "1k7dlf2i40flsrvkma1k1vii9hsjwdmwryx65q0n0yj4frv7ky6k";
sha256 = "03gcgj3xsqasvgkr8r0q1ljbw2kd2xmfb21qpxhk9lqqm2gl11sv";
};
meta = with stdenv.lib; {

View File

@ -996,6 +996,8 @@ with pkgs;
hr = callPackage ../applications/misc/hr { };
icdiff = callPackage ../tools/text/icdiff {};
interlock = callPackage ../servers/interlock {};
jbuilder = callPackage ../development/tools/ocaml/jbuilder { };

View File

@ -12616,8 +12616,6 @@ in {
};
};
icdiff = callPackage ../tools/text/icdiff {};
imageio = buildPythonPackage rec {
name = "imageio-${version}";
version = "1.6";