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

ocamlPackages.javalib: 2.3.5 -> 3.0

Browse Source 
ocamlPackages.sawja: 1.5.3 -> 1.5.6
This commit is contained in:
Vincent Laporte 2018-11-30 02:24:54 +00:00 committed by Vincent Laporte
parent b17eaa3aa9
commit b684e3d24b
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, which, ocaml, findlib, camlp4
{ stdenv, fetchzip, which, ocaml, findlib, camlp4
, camlzip, camomile, extlib
}:
@ -8,15 +8,14 @@ else
let
pname = "javalib";
webpage = "http://sawja.inria.fr/";
in
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-${pname}-${version}";
version = "2.3.5";
version = "3.0";
src = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/file/37655/javalib-2.3.5.tar.bz2";
sha256 = "1gks12ghcmv9lm8j4diw8bvjqxfl7xwk0sxbi227saxg9irpwwkd";
src = fetchzip {
url = "https://github.com/javalib-team/javalib/archive/v${version}.tar.gz";
sha256 = "02zgn1z1wj3rbg9xqmbagys91bnsy27iwrngkivzhlykyaw9vf6n";
};
buildInputs = [ which ocaml findlib camlp4 ];
@ -30,17 +29,11 @@ stdenv.mkDerivation rec {
configureScript = "./configure.sh";
dontAddPrefix = "true";
preBuild = ''
make ptrees;
make installptrees;
export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH;
'';
propagatedBuildInputs = [ camlzip camomile extlib ];
meta = with stdenv.lib; {
description = "A library that parses Java .class files into OCaml data structures";
homepage = "${webpage}";
homepage = https://javalib-team.github.io/javalib/;
license = licenses.lgpl3;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms or [];

6
pkgs/development/ocaml-modules/sawja/default.nix
View File

@ -4,7 +4,7 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
let
pname = "sawja";
version = "1.5.3";
version = "1.5.6";
webpage = "http://sawja.inria.fr/";
in
stdenv.mkDerivation rec {
@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-${pname}-${version}";
src = fetchurl {
url = https://gforge.inria.fr/frs/download.php/file/37403/sawja-1.5.3.tar.bz2;
sha256 = "17vfknr126vfhpmr14j75sg8r47xz7pw7fba4nsdw3k7rq43vcn2";
url = https://gforge.inria.fr/frs/download.php/file/37819/sawja-1.5.6.tar.bz2;
sha256 = "0dkfdc8h94r7kj4p8q57fz7fssypgmjrix8xff0va7x1nya5sdp3";
};
buildInputs = [ which perl ocaml findlib camlp4 ];