ligo: 1.4.0 → 1.6.0
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
This commit is contained in:
Vincent Laporte
parent
ecb5ef436b
commit
4922992a04
23 changed files with 55 additions and 112 deletions
|
|
@ -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
|
||||
];
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
buildDunePackage rec {
|
||||
|
||||
pname = "irmin-chunk";
|
||||
inherit (irmin) version src strictDeps;
|
||||
inherit (irmin) version src;
|
||||
|
||||
propagatedBuildInputs = [ irmin fmt logs lwt ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
buildDunePackage {
|
||||
pname = "irmin-containers";
|
||||
|
||||
inherit (ppx_irmin) src version strictDeps;
|
||||
inherit (ppx_irmin) src version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
ppx_irmin
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
buildDunePackage {
|
||||
pname = "irmin";
|
||||
|
||||
inherit (ppx_irmin) src version strictDeps;
|
||||
inherit (ppx_irmin) src version;
|
||||
|
||||
minimalOCamlVersion = "4.10";
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ buildDunePackage rec {
|
|||
|
||||
pname = "irmin-fs";
|
||||
|
||||
inherit (irmin) version src strictDeps;
|
||||
inherit (irmin) version src;
|
||||
|
||||
propagatedBuildInputs = [ irmin astring logs lwt ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ buildDunePackage {
|
|||
|
||||
pname = "irmin-git";
|
||||
|
||||
inherit (irmin) version src strictDeps;
|
||||
inherit (irmin) version src;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
git
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
buildDunePackage {
|
||||
pname = "irmin-mirage-git";
|
||||
|
||||
inherit (irmin-mirage) version src strictDeps;
|
||||
inherit (irmin-mirage) version src;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
irmin-mirage
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
buildDunePackage {
|
||||
pname = "irmin-mirage-graphql";
|
||||
|
||||
inherit (irmin-mirage) version src strictDeps;
|
||||
inherit (irmin-mirage) version src;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
irmin-mirage
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
buildDunePackage {
|
||||
pname = "irmin-mirage";
|
||||
|
||||
inherit (irmin) version src strictDeps;
|
||||
inherit (irmin) version src;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
irmin fmt ptime mirage-clock
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ buildDunePackage rec {
|
|||
|
||||
pname = "irmin-pack";
|
||||
|
||||
inherit (irmin) version src strictDeps;
|
||||
inherit (irmin) version src;
|
||||
|
||||
nativeBuildInputs = [ ppx_irmin ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
buildDunePackage rec {
|
||||
pname = "irmin-tezos";
|
||||
|
||||
inherit (irmin) version src strictDeps;
|
||||
inherit (irmin) version src;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
irmin
|
||||
|
|
|
|||
|
|
@ -5,8 +5,6 @@ buildDunePackage {
|
|||
|
||||
inherit (json-data-encoding) version src doCheck;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
json-data-encoding
|
||||
ocplib-endian
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ buildDunePackage rec {
|
|||
pname = "progress";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
inherit (terminal) version src;
|
||||
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue