diff options
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules')
32 files changed, 71 insertions, 141 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/angstrom-async/default.nix b/nixpkgs/pkgs/development/ocaml-modules/angstrom-async/default.nix index ff390c1598bf..c603d1b21e57 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/angstrom-async/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/angstrom-async/default.nix @@ -5,7 +5,6 @@ buildDunePackage rec { inherit (angstrom) version src; - duneVersion = "3"; minimalOCamlVersion = "4.04.1"; propagatedBuildInputs = [ angstrom async ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix b/nixpkgs/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix index 063f4c1f80c7..2742b8515de7 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix @@ -5,8 +5,6 @@ buildDunePackage rec { inherit (angstrom) version src; - duneVersion = "3"; - propagatedBuildInputs = [ angstrom lwt ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/angstrom-unix/default.nix b/nixpkgs/pkgs/development/ocaml-modules/angstrom-unix/default.nix index 752b6a48ced4..04c380320199 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/angstrom-unix/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/angstrom-unix/default.nix @@ -5,8 +5,6 @@ buildDunePackage rec { inherit (angstrom) version src; - duneVersion = "3"; - propagatedBuildInputs = [ angstrom ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix b/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix index c4f5f98e4791..a96848fba08f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix @@ -1,9 +1,8 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, ocaml-syntax-shims, alcotest, result, bigstringaf, ppx_let, gitUpdater }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, ocaml-syntax-shims, alcotest, bigstringaf, ppx_let, gitUpdater }: buildDunePackage rec { pname = "angstrom"; - version = "0.15.0"; - duneVersion = "3"; + version = "0.16.0"; minimalOCamlVersion = "4.04"; @@ -11,12 +10,12 @@ buildDunePackage rec { owner = "inhabitedtype"; repo = pname; rev = version; - sha256 = "1hmrkdcdlkwy7rxhngf3cv3sa61cznnd9p5lmqhx20664gx2ibrh"; + hash = "sha256-vilGto5ciyKzVJd72z4B+AvM1nf3x3O7DHXrK5SIajQ="; }; checkInputs = [ alcotest ppx_let ]; buildInputs = [ ocaml-syntax-shims ]; - propagatedBuildInputs = [ bigstringaf result ]; + propagatedBuildInputs = [ bigstringaf ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; passthru.updateScript = gitUpdater { }; diff --git a/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix b/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix index 16d9e7c50fb7..6b9cff2143c9 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix @@ -4,13 +4,15 @@ buildDunePackage rec { pname = "batteries"; - version = "3.7.1"; + version = "3.7.2"; + + minimalOCamlVersion = "4.05"; src = fetchFromGitHub { owner = "ocaml-batteries-team"; repo = "batteries-included"; rev = "v${version}"; - hash = "sha256-0ZCaJA9xowO9QxCWcyJ1zhqG7+GNkMYJt62+VPOFj4Y="; + hash = "sha256-POhdb6d4VZyCm9QYgj0m3ejduaBmm+cnd1tshWjgp04="; }; nativeCheckInputs = [ qtest ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/conduit/async.nix b/nixpkgs/pkgs/development/ocaml-modules/conduit/async.nix index 249635d14bb8..5aaf16c46de5 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/conduit/async.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/conduit/async.nix @@ -9,8 +9,6 @@ buildDunePackage { src ; - duneVersion = "3"; - buildInputs = [ ppx_sexp_conv ppx_here ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix b/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix index ada502aaf0cb..7a7ee238f10b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix @@ -5,14 +5,13 @@ buildDunePackage rec { pname = "conduit"; - version = "6.2.0"; + version = "6.2.1"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz"; - sha256 = "sha256-PtRAsO3aGyEt12K9skgx85TcoFmF3RtKxPlFgdFFI5Q="; + hash = "sha256-WdXntiQ3vkibC3nOEf+QrATvOcaD5M78qFh6/cL1W7s="; }; propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ppx_sexp_conv ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index cb86ea5f4f06..81a77f356aff 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -6,7 +6,6 @@ buildDunePackage { pname = "conduit-lwt-unix"; inherit (conduit-lwt) version src; - duneVersion = "3"; buildInputs = [ ppx_sexp_conv ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix index 2ec6f556916d..641d57db10e3 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -3,7 +3,6 @@ buildDunePackage { pname = "conduit-lwt"; inherit (conduit) version src; - duneVersion = "3"; buildInputs = [ ppx_sexp_conv ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/conduit/mirage.nix b/nixpkgs/pkgs/development/ocaml-modules/conduit/mirage.nix index 04025666c3d9..79174261b9eb 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/conduit/mirage.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/conduit/mirage.nix @@ -1,5 +1,4 @@ { buildDunePackage, conduit-lwt -, fetchpatch , ppx_sexp_conv, sexplib, uri, cstruct, mirage-flow , mirage-flow-combinators, mirage-random, mirage-time, mirage-clock , dns-client-mirage, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp @@ -11,12 +10,6 @@ buildDunePackage { inherit (conduit-lwt) version src; - # Compatibility with tls ≥ 0.17 - patches = fetchpatch { - url = "https://github.com/mirage/ocaml-conduit/commit/403b4cec528dae71aded311215868a35c11dad7e.patch"; - hash = "sha256-R/iuLf2PSrx8mLKLueMA3+zr9sB8dX/3evjUbfQECBk="; - }; - nativeBuildInputs = [ ppx_sexp_conv ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix b/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix index 5be5f09d1965..fac5789dcdd1 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,15 +1,11 @@ -{ stdenv +{ buildDunePackage , lib , fetchFromGitHub , which , ocsigen_server -, ocaml , lwt_react -, opaline -, ocamlbuild , ppx_deriving , ppx_optcomp -, findlib , js_of_ocaml-ocamlbuild , js_of_ocaml-ppx , js_of_ocaml-ppx_deriving_json @@ -20,23 +16,19 @@ , ocsipersist }: -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "eliom"; - version = "10.1.0"; + version = "10.1.2"; src = fetchFromGitHub { owner = "ocsigen"; repo = "eliom"; rev = version; - hash = "sha256-nzrLl8adaRW6c+IQfJ7s+7KtFT8uU27Umyrv0aWXuxw="; + hash = "sha256-Cxwp534ADUO7AHnxZnGsrqxGDkhcJ314M5wytO4e8/0="; }; nativeBuildInputs = [ - ocaml which - findlib - opaline - ocamlbuild ]; buildInputs = [ js_of_ocaml-ocamlbuild @@ -58,12 +50,6 @@ stdenv.mkDerivation rec { strictDeps = true; - installPhase = '' - runHook preInstall - opaline -prefix $out -libdir $OCAMLFIND_DESTDIR - runHook postInstall - ''; - setupHook = [ ./setup-hook.sh ]; meta = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/expat/unittest.patch b/nixpkgs/pkgs/development/ocaml-modules/expat/unittest.patch deleted file mode 100644 index 489b745c503a..000000000000 --- a/nixpkgs/pkgs/development/ocaml-modules/expat/unittest.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- old/Makefile 2005-03-13 09:00:29.000000000 -0500 -+++ new/Makefile 2010-08-26 14:20:34.515785557 -0400 -@@ -67,10 +67,10 @@ - testall: test testopt - .PHONY: test - test: unittest -- ./unittest -+ LD_LIBRARY_PATH=. ./unittest - .PHONY: testopt - testopt: unittest.opt -- ./unittest.opt -+ LD_LIBRARY_PATH=. ./unittest.opt - unittest: all unittest.ml - $(OCAMLFIND) ocamlc -o unittest -package oUnit -ccopt -L. -linkpkg \ - $(ARCHIVE) unittest.ml diff --git a/nixpkgs/pkgs/development/ocaml-modules/fix/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fix/default.nix index c044a03a2574..ed4230fbd01d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/fix/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/fix/default.nix @@ -2,14 +2,14 @@ buildDunePackage rec { pname = "fix"; - version = "20220121"; + version = "20230505"; src = fetchFromGitLab { domain = "gitlab.inria.fr"; owner = "fpottier"; repo = "fix"; rev = version; - sha256 = "sha256-suWkZDLnXEO/4QCGmNuyLFOV0LJsFOMD13gxOcgu6JQ="; + sha256 = "sha256-Xuw4pEPqAbQjSHrpMCNE7Th0mpbNMSxdEdwvH4hu2SM="; }; minimumOCamlVersion = "4.03"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/functoria/default.nix b/nixpkgs/pkgs/development/ocaml-modules/functoria/default.nix index 1b4eb502b64a..e126c707285a 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/functoria/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/functoria/default.nix @@ -1,21 +1,19 @@ -{ lib, fetchurl, buildDunePackage, cmdliner +{ lib, buildDunePackage, cmdliner +, functoria-runtime , rresult, astring, fmt, logs, bos, fpath, emile, uri +, alcotest }: -buildDunePackage rec { +buildDunePackage { pname = "functoria"; - version = "4.3.6"; + inherit (functoria-runtime) version src; minimalOCamlVersion = "4.08"; - src = fetchurl { - url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-${version}.tbz"; - hash = "sha256-i/5sZHfxECoKYMdGje+U21GWxJ6dDZreVcQGtbuo4SE="; - }; - propagatedBuildInputs = [ cmdliner rresult astring fmt logs bos fpath emile uri ]; - doCheck = false; + doCheck = true; + checkInputs = [ alcotest functoria-runtime ]; meta = with lib; { description = "A DSL to organize functor applications"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/functoria/runtime.nix b/nixpkgs/pkgs/development/ocaml-modules/functoria/runtime.nix index 1eb2eec48e44..3ede6096e508 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/functoria/runtime.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/functoria/runtime.nix @@ -1,14 +1,21 @@ -{ lib, buildDunePackage, functoria, cmdliner, fmt }: +{ lib, buildDunePackage, fetchurl, cmdliner }: -buildDunePackage { +buildDunePackage rec { pname = "functoria-runtime"; + version = "4.4.1"; - inherit (functoria) version src; + src = fetchurl { + url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-${version}.tbz"; + hash = "sha256-FKCdzrRJVpUrCWqrTiE8l00ZKJOYsvI9mNzJ0ZxDBwg="; + }; + + minimalOCamlVersion = "4.08"; - propagatedBuildInputs = [ cmdliner fmt ]; + propagatedBuildInputs = [ cmdliner ]; meta = with lib; { - inherit (functoria.meta) homepage license; + homepage = "https://github.com/mirage/functoria"; + license = licenses.isc; description = "Runtime support library for functoria-generated code"; maintainers = [ maintainers.sternenseemann ]; }; diff --git a/nixpkgs/pkgs/development/ocaml-modules/gluten/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gluten/default.nix index d0f41d202689..5c55f2f09bfd 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/gluten/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/gluten/default.nix @@ -3,25 +3,22 @@ , faraday , fetchurl , lib -, ke }: buildDunePackage rec { pname = "gluten"; - version = "0.3.0"; + version = "0.5.0"; src = fetchurl { url = "https://github.com/anmonteiro/gluten/releases/download/${version}/gluten-${version}.tbz"; - hash = "sha256-9jctX3G/nQJTGJ7ClSBEiXwxeu0GcT9N+EmPfLuSFOU="; + hash = "sha256-mGKbbQSPMOumUCtxrAdoBt5y2RrkAf58spkUymTYhYM="; }; minimalOCamlVersion = "4.08"; - duneVersion = "3"; propagatedBuildInputs = [ bigstringaf faraday - ke ]; doCheck = false; # No tests diff --git a/nixpkgs/pkgs/development/ocaml-modules/gluten/eio.nix b/nixpkgs/pkgs/development/ocaml-modules/gluten/eio.nix new file mode 100644 index 000000000000..9c78b1d73cd4 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/gluten/eio.nix @@ -0,0 +1,12 @@ +{ lib, buildDunePackage, gluten, eio }: + +buildDunePackage { + pname = "gluten-eio"; + inherit (gluten) src version; + + propagatedBuildInputs = [ gluten eio ]; + + meta = gluten.meta // { + description = "EIO runtime for gluten"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/gluten/lwt-unix.nix b/nixpkgs/pkgs/development/ocaml-modules/gluten/lwt-unix.nix index cec427c3ad61..c3a360322a14 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/gluten/lwt-unix.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/gluten/lwt-unix.nix @@ -9,8 +9,6 @@ buildDunePackage rec { pname = "gluten-lwt-unix"; inherit (gluten) doCheck meta src version; - duneVersion = "3"; - propagatedBuildInputs = [ faraday-lwt-unix gluten-lwt diff --git a/nixpkgs/pkgs/development/ocaml-modules/gluten/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/gluten/lwt.nix index cfa736c4bc99..e4cfb0d8db02 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/gluten/lwt.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/gluten/lwt.nix @@ -7,8 +7,6 @@ buildDunePackage rec { pname = "gluten-lwt"; inherit (gluten) doCheck meta src version; - duneVersion = "3"; - propagatedBuildInputs = [ gluten lwt diff --git a/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix index 48dd8817a565..27791d6aa5f3 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix @@ -1,11 +1,8 @@ -{ lib, stdenv, ocaml, fetchFromGitHub, fetchpatch, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }: - -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") - "gsl is not available for OCaml ${ocaml.version}" +{ lib, stdenv, fetchFromGitHub, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }: buildDunePackage rec { pname = "gsl"; - version = "1.24.3"; + version = "1.25.0"; minimalOCamlVersion = "4.12"; @@ -13,32 +10,9 @@ buildDunePackage rec { owner = "mmottl"; repo = "gsl-ocaml"; rev = version; - hash = "sha256-I+u7lFEredt8ZLiba8x904eTgSUdZq82/e82B+/GIlo="; + hash = "sha256-vxXv0ZcToXmdYu5k0aLdV3seNn3Y6Sgg+8dpy3Iw68I="; }; - patches = [ - # Switched to Dune lang 2.7 - (fetchpatch { - url = "https://github.com/mmottl/gsl-ocaml/commit/be0f6933f16fea6d6fb2e39178816974be4c3724.patch"; - sha256 = "sha256-G/4JT8XPYw+oNJEwJ9zRdUBwtNUHL+T8/htCb3qfuT8="; - }) - # Fix dune rules - (fetchpatch { - url = "https://github.com/mmottl/gsl-ocaml/commit/0b38a22d9813de27eab5caafafeabd945f298b5e.patch"; - sha256 = "sha256-S6OUDase2kR7V6fizaev5huqEAIM5QOkx3n18rj4y3w="; - }) - # Updated opam file - (fetchpatch { - url = "https://github.com/mmottl/gsl-ocaml/commit/b749455b76501c9e3623e05d659565eab7292602.patch"; - sha256 = "sha256-/GACjI3cRCApyGyk1kQp0rB/Hae8DIR9zs6q9KiS1ZQ="; - }) - # Used new OCaml 4.12 C-macros - (fetchpatch { - url = "https://github.com/mmottl/gsl-ocaml/commit/cca79ea56a7ee83a4c67b432decdaef3de8c9d30.patch"; - sha256 = "sha256-bsIKkvj9W8oAYSvP6ZfbqSgt5fSirc780O08WBhVRmI="; - }) - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator gsl ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/h2/default.nix b/nixpkgs/pkgs/development/ocaml-modules/h2/default.nix index 1a8d0c5d6395..5ec66ae9235e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/h2/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/ocaml-modules/hpack/default.nix b/nixpkgs/pkgs/development/ocaml-modules/hpack/default.nix index 20a0456d7449..3b8057bf81c8 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/hpack/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix index f262d51ee7dc..6dce28fb2020 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix @@ -1,12 +1,11 @@ { lib, fetchFromGitHub, fetchpatch, buildDunePackage -, angstrom, faraday, alcotest +, angstrom, faraday, result, alcotest }: buildDunePackage rec { pname = "httpaf"; version = "0.7.1"; - duneVersion = "3"; minimalOCamlVersion = "4.08"; src = fetchFromGitHub { @@ -17,7 +16,7 @@ buildDunePackage rec { }; checkInputs = [ alcotest ]; - propagatedBuildInputs = [ angstrom faraday ]; + propagatedBuildInputs = [ angstrom faraday result ]; doCheck = true; meta = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix b/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix index 2dce9320afd4..c0ba327dd2fc 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix b/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix index 167f3739d269..109e51ee6f91 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix +++ b/nixpkgs/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; diff --git a/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix index 5675e10dbad1..fbe2d71fcd00 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix @@ -30,8 +30,6 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - preConfigure = "patchShebangs ./configure.sh"; - configureScript = "./configure.sh"; dontAddPrefix = "true"; dontAddStaticConfigureFlags = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix index a2294822a0ca..2846ff128451 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -2,8 +2,8 @@ let params = if lib.versionAtLeast ocaml.version "4.08" then { - version = "3.3.1"; - sha256 = "sha256-C124bhdrY+XzL93zzNEbCr+U+7CYBZDm0hlAw+iqat4="; + version = "3.3.2"; + sha256 = "sha256-T2DDpHqLar1sgmju0PLvhAZef5VzOpPWcFVhuZlPQmM="; } else { version = "3.1.0"; sha256 = "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage/default.nix index 98d96cf146f0..410475b6b5c0 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mirage/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mirage/default.nix @@ -8,7 +8,6 @@ buildDunePackage rec { inherit (mirage-runtime) version src; minimalOCamlVersion = "4.08"; - duneVersion = "3"; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix index 0b7d929f5a8e..7e20e3363a47 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage, fetchurl, ipaddr, functoria-runtime -, fmt, logs, lwt +, logs, lwt , alcotest }: @@ -8,9 +8,8 @@ buildDunePackage rec { inherit (functoria-runtime) src version; minimalOCamlVersion = "4.08"; - duneVersion = "3"; - propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs lwt ]; + propagatedBuildInputs = [ ipaddr functoria-runtime logs lwt ]; checkInputs = [ alcotest ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix index bbd85889c84d..16f0242a9bf7 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "ocaml-version"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz"; - hash = "sha256-AKCaXUehJ3V8uET1tUDDbIzI8lZv5aygxhIbR21xnTI="; + hash = "sha256-XJ0xq71ZiR39phQIULXFDLHoj3HntxLI+v2gR0Bp/rI="; }; checkInputs = [ alcotest ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix b/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix index d41e7c16ce1b..7c4f90b6f976 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -1,4 +1,5 @@ { lib +, ocaml , buildDunePackage , fetchFromGitHub , ppx_deriving @@ -14,6 +15,9 @@ , printbox-text }: +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "phylogenetics is not compatible with OCaml ${ocaml.version}" + buildDunePackage rec { pname = "phylogenetics"; version = "unstable-2022-05-06"; @@ -26,7 +30,6 @@ buildDunePackage rec { }; minimalOCamlVersion = "4.08"; - duneVersion = "3"; nativeCheckInputs = [ bppsuite ]; checkInputs = [ alcotest ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix index a5d042fc1907..ab21f11fa31f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix @@ -29,8 +29,6 @@ stdenv.mkDerivation { createFindlibDestdir = true; - preConfigure = "patchShebangs ./configure.sh"; - configureScript = "./configure.sh"; dontAddPrefix = "true"; dontAddStaticConfigureFlags = true; |