git.iko.soy/typeable/nixpkgs
on master help sign in
ocamlPackages.javalib: 3.0 -> 3.1.1
commitb53f0980fe6a77411bc765db0e829f22137fc94a authorVincent Laporte <Vincent.Laporte@gmail.com> dateTue 20 Aug 2019, 04:45 (7 years ago) parent83cc092
1 file changed+10−13
pkgs/development/ocaml-modules/javalib/default.nix+10−13
pkgs/development/ocaml-modules/javalib/default.nix+10−13
@@ -1,24 +1,21 @@
1−{ stdenv, fetchzip, which, ocaml, findlib, camlp4
2−, camlzip, camomile, extlib
1+{ stdenv, fetchzip, which, ocaml, findlib
2+, camlzip, extlib
33}:
44
5−if !stdenv.lib.versionAtLeast ocaml.version "4"
6−then throw "javalib not supported for ocaml ${ocaml.version}"
5+if !stdenv.lib.versionAtLeast ocaml.version "4.04"
6+then throw "javalib is not available for OCaml ${ocaml.version}"
77else
88
9−let
10− pname = "javalib";
11−in
129stdenv.mkDerivation rec {
13− name = "ocaml${ocaml.version}-${pname}-${version}";
14− version = "3.0";
10+ name = "ocaml${ocaml.version}-javalib-${version}";
11+ version = "3.1.1";
1512
1613 src = fetchzip {
1714 url = "https://github.com/javalib-team/javalib/archive/v${version}.tar.gz";
18− sha256 = "02zgn1z1wj3rbg9xqmbagys91bnsy27iwrngkivzhlykyaw9vf6n";
15+ sha256 = "1myrf7kw7pi04pmp0bi4747nj4h4vfxlla05sz2hp4w8k76iscld";
1916 };
2017
21− buildInputs = [ which ocaml findlib camlp4 ];
18+ buildInputs = [ which ocaml findlib ];
2219
2320 patches = [ ./configure.sh.patch ./Makefile.config.example.patch ];
2421
@@ -29,13 +26,13 @@ stdenv.mkDerivation rec {
2926 configureScript = "./configure.sh";
3027 dontAddPrefix = "true";
3128
32− propagatedBuildInputs = [ camlzip camomile extlib ];
29+ propagatedBuildInputs = [ camlzip extlib ];
3330
3431 meta = with stdenv.lib; {
3532 description = "A library that parses Java .class files into OCaml data structures";
3633 homepage = https://javalib-team.github.io/javalib/;
3734 license = licenses.lgpl3;
3835 maintainers = [ maintainers.vbgl ];
39− platforms = ocaml.meta.platforms or [];
36+ inherit (ocaml.meta) platforms;
4037 };
4138}