diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-08 06:00:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-08 06:00:55 +0000 |
| commit | 1287e59c065d7cc330201e5cfe0825cc289bb5da (patch) | |
| tree | 30d96b4d743581d4bc11eed309c0f75f4100927c /pkgs/development/ocaml-modules | |
| parent | 728281e1ea12eace7da07830ef9f9d5e58f9ba1f (diff) | |
| parent | 26117abbca9b30e96c001d3aaf2eab79c8b3b808 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/ocaml-modules')
4 files changed, 7 insertions, 12 deletions
diff --git a/pkgs/development/ocaml-modules/h2/default.nix b/pkgs/development/ocaml-modules/h2/default.nix index 1a8d0c5d6395a..5ec66ae9235ef 100644 --- a/pkgs/development/ocaml-modules/h2/default.nix +++ b/pkgs/development/ocaml-modules/h2/default.nix @@ -30,9 +30,6 @@ buildDunePackage rec { src ; - duneVersion = "3"; - minimalOCamlVersion = "4.06"; - propagatedBuildInputs = [ angstrom faraday @@ -42,8 +39,7 @@ buildDunePackage rec { httpaf ]; - # Tests fail with ≤ 4.07 - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; preCheck = '' ln -s "${http2-frame-test-case}" lib_test/http2-frame-test-case ''; diff --git a/pkgs/development/ocaml-modules/hpack/default.nix b/pkgs/development/ocaml-modules/hpack/default.nix index 20a0456d7449e..3b8057bf81c8b 100644 --- a/pkgs/development/ocaml-modules/hpack/default.nix +++ b/pkgs/development/ocaml-modules/hpack/default.nix @@ -7,14 +7,13 @@ buildDunePackage rec { pname = "hpack"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { url = "https://github.com/anmonteiro/ocaml-h2/releases/download/${version}/h2-${version}.tbz"; - hash = "sha256-n9avpVL6HD2KBON2FpnUeuH3HOUDOA29iSmjdcxMRvE="; + hash = "sha256-GdXwazlgDurjzy7ekLpuMkCii8W+F/jl/IBv/WTHgFM="; }; - duneVersion = "3"; minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix index 2dce9320afd4c..c0ba327dd2fc0 100644 --- a/pkgs/development/ocaml-modules/inotify/default.nix +++ b/pkgs/development/ocaml-modules/inotify/default.nix @@ -4,14 +4,14 @@ }: buildDunePackage rec { - version = "2.4.1"; + version = "2.5"; pname = "inotify"; src = fetchFromGitHub { owner = "whitequark"; repo = "ocaml-inotify"; rev = "v${version}"; - hash = "sha256-2ATFF3HeATjhWgW4dG4jheQ9m1oE8xTQ7mpMT/1Jdp8="; + hash = "sha256-3Ju6l6aF5eJgIZJKO0lQGXjjGDzCdX2fuwyNSAjIyAs="; }; buildInputs = [ lwt ]; diff --git a/pkgs/development/ocaml-modules/iter/default.nix b/pkgs/development/ocaml-modules/iter/default.nix index 167f3739d2693..109e51ee6f919 100644 --- a/pkgs/development/ocaml-modules/iter/default.nix +++ b/pkgs/development/ocaml-modules/iter/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "iter"; - version = "1.7"; + version = "1.8"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/c-cube/iter/releases/download/v${version}/iter-${version}.tbz"; - hash = "sha256-vtcSnPMxpBwDve1zsR6cEnUsyu3JELPt2Kwu4OEEtzA="; + hash = "sha256-+HOcoFrpxLqKogwNQZfnRAnytlmhfxJzDUKvH9n0MCM="; }; doCheck = true; |