Merge pull request #235118 from NixOS/backport-234154-to-release-23.05

[Backport release-23.05] ocamlPackages.iter: 1.6 → 1.7

3 files changed, 11 insertions, 14 deletions

diff --git a/pkgs/development/ocaml-modules/iter/default.nix b/pkgs/development/ocaml-modules/iter/default.nix
index 7d0f9366a554c..167f3739d2693 100644
--- a/pkgs/development/ocaml-modules/iter/default.nix
+++ b/pkgs/development/ocaml-modules/iter/default.nix
@@ -1,25 +1,19 @@
-{ lib, fetchFromGitHub, buildDunePackage, ocaml, dune-configurator
-, result, seq
+{ lib, fetchurl, buildDunePackage
 , mdx, ounit2, qcheck-core
 }:
 
 buildDunePackage rec {
   pname = "iter";
-  version = "1.6";
+  version = "1.7";
 
-  duneVersion = "3";
+  minimalOCamlVersion = "4.08";
 
-  src = fetchFromGitHub {
-    owner = "c-cube";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-FbM/Vk/h4wkrBjyf9/QXTvTOA0nNqsdHP1mDnVkg1is=";
+  src = fetchurl {
+    url = "https://github.com/c-cube/iter/releases/download/v${version}/iter-${version}.tbz";
+    hash = "sha256-vtcSnPMxpBwDve1zsR6cEnUsyu3JELPt2Kwu4OEEtzA=";
   };
 
-  buildInputs = [ dune-configurator ];
-  propagatedBuildInputs = [ result seq ];
-
-  doCheck = lib.versionAtLeast ocaml.version "4.08";
+  doCheck = true;
   nativeCheckInputs = [ mdx.bin ];
   checkInputs = [ ounit2 qcheck-core ];
 
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index cf631fd08e415..4033336ae119b 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -16,6 +16,8 @@ buildDunePackage rec {
   };
 
   postPatch = lib.optionalString (lib.versionAtLeast ocaml.version "5.0") ''
+    substituteInPlace src/core/dune \
+      --replace "(libraries bytes)" ""
     substituteInPlace src/unix/dune \
       --replace "libraries bigarray lwt" "libraries lwt"
   '';
diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix
index 285e8de84b397..c7fa14a291d71 100644
--- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix
+++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix
@@ -13,7 +13,8 @@ buildDunePackage rec {
 
   postPatch = lib.optionalString (lib.versionAtLeast ocaml.version "5.0") ''
     substituteInPlace src/dune \
-      --replace "libraries ocplib_endian bigarray" "libraries ocplib_endian"
+      --replace "(libraries bytes)" "" \
+      --replace "libraries ocplib_endian bigarray bytes" "libraries ocplib_endian"
   '';
 
   minimalOCamlVersion = "4.03";