From f5ad4e7964c733ca0ebdfbf15b266590567a6b32 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 25 Jun 2022 18:41:04 +0200
Subject: [PATCH] =?UTF-8?q?ocamlPackages.awa:=200.0.5=20=E2=86=92=200.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/awa/default.nix | 15 +++++++--------
 pkgs/development/ocaml-modules/awa/lwt.nix     |  7 +++++--
 pkgs/development/ocaml-modules/awa/mirage.nix  |  4 +++-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix
index 9795b24350c9..4ba54c48d2e3 100644
--- a/pkgs/development/ocaml-modules/awa/default.nix
+++ b/pkgs/development/ocaml-modules/awa/default.nix
@@ -1,29 +1,28 @@
 { lib, buildDunePackage, fetchurl
 , ppx_sexp_conv, ppx_cstruct
-, mirage-crypto, mirage-crypto-rng, mirage-crypto-pk
+, mirage-crypto, mirage-crypto-ec, mirage-crypto-rng, mirage-crypto-pk
 , x509, cstruct, cstruct-unix, cstruct-sexp, sexplib, eqaf
-, rresult, mtime, logs, fmt, cmdliner, base64, hacl_x25519
+, rresult, mtime, logs, fmt, cmdliner, base64
 , zarith
 }:
 
 buildDunePackage rec {
   pname = "awa";
-  version = "0.0.5";
+  version = "0.1.0";
 
-  minimumOCamlVersion = "4.07";
-  useDune2 = true;
+  minimalOCamlVersion = "4.08";
 
   src = fetchurl {
     url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-${version}.tbz";
-    sha256 = "14hqzmikp3hlynhs0wnwj2491106if183swsl7ldk4215a0b7ms4";
+    sha256 = "sha256-aPnFDp52oYVHr/56lFw0gtVJ0KvHawyM5FGtpHPOVY8=";
   };
 
   nativeBuildInputs = [ ppx_cstruct ];
 
   propagatedBuildInputs = [
-    mirage-crypto mirage-crypto-rng mirage-crypto-pk x509
+    mirage-crypto mirage-crypto-ec mirage-crypto-rng mirage-crypto-pk x509
     cstruct cstruct-sexp sexplib mtime
-    logs base64 hacl_x25519 zarith
+    logs base64 zarith
     ppx_sexp_conv eqaf
   ];
 
diff --git a/pkgs/development/ocaml-modules/awa/lwt.nix b/pkgs/development/ocaml-modules/awa/lwt.nix
index 9f32d9571f73..57f4d5a23a09 100644
--- a/pkgs/development/ocaml-modules/awa/lwt.nix
+++ b/pkgs/development/ocaml-modules/awa/lwt.nix
@@ -5,11 +5,14 @@
 buildDunePackage {
   pname = "awa-lwt";
 
-  inherit (awa) version src useDune2;
+  inherit (awa) version src;
 
   propagatedBuildInputs = [
-    awa cstruct mtime lwt cstruct-unix mirage-crypto-rng
+    awa cstruct mtime lwt mirage-crypto-rng
   ];
 
+  doCheck = true;
+  checkInputs = [ cstruct-unix ];
+
   meta = awa.meta // { mainProgram = "awa_lwt_server"; };
 }
diff --git a/pkgs/development/ocaml-modules/awa/mirage.nix b/pkgs/development/ocaml-modules/awa/mirage.nix
index 4f9b425f8a01..8513e5741048 100644
--- a/pkgs/development/ocaml-modules/awa/mirage.nix
+++ b/pkgs/development/ocaml-modules/awa/mirage.nix
@@ -1,14 +1,16 @@
 { buildDunePackage, awa
 , cstruct, mtime, lwt, mirage-flow, mirage-clock, logs
+, duration, mirage-time
 }:
 
 buildDunePackage {
   pname = "awa-mirage";
 
-  inherit (awa) version src useDune2;
+  inherit (awa) version src;
 
   propagatedBuildInputs = [
     awa cstruct mtime lwt mirage-flow mirage-clock logs
+    duration mirage-time
   ];
 
   inherit (awa) meta;