diff --git a/pkgs/development/ocaml-modules/bigstring/default.nix b/pkgs/development/ocaml-modules/bigstring/default.nix index f966e0b90b1b..650522363d31 100644 --- a/pkgs/development/ocaml-modules/bigstring/default.nix +++ b/pkgs/development/ocaml-modules/bigstring/default.nix @@ -1,12 +1,16 @@ -{ lib, fetchFromGitHub, buildDunePackage }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml }: buildDunePackage rec { pname = "bigstring"; version = "0.3"; - useDune2 = true; + duneVersion = "3"; + minimalOCamlVersion = "4.03"; - minimumOCamlVersion = "4.03"; + # Ensure compatibility with OCaml ≥ 5.0 + preConfigure = lib.optional (lib.versionAtLeast ocaml.version "4.08") '' + substituteInPlace src/dune --replace '(libraries bytes bigarray)' "" + ''; src = fetchFromGitHub { owner = "c-cube"; diff --git a/pkgs/development/ocaml-modules/hidapi/default.nix b/pkgs/development/ocaml-modules/hidapi/default.nix index 68fc506222de..b47c153a4974 100644 --- a/pkgs/development/ocaml-modules/hidapi/default.nix +++ b/pkgs/development/ocaml-modules/hidapi/default.nix @@ -1,19 +1,21 @@ -{ pkgs, lib, fetchurl, buildDunePackage, pkg-config, dune-configurator +{ pkgs, lib, fetchFromGitHub, buildDunePackage, pkg-config, dune-configurator , bigstring, }: buildDunePackage rec { pname = "hidapi"; - version = "1.1.1"; + version = "1.1.2"; - useDune2 = true; + duneVersion = "3"; - src = fetchurl { - url = "https://github.com/vbmithr/ocaml-hidapi/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "1j7rd7ajrzla76r3sxljx6fb18f4f4s3jd7vhv59l2ilxyxycai2"; + src = fetchFromGitHub { + owner = "vbmithr"; + repo = "ocaml-hidapi"; + rev = version; + hash = "sha256-SNQ1/i5wJJgcslIUBe+z5QgHns/waHnILyMUJ46cUwg="; }; - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.03"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ pkgs.hidapi dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/secp256k1-internal/default.nix b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix index 4a9a761ab30c..b403b997027b 100644 --- a/pkgs/development/ocaml-modules/secp256k1-internal/default.nix +++ b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix @@ -11,15 +11,16 @@ buildDunePackage rec { pname = "secp256k1-internal"; - version = "0.3"; + version = "0.4"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "ocaml-secp256k1-internal"; - rev = version; - sha256 = "sha256-1wvQ4RW7avcGsIc0qgDzhGrwOBY0KHrtNVHCj2cgNzo="; + rev = "v${version}"; + hash = "sha256-amVtp94cE1NxClWJgcJvRmilnQlC7z44mORUaxvPn00="; }; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ gmp diff --git a/pkgs/development/ocaml-modules/uecc/default.nix b/pkgs/development/ocaml-modules/uecc/default.nix index efb86d862476..1185977132dd 100644 --- a/pkgs/development/ocaml-modules/uecc/default.nix +++ b/pkgs/development/ocaml-modules/uecc/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "uecc"; version = "0.4"; + duneVersion = "3"; + src = fetchFromGitLab { owner = "nomadic-labs"; repo = "ocaml-uecc";