From 4922992a04647dbb955ff12a97bb9fe4063d810a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 17 Apr 2024 05:55:40 +0200 Subject: [PATCH] =?UTF-8?q?ligo:=201.4.0=20=E2=86=92=201.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.data-encoding: 0.7.1 → 1.0.1 ocamlPackages.index: 1.6.1 → 1.6.2 ocamlPackages.irmin: 3.7.2 → 3.9.0 ocamlPackages.irmin-http: remove at 3.7.2 ocamlPackages.mirage-kv: 4.0.1 → 6.1.1 ocamlPackages.terminal: 0.2.1 → 0.2.2 --- pkgs/development/compilers/ligo/default.nix | 9 +++--- .../ocaml-modules/data-encoding/default.nix | 18 +++-------- .../ocaml-modules/index/default.nix | 5 ++- .../development/ocaml-modules/irmin/chunk.nix | 2 +- .../ocaml-modules/irmin/containers.nix | 2 +- .../ocaml-modules/irmin/default.nix | 2 +- pkgs/development/ocaml-modules/irmin/fs.nix | 2 +- pkgs/development/ocaml-modules/irmin/git.nix | 2 +- pkgs/development/ocaml-modules/irmin/http.nix | 25 --------------- .../ocaml-modules/irmin/mirage-git.nix | 2 +- .../ocaml-modules/irmin/mirage-graphql.nix | 2 +- .../ocaml-modules/irmin/mirage.nix | 2 +- pkgs/development/ocaml-modules/irmin/pack.nix | 2 +- pkgs/development/ocaml-modules/irmin/ppx.nix | 4 +-- pkgs/development/ocaml-modules/irmin/test.nix | 7 ++-- .../development/ocaml-modules/irmin/tezos.nix | 2 +- .../ocaml-modules/json-data-encoding/bson.nix | 2 -- .../json-data-encoding/default.nix | 19 ++++------- .../ocaml-modules/mirage-kv/default.nix | 9 +++--- .../ocaml-modules/progress/default.nix | 1 - .../ocaml-modules/terminal/default.nix | 7 ++-- pkgs/top-level/all-packages.nix | 9 +----- pkgs/top-level/ocaml-packages.nix | 32 ++++++++----------- 23 files changed, 55 insertions(+), 112 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/irmin/http.nix diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 9443f7a8cc08..9b57fd0a2e25 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -15,12 +15,12 @@ ocamlPackages.buildDunePackage rec { pname = "ligo"; - version = "1.4.0"; + version = "1.6.0"; src = fetchFromGitLab { owner = "ligolang"; repo = "ligo"; rev = version; - sha256 = "sha256-N2RkeKJ+lEyNJwpmF5sORmOkDhNmTYRYAgvyR7Pc5EI="; + hash = "sha256-ZPHOgozuUij9+4YXZTnn1koddQEQZe/yrpb+OPHO+nA="; fetchSubmodules = true; }; @@ -30,8 +30,6 @@ ocamlPackages.buildDunePackage rec { # This is a hack to work around the hack used in the dune files OPAM_SWITCH_PREFIX = "${tezos-rust-libs}"; - strictDeps = true; - nativeBuildInputs = [ ocaml-crunch git @@ -98,7 +96,7 @@ ocamlPackages.buildDunePackage rec { bls12-381 bls12-381-signature ptime - mtime_1 + mtime lwt_log secp256k1-internal resto @@ -112,6 +110,7 @@ ocamlPackages.buildDunePackage rec { simple-diff seqes stdint + tezt ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/ocaml-modules/data-encoding/default.nix b/pkgs/development/ocaml-modules/data-encoding/default.nix index db139d2b26ae..f94abebbcbdf 100644 --- a/pkgs/development/ocaml-modules/data-encoding/default.nix +++ b/pkgs/development/ocaml-modules/data-encoding/default.nix @@ -2,6 +2,7 @@ , fetchFromGitLab , buildDunePackage , ppx_hash +, bigstringaf , either , ezjsonm , zarith @@ -16,19 +17,12 @@ buildDunePackage rec { pname = "data-encoding"; - version = "0.7.1"; + inherit (json-data-encoding) src version; - duneVersion = "3"; minimalOCamlVersion = "4.10"; - src = fetchFromGitLab { - owner = "nomadic-labs"; - repo = "data-encoding"; - rev = "v${version}"; - hash = "sha256-V3XiCCtoU+srOI+KVSJshtaSJLBJ4m4o10GpBfdYKCU="; - }; - propagatedBuildInputs = [ + bigstringaf either ezjsonm ppx_hash @@ -39,14 +33,10 @@ buildDunePackage rec { json-data-encoding-bson ]; - checkInputs = [ - alcotest - crowbar + buildInputs = [ ppx_expect ]; - doCheck = true; - meta = { homepage = "https://gitlab.com/nomadic-labs/data-encoding"; description = "Library of JSON and binary encoding combinators"; diff --git a/pkgs/development/ocaml-modules/index/default.nix b/pkgs/development/ocaml-modules/index/default.nix index ebc050787555..3cc3643429c7 100644 --- a/pkgs/development/ocaml-modules/index/default.nix +++ b/pkgs/development/ocaml-modules/index/default.nix @@ -6,15 +6,14 @@ buildDunePackage rec { pname = "index"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; - hash = "sha256-rPwNzqkWqDak2mDTDIBqIvachY1vfOIzFmwaXjZea+4="; + hash = "sha256-k4iDUJik7UTuztBw7YaFXASd8SqYMR1JgLm3JOyriGA="; }; minimalOCamlVersion = "4.08"; - duneVersion = "3"; buildInputs = [ stdlib-shims diff --git a/pkgs/development/ocaml-modules/irmin/chunk.nix b/pkgs/development/ocaml-modules/irmin/chunk.nix index 59bd81544945..3e7f3c2a1b70 100644 --- a/pkgs/development/ocaml-modules/irmin/chunk.nix +++ b/pkgs/development/ocaml-modules/irmin/chunk.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "irmin-chunk"; - inherit (irmin) version src strictDeps; + inherit (irmin) version src; propagatedBuildInputs = [ irmin fmt logs lwt ]; diff --git a/pkgs/development/ocaml-modules/irmin/containers.nix b/pkgs/development/ocaml-modules/irmin/containers.nix index 73cd25f3170d..32677d9604c2 100644 --- a/pkgs/development/ocaml-modules/irmin/containers.nix +++ b/pkgs/development/ocaml-modules/irmin/containers.nix @@ -6,7 +6,7 @@ buildDunePackage { pname = "irmin-containers"; - inherit (ppx_irmin) src version strictDeps; + inherit (ppx_irmin) src version; nativeBuildInputs = [ ppx_irmin diff --git a/pkgs/development/ocaml-modules/irmin/default.nix b/pkgs/development/ocaml-modules/irmin/default.nix index d273d19553c1..3f6e551e6713 100644 --- a/pkgs/development/ocaml-modules/irmin/default.nix +++ b/pkgs/development/ocaml-modules/irmin/default.nix @@ -7,7 +7,7 @@ buildDunePackage { pname = "irmin"; - inherit (ppx_irmin) src version strictDeps; + inherit (ppx_irmin) src version; minimalOCamlVersion = "4.10"; diff --git a/pkgs/development/ocaml-modules/irmin/fs.nix b/pkgs/development/ocaml-modules/irmin/fs.nix index 1788cf1eda23..8d56e90fad8b 100644 --- a/pkgs/development/ocaml-modules/irmin/fs.nix +++ b/pkgs/development/ocaml-modules/irmin/fs.nix @@ -6,7 +6,7 @@ buildDunePackage rec { pname = "irmin-fs"; - inherit (irmin) version src strictDeps; + inherit (irmin) version src; propagatedBuildInputs = [ irmin astring logs lwt ]; diff --git a/pkgs/development/ocaml-modules/irmin/git.nix b/pkgs/development/ocaml-modules/irmin/git.nix index 387fc60a0aa9..1e4397e89298 100644 --- a/pkgs/development/ocaml-modules/irmin/git.nix +++ b/pkgs/development/ocaml-modules/irmin/git.nix @@ -9,7 +9,7 @@ buildDunePackage { pname = "irmin-git"; - inherit (irmin) version src strictDeps; + inherit (irmin) version src; propagatedBuildInputs = [ git diff --git a/pkgs/development/ocaml-modules/irmin/http.nix b/pkgs/development/ocaml-modules/irmin/http.nix deleted file mode 100644 index 1b376425bdce..000000000000 --- a/pkgs/development/ocaml-modules/irmin/http.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildDunePackage, astring, cohttp-lwt, cohttp-lwt-unix, irmin, webmachine -, fmt, jsonm, logs, lwt, uri -, git-unix, irmin-git, irmin-test, irmin-fs, digestif -, cacert -}: - -buildDunePackage rec { - - pname = "irmin-http"; - - inherit (irmin) version src strictDeps; - - propagatedBuildInputs = [ astring cohttp-lwt cohttp-lwt-unix fmt jsonm logs lwt uri irmin webmachine ]; - - checkInputs = [ - digestif git-unix irmin-git irmin-test irmin-fs cacert - ]; - - doCheck = true; - - meta = irmin.meta // { - description = "HTTP client and server for Irmin"; - }; - -} diff --git a/pkgs/development/ocaml-modules/irmin/mirage-git.nix b/pkgs/development/ocaml-modules/irmin/mirage-git.nix index 09c1820d6094..7528e469913f 100644 --- a/pkgs/development/ocaml-modules/irmin/mirage-git.nix +++ b/pkgs/development/ocaml-modules/irmin/mirage-git.nix @@ -6,7 +6,7 @@ buildDunePackage { pname = "irmin-mirage-git"; - inherit (irmin-mirage) version src strictDeps; + inherit (irmin-mirage) version src; propagatedBuildInputs = [ irmin-mirage diff --git a/pkgs/development/ocaml-modules/irmin/mirage-graphql.nix b/pkgs/development/ocaml-modules/irmin/mirage-graphql.nix index bfbe45b39019..1973cde8c3b6 100644 --- a/pkgs/development/ocaml-modules/irmin/mirage-graphql.nix +++ b/pkgs/development/ocaml-modules/irmin/mirage-graphql.nix @@ -5,7 +5,7 @@ buildDunePackage { pname = "irmin-mirage-graphql"; - inherit (irmin-mirage) version src strictDeps; + inherit (irmin-mirage) version src; propagatedBuildInputs = [ irmin-mirage diff --git a/pkgs/development/ocaml-modules/irmin/mirage.nix b/pkgs/development/ocaml-modules/irmin/mirage.nix index 9e4bd9330799..eabb1e5874e8 100644 --- a/pkgs/development/ocaml-modules/irmin/mirage.nix +++ b/pkgs/development/ocaml-modules/irmin/mirage.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "irmin-mirage"; - inherit (irmin) version src strictDeps; + inherit (irmin) version src; propagatedBuildInputs = [ irmin fmt ptime mirage-clock diff --git a/pkgs/development/ocaml-modules/irmin/pack.nix b/pkgs/development/ocaml-modules/irmin/pack.nix index 9afb40c20766..3a00c5e99f5f 100644 --- a/pkgs/development/ocaml-modules/irmin/pack.nix +++ b/pkgs/development/ocaml-modules/irmin/pack.nix @@ -8,7 +8,7 @@ buildDunePackage rec { pname = "irmin-pack"; - inherit (irmin) version src strictDeps; + inherit (irmin) version src; nativeBuildInputs = [ ppx_irmin ]; diff --git a/pkgs/development/ocaml-modules/irmin/ppx.nix b/pkgs/development/ocaml-modules/irmin/ppx.nix index 78207bf009e8..23165099443e 100644 --- a/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "ppx_irmin"; - version = "3.7.2"; + version = "3.9.0"; src = fetchurl { url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - hash = "sha256-aqW6TGoCM3R9S9OrOW8rOjO7gPnY7UoXjIOgNQM8DlI="; + hash = "sha256-jgc6vhtf+1ttWMMmBsnX2rwyxTUBdWvoCpLtR3etUaA="; }; minimalOCamlVersion = "4.10"; diff --git a/pkgs/development/ocaml-modules/irmin/test.nix b/pkgs/development/ocaml-modules/irmin/test.nix index 942200bf429a..a0e206cade72 100644 --- a/pkgs/development/ocaml-modules/irmin/test.nix +++ b/pkgs/development/ocaml-modules/irmin/test.nix @@ -1,13 +1,13 @@ { buildDunePackage, irmin, ppx_irmin, mtime, astring, fmt, jsonm, logs, lwt , metrics-unix, ocaml-syntax-shims, cmdliner, metrics, alcotest-lwt -, hex, vector +, hex, vector, qcheck-alcotest }: buildDunePackage { pname = "irmin-test"; - inherit (irmin) version src strictDeps; + inherit (irmin) version src; nativeBuildInputs = [ ppx_irmin ]; @@ -27,7 +27,8 @@ buildDunePackage { metrics ]; - checkInputs = [ hex vector ]; + doCheck = true; + checkInputs = [ hex qcheck-alcotest vector ]; meta = irmin.meta // { description = "Irmin test suite"; diff --git a/pkgs/development/ocaml-modules/irmin/tezos.nix b/pkgs/development/ocaml-modules/irmin/tezos.nix index 82a89daec359..ec005921c938 100644 --- a/pkgs/development/ocaml-modules/irmin/tezos.nix +++ b/pkgs/development/ocaml-modules/irmin/tezos.nix @@ -6,7 +6,7 @@ buildDunePackage rec { pname = "irmin-tezos"; - inherit (irmin) version src strictDeps; + inherit (irmin) version src; propagatedBuildInputs = [ irmin diff --git a/pkgs/development/ocaml-modules/json-data-encoding/bson.nix b/pkgs/development/ocaml-modules/json-data-encoding/bson.nix index c0d1a5260bc7..46810ab1566b 100644 --- a/pkgs/development/ocaml-modules/json-data-encoding/bson.nix +++ b/pkgs/development/ocaml-modules/json-data-encoding/bson.nix @@ -5,8 +5,6 @@ buildDunePackage { inherit (json-data-encoding) version src doCheck; - duneVersion = "3"; - propagatedBuildInputs = [ json-data-encoding ocplib-endian diff --git a/pkgs/development/ocaml-modules/json-data-encoding/default.nix b/pkgs/development/ocaml-modules/json-data-encoding/default.nix index c517725c74e2..5bb3f7701bba 100644 --- a/pkgs/development/ocaml-modules/json-data-encoding/default.nix +++ b/pkgs/development/ocaml-modules/json-data-encoding/default.nix @@ -1,28 +1,21 @@ -{ lib, fetchFromGitLab, buildDunePackage, uri, crowbar, alcotest }: +{ lib, fetchFromGitLab, buildDunePackage, hex, uri }: buildDunePackage rec { pname = "json-data-encoding"; - version = "0.12.1"; + version = "1.0.1"; minimalOCamlVersion = "4.10"; - duneVersion = "3"; src = fetchFromGitLab { owner = "nomadic-labs"; - repo = "json-data-encoding"; - rev = version; - hash = "sha256-ticulOKiFNQIZNFOQE9UQOw/wqRfygQwLVIc4kkmwg4="; + repo = "data-encoding"; + rev = "v${version}"; + hash = "sha256-KoA4xX4tNyi6bX5kso/Wof1LA7431EXJ34eD5X4jnd8="; }; propagatedBuildInputs = [ + hex uri ]; - checkInputs = [ - crowbar - alcotest - ]; - - doCheck = true; - meta = { homepage = "https://gitlab.com/nomadic-labs/json-data-encoding"; description = "Type-safe encoding to and decoding from JSON"; diff --git a/pkgs/development/ocaml-modules/mirage-kv/default.nix b/pkgs/development/ocaml-modules/mirage-kv/default.nix index d32a9e3935e5..97eb3128e15b 100644 --- a/pkgs/development/ocaml-modules/mirage-kv/default.nix +++ b/pkgs/development/ocaml-modules/mirage-kv/default.nix @@ -1,22 +1,23 @@ { lib, fetchurl, buildDunePackage , fmt , lwt +, optint +, ptime , alcotest }: buildDunePackage rec { pname = "mirage-kv"; - version = "4.0.1"; + version = "6.1.1"; - duneVersion = "3"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/mirage-kv/releases/download/v${version}/mirage-kv-${version}.tbz"; - hash = "sha256-p6i4zUVgxtTnUiBIjb8W6u9xRTczVl4WwfFcl5tVqnE="; + hash = "sha256-fNXNlaDpb5zUA2rTwi5h1j4v4LQmovxG+Am6u+1guPQ="; }; - propagatedBuildInputs = [ fmt lwt ]; + propagatedBuildInputs = [ fmt lwt optint ptime ]; doCheck = true; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/progress/default.nix b/pkgs/development/ocaml-modules/progress/default.nix index b714cdf33712..7ca95a088243 100644 --- a/pkgs/development/ocaml-modules/progress/default.nix +++ b/pkgs/development/ocaml-modules/progress/default.nix @@ -7,7 +7,6 @@ buildDunePackage rec { pname = "progress"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; inherit (terminal) version src; diff --git a/pkgs/development/ocaml-modules/terminal/default.nix b/pkgs/development/ocaml-modules/terminal/default.nix index 1700da060689..8daf53abdb50 100644 --- a/pkgs/development/ocaml-modules/terminal/default.nix +++ b/pkgs/development/ocaml-modules/terminal/default.nix @@ -5,14 +5,13 @@ buildDunePackage rec { pname = "terminal"; - version = "0.2.1"; + version = "0.2.2"; minimalOCamlVersion = "4.03"; - duneVersion = "3"; src = fetchurl { - url = "https://github.com/CraigFe/progress/releases/download/${version}/terminal-${version}.tbz"; - hash = "sha256:0vjqkvmpyi8kvmb4vrx3f0994rph8i9pvlrz1dyi126vlb2zbrvs"; + url = "https://github.com/CraigFe/progress/releases/download/${version}/progress-${version}.tbz"; + hash = "sha256-M0HCGSOiHNa1tc+p7DmB9ZVyw2eUD+XgJFBTPftBELU="; }; propagatedBuildInputs = [ stdlib-shims uutf uucp ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09edd1168cf6..6055d51ea5b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9781,14 +9781,7 @@ with pkgs; ldc = callPackage ../development/compilers/ldc { }; ligo = - let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15.overrideScope (self: super: { - zarith = super.zarith.overrideAttrs (o: { - src = fetchzip { - url = "https://github.com/ocaml/Zarith/archive/refs/tags/release-1.12.tar.gz"; - hash = "sha256-SQegsMc1+UIod8XeJDE+H5q1huNDQI8CUh7IsHOoVMs="; - }; - }); - }); in + let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; in callPackage ../development/compilers/ligo { coq = coq_8_13.override { customOCamlPackages = ocaml_p; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 928e8eb7d5a2..529e893894cf 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -56,9 +56,9 @@ let atdgen-runtime = callPackage ../development/ocaml-modules/atdgen/runtime.nix { }; - awa = callPackage ../development/ocaml-modules/awa { mtime = mtime_1; }; + awa = callPackage ../development/ocaml-modules/awa { }; - awa-mirage = callPackage ../development/ocaml-modules/awa/mirage.nix { mtime = mtime_1; }; + awa-mirage = callPackage ../development/ocaml-modules/awa/mirage.nix { }; ### B ### @@ -323,11 +323,11 @@ let dns-certify = callPackage ../development/ocaml-modules/dns/certify.nix { }; - dns-cli = callPackage ../development/ocaml-modules/dns/cli.nix { mtime = mtime_1; }; + dns-cli = callPackage ../development/ocaml-modules/dns/cli.nix { }; - dns-client = callPackage ../development/ocaml-modules/dns/client.nix { mtime = mtime_1; }; + dns-client = callPackage ../development/ocaml-modules/dns/client.nix { }; - dns-client-lwt = callPackage ../development/ocaml-modules/dns/client-lwt.nix { mtime = mtime_1; }; + dns-client-lwt = callPackage ../development/ocaml-modules/dns/client-lwt.nix { }; dns-client-mirage = callPackage ../development/ocaml-modules/dns/client-mirage.nix { }; @@ -588,7 +588,6 @@ let git-unix = callPackage ../development/ocaml-modules/git/unix.nix { git-binary = pkgs.git; - mtime = mtime_1; }; github = callPackage ../development/ocaml-modules/github { }; @@ -641,7 +640,7 @@ let happy-eyeballs = callPackage ../development/ocaml-modules/happy-eyeballs { }; - happy-eyeballs-lwt = callPackage ../development/ocaml-modules/happy-eyeballs/lwt.nix { mtime = mtime_1; }; + happy-eyeballs-lwt = callPackage ../development/ocaml-modules/happy-eyeballs/lwt.nix { }; happy-eyeballs-mirage = callPackage ../development/ocaml-modules/happy-eyeballs/mirage.nix { }; @@ -671,7 +670,7 @@ let imagelib = callPackage ../development/ocaml-modules/imagelib { }; - index = callPackage ../development/ocaml-modules/index { mtime = mtime_1; }; + index = callPackage ../development/ocaml-modules/index { }; inifiles = callPackage ../development/ocaml-modules/inifiles { }; @@ -693,29 +692,27 @@ let iri = callPackage ../development/ocaml-modules/iri { }; - irmin = callPackage ../development/ocaml-modules/irmin { mtime = mtime_1; }; + irmin = callPackage ../development/ocaml-modules/irmin { }; irmin-chunk = callPackage ../development/ocaml-modules/irmin/chunk.nix { }; - irmin-containers = callPackage ../development/ocaml-modules/irmin/containers.nix { mtime = mtime_1; }; + irmin-containers = callPackage ../development/ocaml-modules/irmin/containers.nix { }; irmin-fs = callPackage ../development/ocaml-modules/irmin/fs.nix { }; - irmin-git = callPackage ../development/ocaml-modules/irmin/git.nix { mtime = mtime_1; }; + irmin-git = callPackage ../development/ocaml-modules/irmin/git.nix { }; irmin-graphql = callPackage ../development/ocaml-modules/irmin/graphql.nix { }; - irmin-http = callPackage ../development/ocaml-modules/irmin/http.nix { }; - irmin-mirage = callPackage ../development/ocaml-modules/irmin/mirage.nix { }; irmin-mirage-git = callPackage ../development/ocaml-modules/irmin/mirage-git.nix { }; irmin-mirage-graphql = callPackage ../development/ocaml-modules/irmin/mirage-graphql.nix { }; - irmin-pack = callPackage ../development/ocaml-modules/irmin/pack.nix { mtime = mtime_1; }; + irmin-pack = callPackage ../development/ocaml-modules/irmin/pack.nix { }; - irmin-test = callPackage ../development/ocaml-modules/irmin/test.nix { mtime = mtime_1; }; + irmin-test = callPackage ../development/ocaml-modules/irmin/test.nix { }; irmin-tezos = callPackage ../development/ocaml-modules/irmin/tezos.nix { }; @@ -1067,7 +1064,6 @@ let metrics-unix = callPackage ../development/ocaml-modules/metrics/unix.nix { inherit (pkgs) gnuplot; - mtime = mtime_1; }; mew = callPackage ../development/ocaml-modules/mew { }; @@ -1124,7 +1120,7 @@ let mirage-crypto-rng-async = callPackage ../development/ocaml-modules/mirage-crypto/rng-async.nix { }; - mirage-crypto-rng-lwt = callPackage ../development/ocaml-modules/mirage-crypto/rng-lwt.nix { mtime = mtime_1; }; + mirage-crypto-rng-lwt = callPackage ../development/ocaml-modules/mirage-crypto/rng-lwt.nix { }; mirage-crypto-rng-mirage = callPackage ../development/ocaml-modules/mirage-crypto/rng-mirage.nix { }; @@ -1548,7 +1544,7 @@ let prometheus = callPackage ../development/ocaml-modules/prometheus { }; - progress = callPackage ../development/ocaml-modules/progress { mtime = mtime_1; }; + progress = callPackage ../development/ocaml-modules/progress { }; promise_jsoo = callPackage ../development/ocaml-modules/promise_jsoo { };