Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main

1 files changed, 17 insertions, 16 deletions

diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/opium_kernel/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/opium_kernel/default.nix
index 8388e108feff..c7bfe1e7306a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/opium_kernel/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/opium_kernel/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildDunePackage
-, fetchFromGitHub
+, fetchurl
 
 , ppx_fields_conv
 , ppx_sexp_conv
@@ -8,35 +8,36 @@
 , cohttp-lwt
 , ezjsonm
 , hmap
+, sexplib
 }:
 
 buildDunePackage rec {
-	pname = "opium_kernel";
-  version = "0.17.1";
+  pname = "opium_kernel";
+  version = "0.18.0";
+
+  useDune2 = true;
 
   minimumOCamlVersion = "4.04.1";
-  
-	src = fetchFromGitHub {
-		owner = "rgrinberg";
-		repo = "opium";
-		rev = "v${version}";
-		sha256 = "03xzh0ik6k3c0yn1w1avph667vdagwclzimwwrlf9qdxnzxvcnp3";
-	};
+
+  src = fetchurl {
+    url = "https://github.com/rgrinberg/opium/releases/download/${version}/opium-${version}.tbz";
+    sha256 = "0a2y9gw55psqhqli3a5ps9mfdab8r46fnbj882r2sp366sfcy37q";
+  };
 
   doCheck = true;
 
-	buildInputs = [
+  buildInputs = [
     ppx_sexp_conv ppx_fields_conv
   ];
 
-	propagatedBuildInputs = [
-    hmap cohttp-lwt ezjsonm
+  propagatedBuildInputs = [
+    hmap cohttp-lwt ezjsonm sexplib
   ];
 
   meta = {
-		description = "Sinatra like web toolkit for OCaml based on cohttp & lwt";
+    description = "Sinatra like web toolkit for OCaml based on cohttp & lwt";
     homepage = "https://github.com/rgrinberg/opium";
-		license = lib.licenses.mit;
-		maintainers = [ lib.maintainers.pmahoney ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.pmahoney ];
   };
 }