camlimages: update from 4.0.1 to 4.1.2

Previous version 4.0.1 is kept for OCaml 3.12

+45 -3
+38
pkgs/development/ocaml-modules/camlimages/4.1.nix
··· 1 + {stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: 2 + 3 + assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; 4 + 5 + let 6 + pname = "camlimages"; 7 + version = "4.1.2"; 8 + in 9 + 10 + stdenv.mkDerivation { 11 + name = "${pname}-${version}"; 12 + 13 + src = fetchurl { 14 + url = "https://bitbucket.org/camlspotter/camlimages/get/${version}.tar.bz2"; 15 + sha256 = "1ppddhfknpirj1vilm5dxgyp82kf7ahpvjmh7z75a1fnaqv3kpki"; 16 + }; 17 + 18 + buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ]; 19 + 20 + propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; 21 + 22 + createFindlibDestdir = true; 23 + 24 + buildPhase = '' 25 + omake 26 + ''; 27 + 28 + installPhase = '' 29 + omake install 30 + ''; 31 + 32 + meta = with stdenv.lib; { 33 + homepage = https://bitbucket.org/camlspotter/camlimages; 34 + description = "OCaml image processing library"; 35 + license = licenses.lgpl2; 36 + maintainers = [ maintainers.vbgl ]; 37 + }; 38 + }
pkgs/development/ocaml-modules/camlimages/default.nix pkgs/development/ocaml-modules/camlimages/4.0.nix
+7 -3
pkgs/top-level/all-packages.nix
··· 3532 3532 camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { }; 3533 3533 camomile = callPackage ../development/ocaml-modules/camomile { }; 3534 3534 3535 - camlimages = callPackage ../development/ocaml-modules/camlimages { 3535 + camlimages_4_0 = callPackage ../development/ocaml-modules/camlimages/4.0.nix { 3536 3536 libpng = libpng12; 3537 3537 giflib = giflib_4_1; 3538 3538 }; 3539 + camlimages_4_1 = callPackage ../development/ocaml-modules/camlimages/4.1.nix {}; 3540 + camlimages = camlimages_4_1; 3539 3541 3540 3542 biniou = callPackage ../development/ocaml-modules/biniou { }; 3541 3543 ··· 3720 3722 // { lablgtk = ocamlPackages_3_10_0.lablgtk_2_14; }; 3721 3723 ocamlPackages_3_11_2 = (mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2) 3722 3724 // { lablgtk = ocamlPackages_3_11_2.lablgtk_2_14; }; 3723 - ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1; 3725 + ocamlPackages_3_12_1 = (mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1) 3726 + // { camlimages = ocamlPackages_3_12_1.camlimages_4_0; }; 3724 3727 ocamlPackages_4_00_1 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_1; 3725 3728 ocamlPackages_4_01_0 = mkOcamlPackages ocaml_4_01_0 pkgs.ocamlPackages_4_01_0; 3726 3729 ocamlPackages_4_02_0 = mkOcamlPackages ocaml_4_02_0 pkgs.ocamlPackages_4_02_0; ··· 5195 5198 glpk = callPackage ../development/libraries/glpk { }; 5196 5199 5197 5200 glsurf = callPackage ../applications/science/math/glsurf { 5198 - inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp; 5201 + inherit (ocamlPackages) lablgl findlib ocaml_mysql mlgmp; 5199 5202 libpng = libpng12; 5200 5203 giflib = giflib_4_1; 5204 + camlimages = ocamlPackages.camlimages_4_0; 5201 5205 }; 5202 5206 5203 5207 gmime = callPackage ../development/libraries/gmime { };