diff options
| author | Vincent Laporte <vbgl@users.noreply.github.com> | 2018-08-14 12:53:30 +0000 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-08-14 14:53:30 +0200 |
| commit | be989c7af4addb252f3eff3cae83f0c7672ef2de (patch) | |
| tree | 092e4449ab0461239a1e37fea6cfa1bc7861a6ff | |
| parent | 93f9b7069ac91983d6feb76f822e94acf5593ca5 (diff) | |
| download | nixlib-be989c7af4addb252f3eff3cae83f0c7672ef2de.tar nixlib-be989c7af4addb252f3eff3cae83f0c7672ef2de.tar.gz nixlib-be989c7af4addb252f3eff3cae83f0c7672ef2de.tar.bz2 nixlib-be989c7af4addb252f3eff3cae83f0c7672ef2de.tar.lz nixlib-be989c7af4addb252f3eff3cae83f0c7672ef2de.tar.xz nixlib-be989c7af4addb252f3eff3cae83f0c7672ef2de.tar.zst nixlib-be989c7af4addb252f3eff3cae83f0c7672ef2de.zip | |
ocamlPackages.javalib: 2.3.4 -> 2.3.5 (#45016)
| -rw-r--r-- | pkgs/development/ocaml-modules/javalib/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index e0dc2408f133..6e533092dc64 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib, camlp4}: +{ stdenv, fetchurl, which, ocaml, findlib, camlp4 +, camlzip, camomile, extlib +}: if !stdenv.lib.versionAtLeast ocaml.version "4" then throw "javalib not supported for ocaml ${ocaml.version}" @@ -10,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/37154/javalib-2.3.4.tar.bz2"; - sha256 = "1ajzbyli5a3y9s8f46913drpxdzlby3i4g3c2fqacmnbyvhpaqb6"; + url = "https://gforge.inria.fr/frs/download.php/file/37655/javalib-2.3.5.tar.bz2"; + sha256 = "1gks12ghcmv9lm8j4diw8bvjqxfl7xwk0sxbi227saxg9irpwwkd"; }; buildInputs = [ which ocaml findlib camlp4 ]; @@ -34,7 +36,7 @@ stdenv.mkDerivation rec { export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH; ''; - propagatedBuildInputs = [ camlzip extlib ]; + propagatedBuildInputs = [ camlzip camomile extlib ]; meta = with stdenv.lib; { description = "A library that parses Java .class files into OCaml data structures"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9206f2498daa..ef0785abb721 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -298,7 +298,7 @@ let iso8601 = callPackage ../development/ocaml-modules/iso8601 { }; javalib = callPackage ../development/ocaml-modules/javalib { - extlib = ocaml_extlib_maximal; + extlib = ocaml_extlib; }; dypgen = callPackage ../development/ocaml-modules/dypgen { }; |