Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cb45126c3ed4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a14b47b2ad2f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 20, 2019

  1. ocamlPackages.javalib: 3.0 -> 3.1.1

    @vbgl
    vbgl committed Aug 20, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    endocrimes Danielle
    GPG key ID: 8D65584EF3DDF91B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b53f098 View commit details

  2. Merge pull request #67021 from vbgl/ocaml-javalib-3.1.1 

    ocamlPackages.javalib: 3.0 -> 3.1.1
    @srhb
    srhb authored Aug 20, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    endocrimes Danielle
    GPG key ID: 8D65584EF3DDF91B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a14b47b View commit details
Showing with 10 additions and 13 deletions.
  1. +10 −13 pkgs/development/ocaml-modules/javalib/default.nix
23 changes: 10 additions & 13 deletions pkgs/development/ocaml-modules/javalib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
{ stdenv, fetchzip, which, ocaml, findlib, camlp4
, camlzip, camomile, extlib
{ stdenv, fetchzip, which, ocaml, findlib
, camlzip, extlib
}:

if !stdenv.lib.versionAtLeast ocaml.version "4"
then throw "javalib not supported for ocaml ${ocaml.version}"
if !stdenv.lib.versionAtLeast ocaml.version "4.04"
then throw "javalib is not available for OCaml ${ocaml.version}"
else

let
pname = "javalib";
in
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-${pname}-${version}";
version = "3.0";
name = "ocaml${ocaml.version}-javalib-${version}";
version = "3.1.1";

src = fetchzip {
url = "https://github.com/javalib-team/javalib/archive/v${version}.tar.gz";
sha256 = "02zgn1z1wj3rbg9xqmbagys91bnsy27iwrngkivzhlykyaw9vf6n";
sha256 = "1myrf7kw7pi04pmp0bi4747nj4h4vfxlla05sz2hp4w8k76iscld";
};

buildInputs = [ which ocaml findlib camlp4 ];
buildInputs = [ which ocaml findlib ];

patches = [ ./configure.sh.patch ./Makefile.config.example.patch ];

@@ -29,13 +26,13 @@ stdenv.mkDerivation rec {
configureScript = "./configure.sh";
dontAddPrefix = "true";

propagatedBuildInputs = [ camlzip camomile extlib ];
propagatedBuildInputs = [ camlzip extlib ];

meta = with stdenv.lib; {
description = "A library that parses Java .class files into OCaml data structures";
homepage = https://javalib-team.github.io/javalib/;
license = licenses.lgpl3;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
};
}