diff options
Diffstat (limited to 'pkgs/development/ocaml-modules')
5 files changed, 48 insertions, 13 deletions
diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index ee3d7045d5656..654e86ab15175 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -5,14 +5,16 @@ }: buildDunePackage rec { - version = "3.12"; + version = "3.13.1"; pname = "containers"; + minimalOCamlVersion = "4.08"; + src = fetchFromGitHub { owner = "c-cube"; repo = "ocaml-containers"; rev = "v${version}"; - hash = "sha256-15Wd6k/NvjAvTmxlPlZPClODBtFXM6FG3VxniC66u88="; + hash = "sha256-jkXh/dBRotWXvA77M/+tm39qsCiBsH/HSs+Y9D9QCek="; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/eio/default.nix b/pkgs/development/ocaml-modules/eio/default.nix index 005364039e029..5b10865b15fce 100644 --- a/pkgs/development/ocaml-modules/eio/default.nix +++ b/pkgs/development/ocaml-modules/eio/default.nix @@ -1,6 +1,6 @@ { lib , ocaml -, version ? if lib.versionAtLeast ocaml.version "5.1" then "0.13" else "0.12" +, version ? if lib.versionAtLeast ocaml.version "5.1" then "0.14" else "0.12" , buildDunePackage , bigstringaf , cstruct @@ -24,9 +24,9 @@ let minimalOCamlVersion = "5.0"; hash = "sha256-2EhHzoX/t4ZBSWrSS+PGq1zCxohc7a1q4lfsrFnZJqA="; }; - "0.13" = { + "0.14" = { minimalOCamlVersion = "5.1"; - hash = "sha256-glN+4cWxgp/eggdhSk459WC9WCMyhBKQ7V73ZpHzr3A="; + hash = "sha256-UvhblH0+DecJQLW7qsDT54hB/qVkjnOvfYp1SrUchxs="; }; }."${version}"; in diff --git a/pkgs/development/ocaml-modules/luv/default.nix b/pkgs/development/ocaml-modules/luv/default.nix index da7f9ba1808fa..3f2d462fd15e7 100644 --- a/pkgs/development/ocaml-modules/luv/default.nix +++ b/pkgs/development/ocaml-modules/luv/default.nix @@ -6,12 +6,13 @@ buildDunePackage rec { pname = "luv"; - version = "0.5.11"; - useDune2 = true; + version = "0.5.12"; + + minimalOCamlVersion = "4.03"; src = fetchurl { url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz"; - sha256 = "sha256-zOz0cxGzhLi3Q36qyStNCz8JGXHtECQfZysMKiyKOkM="; + sha256 = "sha256-dp9qCIYqSdROIAQ+Jw73F3vMe7hnkDe8BgZWImNMVsA="; }; postConfigure = '' @@ -23,6 +24,7 @@ buildDunePackage rec { nativeBuildInputs = [ file ]; propagatedBuildInputs = [ ctypes result ]; checkInputs = [ alcotest ]; + # Alcotest depends on fmt that needs 4.08 or newer doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/middleware/default.nix b/pkgs/development/ocaml-modules/middleware/default.nix new file mode 100644 index 0000000000000..2cdef2e5a3c4e --- /dev/null +++ b/pkgs/development/ocaml-modules/middleware/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildDunePackage +, fetchurl +, alcotest +}: + +buildDunePackage rec { + pname = "middleware"; + version = "0.0.1"; + + minimalOCamlVersion = "4.14.0"; + + src = fetchurl { + url = "https://github.com/skolemlabs/middleware/releases/download/${version}/${pname}-${version}.tbz"; + hash = "sha256-zhLEGvyZiKrdBKWcEbB4PHvYzBlkrp1Ldnon0mP2Ypg="; + }; + + checkInputs = [ + alcotest + ]; + + doCheck = true; + + meta = { + description = "Composable stacked functions, which can respond to inner calls"; + homepage = "https://github.com/skolemlabs/middleware"; + changelog = "https://github.com/skolemlabs/middleware/blob/${version}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sixstring982 ]; + }; +} + diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix index 42bd4c1383fec..22aa70d9ff1c5 100644 --- a/pkgs/development/ocaml-modules/owl/default.nix +++ b/pkgs/development/ocaml-modules/owl/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, buildDunePackage +{ buildDunePackage , dune-configurator , fetchFromGitHub , alcotest @@ -16,8 +15,6 @@ buildDunePackage rec { inherit (owl-base) version src meta; - duneVersion = "3"; - checkInputs = [ alcotest ]; buildInputs = [ dune-configurator stdio ]; propagatedBuildInputs = [ @@ -27,5 +24,7 @@ buildDunePackage rec { npy ]; - doCheck = !stdenv.isDarwin; # https://github.com/owlbarn/owl/issues/462 + doCheck = false; + # Tests fail with Clang: https://github.com/owlbarn/owl/issues/462 + # and with GCC 13: https://github.com/owlbarn/owl/issues/653 } |