Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main

1 files changed, 13 insertions, 8 deletions

diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
index b01d4b4a04c2..348a70a0da9f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
@@ -1,10 +1,13 @@
-{ stdenv, fetchFromGitHub, buildDunePackage
-, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm
+{ lib, fetchFromGitHub, buildDunePackage, ocaml
+, cryptokit, ocamlnet, ocurl, yojson
+, ounit
 }:
 
 buildDunePackage rec {
   pname = "gapi-ocaml";
-  version = "0.3.19";
+  version = "0.4.1";
+
+  useDune2 = true;
 
   minimumOCamlVersion = "4.02";
 
@@ -12,16 +15,18 @@ buildDunePackage rec {
     owner = "astrada";
     repo = pname;
     rev = "v${version}";
-    sha256 = "04arif1p1vj5yr24cwicj70b7yx17hrgf4pl47vqg8ngcrdh71v9";
+    sha256 = "0riax23grjnq9pczmp1yv02ji0svvs2kbiqskj6f6yjviamnpa31";
   };
 
-  propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib ocamlnet yojson ];
-  buildInputs = [ xmlm ];
+  propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ];
+
+  doCheck = lib.versionAtLeast ocaml.version "4.04";
+  checkInputs = [ ounit ];
 
   meta = {
     description = "OCaml client for google services";
     homepage = "http://gapi-ocaml.forge.ocamlcore.org";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ bennofs ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ bennofs ];
   };
 }