diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix index 8469a151aa09..e2be6e9aca31 100644 --- a/pkgs/tools/text/icdiff/default.nix +++ b/pkgs/tools/text/icdiff/default.nix @@ -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; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c49aeeda5279..9929b4e94846 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4093dac55c84..000b1c572a63 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12610,8 +12610,6 @@ in { }; }; - icdiff = callPackage ../tools/text/icdiff {}; - imageio = buildPythonPackage rec { name = "imageio-${version}"; version = "1.6";