diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2014-10-31 12:25:53 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2014-11-01 08:37:40 +0000 |
| commit | c216448075aff5e95f586252376aa233eeee4778 (patch) | |
| tree | 0d25cdff4a80e6607d60c225cb36821952c13802 /pkgs/top-level | |
| parent | 92503a0424e001ff88ecf66f73f5eab183a17fc9 (diff) | |
| download | nixpkgs-c216448075aff5e95f586252376aa233eeee4778.tar nixpkgs-c216448075aff5e95f586252376aa233eeee4778.tar.gz nixpkgs-c216448075aff5e95f586252376aa233eeee4778.tar.bz2 nixpkgs-c216448075aff5e95f586252376aa233eeee4778.tar.lz nixpkgs-c216448075aff5e95f586252376aa233eeee4778.tar.xz nixpkgs-c216448075aff5e95f586252376aa233eeee4778.tar.zst nixpkgs-c216448075aff5e95f586252376aa233eeee4778.zip | |
camlimages: update from 4.0.1 to 4.1.2
Previous version 4.0.1 is kept for OCaml 3.12
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f35b7ef1da6..7e93964838d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3532,10 +3532,12 @@ let camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { }; camomile = callPackage ../development/ocaml-modules/camomile { }; - camlimages = callPackage ../development/ocaml-modules/camlimages { + camlimages_4_0 = callPackage ../development/ocaml-modules/camlimages/4.0.nix { libpng = libpng12; giflib = giflib_4_1; }; + camlimages_4_1 = callPackage ../development/ocaml-modules/camlimages/4.1.nix {}; + camlimages = camlimages_4_1; biniou = callPackage ../development/ocaml-modules/biniou { }; @@ -3720,7 +3722,8 @@ let // { lablgtk = ocamlPackages_3_10_0.lablgtk_2_14; }; ocamlPackages_3_11_2 = (mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2) // { lablgtk = ocamlPackages_3_11_2.lablgtk_2_14; }; - ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1; + ocamlPackages_3_12_1 = (mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1) + // { camlimages = ocamlPackages_3_12_1.camlimages_4_0; }; ocamlPackages_4_00_1 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_1; ocamlPackages_4_01_0 = mkOcamlPackages ocaml_4_01_0 pkgs.ocamlPackages_4_01_0; ocamlPackages_4_02_0 = mkOcamlPackages ocaml_4_02_0 pkgs.ocamlPackages_4_02_0; @@ -5195,9 +5198,10 @@ let glpk = callPackage ../development/libraries/glpk { }; glsurf = callPackage ../applications/science/math/glsurf { - inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp; + inherit (ocamlPackages) lablgl findlib ocaml_mysql mlgmp; libpng = libpng12; giflib = giflib_4_1; + camlimages = ocamlPackages.camlimages_4_0; }; gmime = callPackage ../development/libraries/gmime { }; |