nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 12:53:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4758 from vbgl/camlimages

Browse Source 
camlimages: update from 4.0.1 to 4.1.2
This commit is contained in:
Arseniy Seroka 2014-11-01 15:11:14 +03:00
commit f59cccff42
3 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/development/ocaml-modules/camlimages/default.nix → pkgs/development/ocaml-modules/camlimages/4.0.nix
View File

38
pkgs/development/ocaml-modules/camlimages/4.1.nix Normal file
View File

@ -0,0 +1,38 @@
{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
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_rc1 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 ];
};
}

10
pkgs/top-level/all-packages.nix
View File

@ -3532,10 +3532,12 @@ let
camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { }; camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { };
camomile = callPackage ../development/ocaml-modules/camomile { }; 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; libpng = libpng12;
giflib = giflib_4_1; 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 { }; biniou = callPackage ../development/ocaml-modules/biniou { };
@ -3720,7 +3722,8 @@ let
// { lablgtk = ocamlPackages_3_10_0.lablgtk_2_14; }; // { lablgtk = ocamlPackages_3_10_0.lablgtk_2_14; };
ocamlPackages_3_11_2 = (mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2) ocamlPackages_3_11_2 = (mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2)
// { lablgtk = ocamlPackages_3_11_2.lablgtk_2_14; }; // { 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_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_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; ocamlPackages_4_02_0 = mkOcamlPackages ocaml_4_02_0 pkgs.ocamlPackages_4_02_0;
@ -5195,9 +5198,10 @@ let
glpk = callPackage ../development/libraries/glpk { }; glpk = callPackage ../development/libraries/glpk { };
glsurf = callPackage ../applications/science/math/glsurf { glsurf = callPackage ../applications/science/math/glsurf {
inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp; inherit (ocamlPackages) lablgl findlib ocaml_mysql mlgmp;
libpng = libpng12; libpng = libpng12;
giflib = giflib_4_1; giflib = giflib_4_1;
camlimages = ocamlPackages.camlimages_4_0;
}; };
gmime = callPackage ../development/libraries/gmime { }; gmime = callPackage ../development/libraries/gmime { };