From 8281faf75a1ef02d021f7f8ca9cc50c9997a0616 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 27 Jan 2023 07:23:45 +0100
Subject: [PATCH 1/2] =?UTF-8?q?ocamlPackages.javalib:=203.2.1=20=E2=86=92?=
 =?UTF-8?q?=203.2.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/javalib/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix
index a12ade51c2ea..5675e10dbad1 100644
--- a/pkgs/development/ocaml-modules/javalib/default.nix
+++ b/pkgs/development/ocaml-modules/javalib/default.nix
@@ -8,19 +8,18 @@
 , extlib
 }:
 
-if lib.versionOlder ocaml.version "4.04"
-then throw "javalib is not available for OCaml ${ocaml.version}"
-else
+lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
+  "javalib is not available for OCaml ${ocaml.version}"
 
 stdenv.mkDerivation rec {
   pname = "ocaml${ocaml.version}-javalib";
-  version = "3.2.1";
+  version = "3.2.2";
 
   src = fetchFromGitHub {
     owner = "javalib-team";
     repo = "javalib";
-    rev = "v${version}";
-    sha256 = "sha256-du1h+S+A7CetMXofsYxdGeSsobCgspDB9oUE9WNUbbo=";
+    rev = version;
+    hash = "sha256-XaI7GTU/O5UEWuYX4yqaIRmEoH7FuvCg/+gtKbE/P1s=";
   };
 
   nativeBuildInputs = [ which ocaml findlib ];

From 3968d0e5b98331c60c8fdebfb3798496aa39e193 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 27 Jan 2023 07:23:50 +0100
Subject: [PATCH 2/2] =?UTF-8?q?ocamlPackages.sawja:=201.5.11=20=E2=86=92?=
 =?UTF-8?q?=201.5.12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/sawja/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix
index 78d28270035a..a5d042fc1907 100644
--- a/pkgs/development/ocaml-modules/sawja/default.nix
+++ b/pkgs/development/ocaml-modules/sawja/default.nix
@@ -2,12 +2,11 @@
 
 let
   pname = "sawja";
-  version = "1.5.11";
+  version = "1.5.12";
 in
 
-if lib.versionOlder ocaml.version "4.07"
-then throw "${pname} is not available for OCaml ${ocaml.version}"
-else
+lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
+  "${pname} is not available for OCaml ${ocaml.version}"
 
 stdenv.mkDerivation {
 
@@ -19,7 +18,7 @@ stdenv.mkDerivation {
     owner = "javalib-team";
     repo = pname;
     rev = version;
-    sha256 = "sha256-1aKkRZDuLJLmDhUC1FXnn4QrgXaTyAbnXfTOAdnKgs8=";
+    hash = "sha256-G1W8/G0TEcldnFnH/NAb9a6ZSGGP2fWTM47lI8bBHnw=";
   };
 
   nativeBuildInputs = [ which ocaml findlib ];