diff options
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r-- | pkgs/development/ocaml-modules/ffmpeg/base.nix | 4 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/fmt/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/ocaml-r/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/parmap/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/pbkdf/default.nix | 17 |
5 files changed, 16 insertions, 14 deletions
diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix index 5dc5f612fd325..212ad686e356a 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/base.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: rec { - version = "1.1.3"; + version = "1.1.4"; useDune2 = true; @@ -9,7 +9,7 @@ rec { owner = "savonet"; repo = "ocaml-ffmpeg"; rev = "v${version}"; - sha256 = "1l40dfc0v3wn2drfq0mclrc1lrlpycdjrkrw4knkwpsg0za68v4c"; + sha256 = "sha256-IM7bzOZAZQjLz4YjRTMU5fZgrA2QTZcSDMgclDo4sn0="; }; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix index 4816cab57cfd3..bd56298165284 100644 --- a/pkgs/development/ocaml-modules/fmt/default.nix +++ b/pkgs/development/ocaml-modules/fmt/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; - buildInputs = [ topkg ]; - propagatedBuildInputs = [ cmdliner seq stdlib-shims ]; + buildInputs = [ cmdliner topkg ]; + propagatedBuildInputs = [ seq stdlib-shims ]; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/ocaml-r/default.nix b/pkgs/development/ocaml-modules/ocaml-r/default.nix index fcee63de3b5db..ed22177bfaac3 100644 --- a/pkgs/development/ocaml-modules/ocaml-r/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-r/default.nix @@ -37,6 +37,8 @@ buildDunePackage rec { checkInputs = [ alcotest ]; meta = { + # This has been broken by the update to R 4.2.0 (#171597) + broken = true; description = "OCaml bindings for the R interpreter"; inherit (src.meta) homepage; license = lib.licenses.gpl3; diff --git a/pkgs/development/ocaml-modules/parmap/default.nix b/pkgs/development/ocaml-modules/parmap/default.nix index 521c1c406714b..18e1975b698d5 100644 --- a/pkgs/development/ocaml-modules/parmap/default.nix +++ b/pkgs/development/ocaml-modules/parmap/default.nix @@ -10,13 +10,12 @@ buildDunePackage rec { }; minimalOCamlVersion = "4.03"; - useDune2 = true; buildInputs = [ dune-configurator ]; - doCheck = true; + doCheck = false; # prevent running slow benchmarks meta = with lib; { description = "Library for multicore parallel programming"; diff --git a/pkgs/development/ocaml-modules/pbkdf/default.nix b/pkgs/development/ocaml-modules/pbkdf/default.nix index 1ecf213f6d369..d82869c4392d4 100644 --- a/pkgs/development/ocaml-modules/pbkdf/default.nix +++ b/pkgs/development/ocaml-modules/pbkdf/default.nix @@ -1,22 +1,23 @@ { lib , buildDunePackage -, fetchurl +, fetchFromGitHub +, cstruct , mirage-crypto , alcotest }: buildDunePackage rec { pname = "pbkdf"; - version = "1.1.0"; + version = "1.2.0"; - useDune2 = true; - - src = fetchurl { - url = "https://github.com/abeaumont/ocaml-pbkdf/releases/download/${version}/pbkdf-${version}.tbz"; - sha256 = "e53ed1bd9abf490c858a341c10fb548bc9ad50d4479acdf95a9358a73d042264"; + src = fetchFromGitHub { + owner = "abeaumont"; + repo = "ocaml-pbkdf"; + rev = version; + sha256 = "sha256-dGi4Vw+7VBpK/NpJ6zdpogm+E6G/oJovXCksJBSmqjI="; }; - propagatedBuildInputs = [ mirage-crypto ]; + propagatedBuildInputs = [ cstruct mirage-crypto ]; checkInputs = [ alcotest ]; doCheck = true; |