diff options
author | Nick Cao <nickcao@nichi.co> | 2023-05-30 22:02:42 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-30 22:02:42 -0600 |
commit | 37e7bb5d4673b52e3ab811ff8ca403a29791a3dc (patch) | |
tree | 0c229efdab232fcb2c0a86fbfb765e4369c9af73 /pkgs/development/ocaml-modules | |
parent | e43d7dec3efea4c605b51c66d1eaf0cea9ef08f2 (diff) | |
parent | 56376c4eee79d43725bccff13258aaefa0ac8199 (diff) | |
download | nixpkgs-37e7bb5d4673b52e3ab811ff8ca403a29791a3dc.tar nixpkgs-37e7bb5d4673b52e3ab811ff8ca403a29791a3dc.tar.gz nixpkgs-37e7bb5d4673b52e3ab811ff8ca403a29791a3dc.tar.bz2 nixpkgs-37e7bb5d4673b52e3ab811ff8ca403a29791a3dc.tar.lz nixpkgs-37e7bb5d4673b52e3ab811ff8ca403a29791a3dc.tar.xz nixpkgs-37e7bb5d4673b52e3ab811ff8ca403a29791a3dc.tar.zst nixpkgs-37e7bb5d4673b52e3ab811ff8ca403a29791a3dc.zip |
Merge pull request #234154 from vbgl/ocaml-iter-1.7
ocamlPackages.iter: 1.6 → 1.7
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r-- | pkgs/development/ocaml-modules/iter/default.nix | 20 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/lwt/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/ocplib-endian/default.nix | 3 |
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 7d0f9366a55..167f3739d26 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 cf631fd08e4..4033336ae11 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 285e8de84b3..c7fa14a291d 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"; |