public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #36412 from mt-caret/camlimages 

ocaml-ng.ocamlPackages_4_06.camlimages: 4.1.2 -> 5.0.0
This commit is contained in:
Jörg Thalheim 2018-03-07 12:11:25 +00:00 committed by GitHub
parent a1858b0832 3f73823117
commit 906713a0b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/ocaml-modules/camlimages/default.nix Normal file
View File

@ -0,0 +1,12 @@
{ stdenv, fetchzip, findlib, jbuilder, ocaml, configurator, cppo, lablgtk }:
stdenv.mkDerivation rec {
name = "camlimages-${version}";
version = "5.0.0";
src = fetchzip {
url = "https://bitbucket.org/camlspotter/camlimages/get/${version}.tar.gz";
sha256 = "00qvwxkfnhv93yi1iq7vy3p5lxyi9xigxcq464s4ii6bmp32d998";
};
buildInputs = [ findlib jbuilder ocaml configurator cppo lablgtk ];
buildPhase = "jbuilder build -p camlimages";
inherit (jbuilder) installPhase;
}

5
pkgs/top-level/ocaml-packages.nix
View File

@ -119,7 +119,10 @@ let
camlimages_4_1 = callPackage ../development/ocaml-modules/camlimages/4.1.nix { camlimages_4_1 = callPackage ../development/ocaml-modules/camlimages/4.1.nix {
giflib = pkgs.giflib_4_1; giflib = pkgs.giflib_4_1;
}; };
camlimages = camlimages_4_1; camlimages =
if lib.versionOlder "4.05" ocaml.version
then callPackage ../development/ocaml-modules/camlimages { }
else camlimages_4_1;
benchmark = callPackage ../development/ocaml-modules/benchmark { }; benchmark = callPackage ../development/ocaml-modules/benchmark { };