ocamlPackages.javalib: 3.1.1 → 3.2.1
ocamlPackages.sawja: 1.5.7 → 1.5.8
This commit is contained in:
parent
865b27c322
commit
644b931c49
@ -8,11 +8,11 @@ else
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "ocaml${ocaml.version}-javalib-${version}";
|
name = "ocaml${ocaml.version}-javalib-${version}";
|
||||||
version = "3.1.1";
|
version = "3.2.1";
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "https://github.com/javalib-team/javalib/archive/v${version}.tar.gz";
|
url = "https://github.com/javalib-team/javalib/archive/v${version}.tar.gz";
|
||||||
sha256 = "1myrf7kw7pi04pmp0bi4747nj4h4vfxlla05sz2hp4w8k76iscld";
|
sha256 = "1fkdaiiza145yv0r1cm0n2hsrr0rbn6b27vs66njgv405zwn3vbn";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ which ocaml findlib ];
|
buildInputs = [ which ocaml findlib ];
|
||||||
|
@ -1,19 +1,24 @@
|
|||||||
{stdenv, fetchurl, which, perl, ocaml, findlib, javalib }:
|
{ stdenv, fetchFromGitHub, which, perl, ocaml, findlib, javalib }:
|
||||||
|
|
||||||
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
|
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "sawja";
|
pname = "sawja";
|
||||||
version = "1.5.7";
|
version = "1.5.8";
|
||||||
webpage = "http://sawja.inria.fr/";
|
webpage = "http://sawja.inria.fr/";
|
||||||
in
|
in
|
||||||
|
|
||||||
|
if !stdenv.lib.versionAtLeast ocaml.version "4.07"
|
||||||
|
then throw "${pname} is not available for OCaml ${ocaml.version}"
|
||||||
|
else
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
|
|
||||||
name = "ocaml${ocaml.version}-${pname}-${version}";
|
name = "ocaml${ocaml.version}-${pname}-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
url = https://gforge.inria.fr/frs/download.php/file/38117/sawja-1.5.7.tar.bz2;
|
owner = "javalib-team";
|
||||||
sha256 = "08xv1bq4pragc1g93w4dnbn0mighcjwfp3ixj9jzmhka2vzqm4cc";
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "0rawr0jav33rvagm8sxc0arc7ya1fd9w5nng3lhfk8p02f9z8wrp";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ which perl ocaml findlib ];
|
buildInputs = [ which perl ocaml findlib ];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user