From 64daf50ff3a7e5294ccd483a7bb44d1afa5a1e89 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 15 Dec 2023 06:30:34 +0100
Subject: ocamlPackages.httpaf: add missing dependency

---
 pkgs/development/ocaml-modules/httpaf/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/httpaf/default.nix b/pkgs/development/ocaml-modules/httpaf/default.nix
index f262d51ee7dc..6dce28fb2020 100644
--- a/pkgs/development/ocaml-modules/httpaf/default.nix
+++ b/pkgs/development/ocaml-modules/httpaf/default.nix
@@ -1,12 +1,11 @@
 { lib, fetchFromGitHub, fetchpatch, buildDunePackage
-, angstrom, faraday, alcotest
+, angstrom, faraday, result, alcotest
 }:
 
 buildDunePackage rec {
   pname = "httpaf";
   version = "0.7.1";
 
-  duneVersion = "3";
   minimalOCamlVersion = "4.08";
 
   src = fetchFromGitHub {
@@ -17,7 +16,7 @@ buildDunePackage rec {
   };
 
   checkInputs = [ alcotest ];
-  propagatedBuildInputs = [ angstrom faraday ];
+  propagatedBuildInputs = [ angstrom faraday result ];
   doCheck = true;
 
   meta = {
-- 
cgit 1.4.1


From 9ed75988e2848ed09b23c56bf151b055e32a5ab4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 15 Dec 2023 06:30:42 +0100
Subject: ocamlPackages.angstrom: 0.15.0 → 0.16.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/angstrom-async/default.nix    | 1 -
 pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix | 2 --
 pkgs/development/ocaml-modules/angstrom-unix/default.nix     | 2 --
 pkgs/development/ocaml-modules/angstrom/default.nix          | 9 ++++-----
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/ocaml-modules/angstrom-async/default.nix b/pkgs/development/ocaml-modules/angstrom-async/default.nix
index ff390c1598bf..c603d1b21e57 100644
--- a/pkgs/development/ocaml-modules/angstrom-async/default.nix
+++ b/pkgs/development/ocaml-modules/angstrom-async/default.nix
@@ -5,7 +5,6 @@ buildDunePackage rec {
 
   inherit (angstrom) version src;
 
-  duneVersion = "3";
   minimalOCamlVersion = "4.04.1";
 
   propagatedBuildInputs = [ angstrom async ];
diff --git a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix
index 063f4c1f80c7..2742b8515de7 100644
--- a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix
+++ b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix
@@ -5,8 +5,6 @@ buildDunePackage rec {
 
   inherit (angstrom) version src;
 
-  duneVersion = "3";
-
   propagatedBuildInputs = [ angstrom lwt ];
 
   doCheck = true;
diff --git a/pkgs/development/ocaml-modules/angstrom-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-unix/default.nix
index 752b6a48ced4..04c380320199 100644
--- a/pkgs/development/ocaml-modules/angstrom-unix/default.nix
+++ b/pkgs/development/ocaml-modules/angstrom-unix/default.nix
@@ -5,8 +5,6 @@ buildDunePackage rec {
 
   inherit (angstrom) version src;
 
-  duneVersion = "3";
-
   propagatedBuildInputs = [ angstrom ];
 
   doCheck = true;
diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix
index c4f5f98e4791..a96848fba08f 100644
--- a/pkgs/development/ocaml-modules/angstrom/default.nix
+++ b/pkgs/development/ocaml-modules/angstrom/default.nix
@@ -1,9 +1,8 @@
-{ lib, fetchFromGitHub, buildDunePackage, ocaml, ocaml-syntax-shims, alcotest, result, bigstringaf, ppx_let, gitUpdater }:
+{ lib, fetchFromGitHub, buildDunePackage, ocaml, ocaml-syntax-shims, alcotest, bigstringaf, ppx_let, gitUpdater }:
 
 buildDunePackage rec {
   pname = "angstrom";
-  version = "0.15.0";
-  duneVersion = "3";
+  version = "0.16.0";
 
   minimalOCamlVersion = "4.04";
 
@@ -11,12 +10,12 @@ buildDunePackage rec {
     owner  = "inhabitedtype";
     repo   = pname;
     rev    = version;
-    sha256 = "1hmrkdcdlkwy7rxhngf3cv3sa61cznnd9p5lmqhx20664gx2ibrh";
+    hash = "sha256-vilGto5ciyKzVJd72z4B+AvM1nf3x3O7DHXrK5SIajQ=";
   };
 
   checkInputs = [ alcotest ppx_let ];
   buildInputs = [ ocaml-syntax-shims ];
-  propagatedBuildInputs = [ bigstringaf result ];
+  propagatedBuildInputs = [ bigstringaf ];
   doCheck = lib.versionAtLeast ocaml.version "4.08";
 
   passthru.updateScript = gitUpdater { };
-- 
cgit 1.4.1