diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-03-07 12:11:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-07 12:11:25 +0000 |
| commit | 906713a0b12f9a035df43f3e8f502dc18e672719 (patch) | |
| tree | 6296d72e9b079e56246fa51dc219b3ce8ba435f3 | |
| parent | a1858b08322e0ce220fbac0cfbfc27ea86e05943 (diff) | |
| parent | 3f738231177cb1823f912c7f566cffa94ae3440e (diff) | |
| download | nixlib-906713a0b12f9a035df43f3e8f502dc18e672719.tar nixlib-906713a0b12f9a035df43f3e8f502dc18e672719.tar.gz nixlib-906713a0b12f9a035df43f3e8f502dc18e672719.tar.bz2 nixlib-906713a0b12f9a035df43f3e8f502dc18e672719.tar.lz nixlib-906713a0b12f9a035df43f3e8f502dc18e672719.tar.xz nixlib-906713a0b12f9a035df43f3e8f502dc18e672719.tar.zst nixlib-906713a0b12f9a035df43f3e8f502dc18e672719.zip | |
Merge pull request #36412 from mt-caret/camlimages
ocaml-ng.ocamlPackages_4_06.camlimages: 4.1.2 -> 5.0.0
| -rw-r--r-- | pkgs/development/ocaml-modules/camlimages/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 5 |
2 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix new file mode 100644 index 000000000000..394b0c507be5 --- /dev/null +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -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; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 82467fcd78ca..f77de1057e57 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -119,7 +119,10 @@ let camlimages_4_1 = callPackage ../development/ocaml-modules/camlimages/4.1.nix { 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 { }; |