ocamlPackages.javalib: 2.3 -> 2.3.3

ocamlPackages.sawja: 1.5 -> 1.5.2
This commit is contained in:
Vincent Laporte 2017-06-30 16:55:04 +00:00
parent ea052b6f6b
commit f97766566a
2 changed files with 12 additions and 8 deletions

View File

@ -1,16 +1,20 @@
{stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib, camlp4}: {stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib, camlp4}:
if !stdenv.lib.versionAtLeast ocaml.version "4"
then throw "javalib not supported for ocaml ${ocaml.version}"
else
let let
pname = "javalib"; pname = "javalib";
webpage = "http://sawja.inria.fr/"; webpage = "http://sawja.inria.fr/";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}"; name = "ocaml${ocaml.version}-${pname}-${version}";
version = "2.3"; version = "2.3.3";
src = fetchurl { src = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/33090/${pname}-${version}.tar.bz2"; url = https://gforge.inria.fr/frs/download.php/file/36307/javalib-2.3.3.tar.bz2;
sha256 = "1i8djcanzm250mwilm3jfy37cz0k0x7jbnrz8a5vvdi91kyzh52j"; sha256 = "0427n3vfb2h51gy2p4878gdwlp0mb03asn3g9kp9v4wfxmksjj11";
}; };
buildInputs = [ which ocaml findlib camlp4 ]; buildInputs = [ which ocaml findlib camlp4 ];

View File

@ -4,16 +4,16 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
let let
pname = "sawja"; pname = "sawja";
version = "1.5"; version = "1.5.2";
webpage = "http://sawja.inria.fr/"; webpage = "http://sawja.inria.fr/";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}"; name = "ocaml${ocaml.version}-${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/33091/${pname}-${version}.tar.bz2"; url = https://gforge.inria.fr/frs/download.php/file/36093/sawja-1.5.2.tar.bz2;
sha256 = "0i8qgqkw9vgj6k2g6npss268ivxdkzx5qj2a52jbd8ih59rn68cm"; sha256 = "12046arkxiy4gf1s17hyc0yzydjzpzwqxn13sbkbxl8xzvmankx4";
}; };
buildInputs = [ which perl ocaml findlib camlp4 ]; buildInputs = [ which perl ocaml findlib camlp4 ];