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

ocamlPackages.javalib: 2.3.4 -> 2.3.5 (#45016)

Browse Source
This commit is contained in:
Vincent Laporte 2018-08-14 12:53:30 +00:00 committed by xeji
parent 93f9b7069a
commit be989c7af4
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/ocaml-modules/javalib/default.nix
View File

@ -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";

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

@ -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 { };