From aa1415c6a5b455e20b92f7b6067d8b4cf9bb1e26 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 19 Jan 2023 07:51:40 +0100 Subject: [PATCH] ocamlPackages.gluten: 0.2.1 -> 0.3.0 --- pkgs/development/ocaml-modules/gluten/default.nix | 11 ++++++----- pkgs/development/ocaml-modules/gluten/lwt-unix.nix | 4 +++- pkgs/development/ocaml-modules/gluten/lwt.nix | 4 +++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/gluten/default.nix b/pkgs/development/ocaml-modules/gluten/default.nix index fb6f85b10487..d0f41d202689 100644 --- a/pkgs/development/ocaml-modules/gluten/default.nix +++ b/pkgs/development/ocaml-modules/gluten/default.nix @@ -3,24 +3,25 @@ , faraday , fetchurl , lib +, ke }: buildDunePackage rec { pname = "gluten"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/anmonteiro/gluten/releases/download/${version}/gluten-${version}.tbz"; - sha256 = "1pl0mpcprz8hmaiv28p7w51qfcx7s76zdkak0vm5cazbjl38nc46"; + hash = "sha256-9jctX3G/nQJTGJ7ClSBEiXwxeu0GcT9N+EmPfLuSFOU="; }; - minimalOCamlVersion = "4.06"; - - useDune2 = true; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ bigstringaf faraday + ke ]; doCheck = false; # No tests diff --git a/pkgs/development/ocaml-modules/gluten/lwt-unix.nix b/pkgs/development/ocaml-modules/gluten/lwt-unix.nix index f3986b051355..cec427c3ad61 100644 --- a/pkgs/development/ocaml-modules/gluten/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/gluten/lwt-unix.nix @@ -7,7 +7,9 @@ buildDunePackage rec { pname = "gluten-lwt-unix"; - inherit (gluten) doCheck meta src useDune2 version; + inherit (gluten) doCheck meta src version; + + duneVersion = "3"; propagatedBuildInputs = [ faraday-lwt-unix diff --git a/pkgs/development/ocaml-modules/gluten/lwt.nix b/pkgs/development/ocaml-modules/gluten/lwt.nix index e2643d618954..cfa736c4bc99 100644 --- a/pkgs/development/ocaml-modules/gluten/lwt.nix +++ b/pkgs/development/ocaml-modules/gluten/lwt.nix @@ -5,7 +5,9 @@ buildDunePackage rec { pname = "gluten-lwt"; - inherit (gluten) doCheck meta src useDune2 version; + inherit (gluten) doCheck meta src version; + + duneVersion = "3"; propagatedBuildInputs = [ gluten