diff --git a/pkgs/development/ocaml-modules/camlimages/4.1.nix b/pkgs/development/ocaml-modules/camlimages/4.1.nix deleted file mode 100644 index d2d626acbfe..00000000000 --- a/pkgs/development/ocaml-modules/camlimages/4.1.nix +++ /dev/null @@ -1,42 +0,0 @@ -{stdenv, fetchurl, omake, ocaml, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: - -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; - -if stdenv.lib.versionAtLeast ocaml.version "4.06" -then throw "camlimages-4.1.2 is not available for OCaml ${ocaml.version}" -else - -let - pname = "camlimages"; - version = "4.1.2"; -in - -stdenv.mkDerivation { - name = "${pname}-${version}"; - - src = fetchurl { - url = "https://bitbucket.org/camlspotter/camlimages/get/${version}.tar.bz2"; - sha256 = "1ppddhfknpirj1vilm5dxgyp82kf7ahpvjmh7z75a1fnaqv3kpki"; - }; - - buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ]; - - propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; - - createFindlibDestdir = true; - - buildPhase = '' - omake - ''; - - installPhase = '' - omake install - ''; - - meta = with stdenv.lib; { - homepage = "https://bitbucket.org/camlspotter/camlimages"; - description = "OCaml image processing library"; - license = licenses.lgpl2; - maintainers = [ maintainers.vbgl ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 865e1c9bd24..6af78e8f30d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -101,13 +101,7 @@ let libpng = pkgs.libpng12; giflib = pkgs.giflib_4_1; }; - camlimages_4_1 = callPackage ../development/ocaml-modules/camlimages/4.1.nix { - giflib = pkgs.giflib_4_1; - }; - camlimages = - if lib.versionOlder "4.06" ocaml.version - then callPackage ../development/ocaml-modules/camlimages { } - else camlimages_4_1; + camlimages = callPackage ../development/ocaml-modules/camlimages { }; benchmark = callPackage ../development/ocaml-modules/benchmark { };