From f97766566a339d390de56fd3a646d10b91006d3f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 30 Jun 2017 16:55:04 +0000
Subject: [PATCH] ocamlPackages.javalib: 2.3 -> 2.3.3

ocamlPackages.sawja: 1.5 -> 1.5.2
---
 pkgs/development/ocaml-modules/javalib/default.nix | 12 ++++++++----
 pkgs/development/ocaml-modules/sawja/default.nix   |  8 ++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix
index c0b1c32553e..843cf44a153 100644
--- a/pkgs/development/ocaml-modules/javalib/default.nix
+++ b/pkgs/development/ocaml-modules/javalib/default.nix
@@ -1,16 +1,20 @@
 {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
   pname = "javalib";
   webpage = "http://sawja.inria.fr/";
 in
 stdenv.mkDerivation rec {
-  name = "ocaml-${pname}-${version}";
-  version = "2.3";
+  name = "ocaml${ocaml.version}-${pname}-${version}";
+  version = "2.3.3";
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/33090/${pname}-${version}.tar.bz2";
-    sha256 = "1i8djcanzm250mwilm3jfy37cz0k0x7jbnrz8a5vvdi91kyzh52j";
+    url = https://gforge.inria.fr/frs/download.php/file/36307/javalib-2.3.3.tar.bz2;
+    sha256 = "0427n3vfb2h51gy2p4878gdwlp0mb03asn3g9kp9v4wfxmksjj11";
   };
 
   buildInputs = [ which ocaml findlib camlp4 ];
diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix
index cfc74ad1668..b6c66c82811 100644
--- a/pkgs/development/ocaml-modules/sawja/default.nix
+++ b/pkgs/development/ocaml-modules/sawja/default.nix
@@ -4,16 +4,16 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
 
 let
   pname = "sawja";
-  version = "1.5";
+  version = "1.5.2";
   webpage = "http://sawja.inria.fr/";
 in
 stdenv.mkDerivation rec {
 
-  name = "ocaml-${pname}-${version}";
+  name = "ocaml${ocaml.version}-${pname}-${version}";
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/33091/${pname}-${version}.tar.bz2";
-    sha256 = "0i8qgqkw9vgj6k2g6npss268ivxdkzx5qj2a52jbd8ih59rn68cm";
+    url = https://gforge.inria.fr/frs/download.php/file/36093/sawja-1.5.2.tar.bz2;
+    sha256 = "12046arkxiy4gf1s17hyc0yzydjzpzwqxn13sbkbxl8xzvmankx4";
   };
 
   buildInputs = [ which perl ocaml findlib camlp4 ];