ocamlPackages.git: 3.5.0 -> 3.9.1 (#188389)
* ocamlPackages.cstruct: 6.0.1 -> 6.1.1 * ocamlPackages.git: 3.5.0 -> 3.9.1 * ocamlPackages.carton: 0.4.3 -> 0.4.4 * ocamlPackages.bigstringaf: 0.7.0 -> 0.9.0 * ocamlPackages.decompress: 1.4.2 -> 1.5.1 * ocamlPackages.repr: 0.5.0 -> 0.6.0 * ocamlPackages.irmin: 2.9.1 -> 3.4.1 * ligo: 0.36.0 -> 0.47.0 ocamlPackages.ringo: 0.5 → 0.9 ocamlPackages.data-encoding: 0.4.0 → 0.5.3 ocamlPackages.bls12-381: 1.1.0 -> 3.0.0 Co-authored-by: bezmuth <benkel97@protonmail.com>
This commit is contained in:
Ulrik Strid
GitHub
parent
4b02f74d3c
commit
aee04b1bed
46 changed files with 408 additions and 357 deletions
|
|
@ -3,27 +3,27 @@
|
|||
, git
|
||||
, coq
|
||||
, cacert
|
||||
, ocaml-crunch
|
||||
}:
|
||||
|
||||
coq.ocamlPackages.buildDunePackage rec {
|
||||
pname = "ligo";
|
||||
version = "0.36.0";
|
||||
version = "0.47.0";
|
||||
src = fetchFromGitLab {
|
||||
owner = "ligolang";
|
||||
repo = "ligo";
|
||||
rev = version;
|
||||
sha256 = "0zx8ai79ha3npm3aybzgisil27v9i052cqdllfri0fsc67dig78b";
|
||||
sha256 = "sha256-VJs0pKA99mZXhipK1bSAZmgAHvYbGbjxdI2XyJYjSm0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# The build picks this up for ligo --version
|
||||
LIGO_VERSION = version;
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
ocaml-crunch
|
||||
git
|
||||
coq
|
||||
coq.ocamlPackages.menhir
|
||||
|
|
@ -49,6 +49,11 @@ coq.ocamlPackages.buildDunePackage rec {
|
|||
core_unix
|
||||
pprint
|
||||
linenoise
|
||||
dune-configurator
|
||||
ctypes_stubs_js
|
||||
crunch
|
||||
zarith_stubs_js
|
||||
pure-splitmix
|
||||
|
||||
# Test helpers deps
|
||||
qcheck
|
||||
|
|
@ -61,7 +66,7 @@ coq.ocamlPackages.buildDunePackage rec {
|
|||
hacl-star-raw
|
||||
lwt-canceler
|
||||
ipaddr
|
||||
bls12-381-unix
|
||||
bls12-381
|
||||
bls12-381-legacy
|
||||
ptime
|
||||
mtime
|
||||
|
|
|
|||
|
|
@ -1,23 +1,40 @@
|
|||
From 6926fed076c2f5aa3282dbca10538d156c045c6f Mon Sep 17 00:00:00 2001
|
||||
From: bezmuth <benkel97@protonmail.com>
|
||||
Date: Wed, 3 Aug 2022 15:53:10 +0100
|
||||
Subject: [PATCH] Compat with core v0.15.0
|
||||
|
||||
---
|
||||
ligo.opam | 4 +++-
|
||||
ligo.opam.locked | 5 +++--
|
||||
src/bin/cli.ml | 4 ++--
|
||||
src/bin/dune | 4 +++-
|
||||
src/main/helpers/cli_helpers.ml | 4 ++--
|
||||
src/main/interpreter/dune | 2 +-
|
||||
src/main/interpreter/interpreter.ml | 2 ++
|
||||
vendors/ligo-utils/simple-utils/dune | 1 +
|
||||
vendors/ligo-utils/simple-utils/snippet.ml | 2 +-
|
||||
9 files changed, 18 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/ligo.opam b/ligo.opam
|
||||
index d561c74d1..3a8d34feb 100644
|
||||
index 47513217f..073f68ff5 100644
|
||||
--- a/ligo.opam
|
||||
+++ b/ligo.opam
|
||||
@@ -10,7 +10,9 @@ license: "MIT"
|
||||
# If you change the dependencies, run `opam lock` in the root
|
||||
depends: [
|
||||
# Jane Street Core
|
||||
- "core"
|
||||
+ "core" { >= "v0.14.0" & < "v0.16.0" }
|
||||
+ "core_kernel" { >= "v0.14.0" & "v0.16.0" }
|
||||
+ "core_unix" { >= "v0.14.0" & "v0.16.0" }
|
||||
- "core" {= "v0.14.1"}
|
||||
+ "core" {>= "v0.14.1" & < "v0.16.0"}
|
||||
+ "core_kernel" { >= "v0.14.1" & "v0.16.0"}
|
||||
+ "core_unix" { >= "v0.14.1" & "v0.16.0"}
|
||||
# Tooling
|
||||
"odoc" { build }
|
||||
"ocamlfind" { build }
|
||||
diff --git a/ligo.opam.locked b/ligo.opam.locked
|
||||
index b4501cc76..c8ed8a41f 100644
|
||||
index fd6fccf03..458e11791 100644
|
||||
--- a/ligo.opam.locked
|
||||
+++ b/ligo.opam.locked
|
||||
@@ -50,8 +50,9 @@ depends: [
|
||||
@@ -47,8 +47,9 @@ depends: [
|
||||
"conf-rust" {= "0.1"}
|
||||
"conf-which" {= "1"}
|
||||
"coq" {= "8.13.2"}
|
||||
|
|
@ -28,12 +45,12 @@ index b4501cc76..c8ed8a41f 100644
|
|||
+ "core_unix" {= "v0.15.0"}
|
||||
"cppo" {= "1.6.8"}
|
||||
"csexp" {= "1.5.1"}
|
||||
"cstruct" {= "6.0.1"}
|
||||
"cstruct" {= "6.1.0"}
|
||||
diff --git a/src/bin/cli.ml b/src/bin/cli.ml
|
||||
index a6fc13e0d..ef5177868 100644
|
||||
index dcaa85621..e411d8f32 100644
|
||||
--- a/src/bin/cli.ml
|
||||
+++ b/src/bin/cli.ml
|
||||
@@ -12,7 +12,7 @@ let entry_point =
|
||||
@@ -14,7 +14,7 @@ let entry_point =
|
||||
let source_file =
|
||||
let name = "SOURCE_FILE" in
|
||||
let _doc = "the path to the smart contract file." in
|
||||
|
|
@ -42,7 +59,7 @@ index a6fc13e0d..ef5177868 100644
|
|||
|
||||
let package_name =
|
||||
let name = "PACKAGE_NAME" in
|
||||
@@ -662,7 +662,7 @@ let main = Command.group ~preserve_subcommand_order:() ~summary:"the LigoLANG co
|
||||
@@ -783,7 +783,7 @@ let main = Command.group ~preserve_subcommand_order:() ~summary:"The LigoLANG co
|
||||
]
|
||||
|
||||
let run ?argv () =
|
||||
|
|
@ -51,27 +68,8 @@ index a6fc13e0d..ef5177868 100644
|
|||
(* Effect to error code *)
|
||||
match !return with
|
||||
Done -> 0;
|
||||
@@ -677,4 +677,3 @@ let run ?argv () =
|
||||
match exn with
|
||||
| Failure msg -> message msg
|
||||
| exn -> message (Exn.to_string exn)
|
||||
-
|
||||
diff --git a/src/bin/cli_helpers.ml b/src/bin/cli_helpers.ml
|
||||
index b64a17d53..8c4c43dde 100644
|
||||
--- a/src/bin/cli_helpers.ml
|
||||
+++ b/src/bin/cli_helpers.ml
|
||||
@@ -66,7 +66,7 @@ let run_command (cmd : command) =
|
||||
(fun p -> Lwt.map
|
||||
(fun status ->
|
||||
match status with
|
||||
- Caml.Unix.WEXITED 0 -> Ok ()
|
||||
+ Caml_unix.WEXITED 0 -> Ok ()
|
||||
| _ -> Error ("unknown error"))
|
||||
p#status) in
|
||||
Lwt_main.run status
|
||||
\ No newline at end of file
|
||||
diff --git a/src/bin/dune b/src/bin/dune
|
||||
index 295c056f3..08d980439 100644
|
||||
index 03e5f17b5..74340ae9d 100644
|
||||
--- a/src/bin/dune
|
||||
+++ b/src/bin/dune
|
||||
@@ -11,7 +11,9 @@
|
||||
|
|
@ -84,31 +82,47 @@ index 295c056f3..08d980439 100644
|
|||
+ core_unix.filename_unix)
|
||||
(modules cli version))
|
||||
|
||||
(library
|
||||
|
||||
diff --git a/src/main/helpers/cli_helpers.ml b/src/main/helpers/cli_helpers.ml
|
||||
index 3d09ee6b8..585cca6fa 100644
|
||||
--- a/src/main/helpers/cli_helpers.ml
|
||||
+++ b/src/main/helpers/cli_helpers.ml
|
||||
@@ -71,7 +71,7 @@ let run_command (cmd : command) =
|
||||
(fun p -> Lwt.map
|
||||
(fun status ->
|
||||
match status with
|
||||
- Caml.Unix.WEXITED 0 -> Ok ()
|
||||
+ Caml_unix.WEXITED 0 -> Ok ()
|
||||
| _ -> Error ("unknown error"))
|
||||
p#status) in
|
||||
- Lwt_main.run status
|
||||
\ No newline at end of file
|
||||
+ Lwt_main.run status
|
||||
diff --git a/src/main/interpreter/dune b/src/main/interpreter/dune
|
||||
index c55e24a88..f9762a297 100644
|
||||
index 6ccc74ff0..7d38bb822 100644
|
||||
--- a/src/main/interpreter/dune
|
||||
+++ b/src/main/interpreter/dune
|
||||
@@ -4,4 +4,4 @@
|
||||
(instrumentation
|
||||
(backend bisect_ppx))
|
||||
(libraries tezos-011-PtHangz2-test-helpers ast_aggregated ligo_interpreter
|
||||
- main_errors ligo_compile build fuzz ligo_run self_ast_typed))
|
||||
+ main_errors ligo_compile build fuzz ligo_run self_ast_typed core_unix.sys_unix))
|
||||
(libraries tezos-013-PtJakart-test-helpers ast_aggregated ligo_interpreter
|
||||
- main_errors ligo_compile build fuzz ligo_run self_ast_typed bls12-381))
|
||||
+ main_errors ligo_compile build fuzz ligo_run self_ast_typed bls12-381 core_unix.sys_unix))
|
||||
diff --git a/src/main/interpreter/interpreter.ml b/src/main/interpreter/interpreter.ml
|
||||
index b0379029c..530e08c3a 100644
|
||||
index 0f76a286c..d9a389a6b 100644
|
||||
--- a/src/main/interpreter/interpreter.ml
|
||||
+++ b/src/main/interpreter/interpreter.ml
|
||||
@@ -2,6 +2,7 @@ open Simple_utils.Trace
|
||||
open Simple_utils
|
||||
@@ -3,6 +3,8 @@ open Simple_utils
|
||||
open Ligo_interpreter.Types
|
||||
open Ligo_interpreter.Combinators
|
||||
+module Sys = Sys_unix
|
||||
|
||||
+module Sys = Sys_unix
|
||||
+
|
||||
module AST = Ast_aggregated
|
||||
|
||||
include AST.Types
|
||||
diff --git a/vendors/ligo-utils/simple-utils/dune b/vendors/ligo-utils/simple-utils/dune
|
||||
index ca9f2bf5c..62c39087b 100644
|
||||
index becca2f86..a890dbf62 100644
|
||||
--- a/vendors/ligo-utils/simple-utils/dune
|
||||
+++ b/vendors/ligo-utils/simple-utils/dune
|
||||
@@ -6,6 +6,7 @@
|
||||
|
|
@ -132,3 +146,6 @@ index 658f115f2..f23000590 100644
|
|||
let start = l#start#line in
|
||||
let start_column = l#start#offset `Byte in
|
||||
let stop = l#stop#line in
|
||||
--
|
||||
2.36.1
|
||||
|
||||
|
|
|
|||
|
|
@ -2,17 +2,15 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "bigstringaf";
|
||||
version = "0.7.0";
|
||||
version = "0.9.0";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimumOCamlVersion = "4.03";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inhabitedtype";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1q1sqxzdnlrpl95ccrhl7lwy3zswgd9rbn19ildclh0lyi2vazbj";
|
||||
sha256 = "sha256-HXPjnE56auy2MI6HV2XuBX/VeqsO50HFzTul17lKEqE=";
|
||||
};
|
||||
|
||||
# This currently fails with dune
|
||||
|
|
@ -20,8 +18,7 @@ buildDunePackage rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
checkInputs = [ alcotest ];
|
||||
propagatedBuildInputs = [ bigarray-compat ];
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.08";
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Bigstring intrinsics and fast blits based on memcpy/memmove";
|
||||
|
|
|
|||
|
|
@ -1,14 +1,17 @@
|
|||
{ lib, buildDunePackage, fetchFromGitLab, ff-sig, zarith }:
|
||||
{ lib, buildDunePackage, fetchFromGitLab, ff-sig, zarith
|
||||
, zarith_stubs_js, integers_stubs_js, integers, hex
|
||||
, ff-pbt, bisect_ppx, alcotest
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "bls12-381";
|
||||
version = "1.1.0";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "dannywillems";
|
||||
repo = "ocaml-bls12-381";
|
||||
rev = "22247018c0651ea62ae898c8ffcc388cc73f758f";
|
||||
sha256 = "ku6Rc+/lwFDoHTZTxgkhiF+kLkagi7944ntcu9vXWgI=";
|
||||
rev = "4bbc7818e9ccd025c5e32006f8a9de370739bc43";
|
||||
sha256 = "/Rw0mQvTfHyPqosWFPv+1FoY5Dwuwv9mB8UYjjHxodE=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
|
|
@ -18,6 +21,16 @@ buildDunePackage rec {
|
|||
propagatedBuildInputs = [
|
||||
ff-sig
|
||||
zarith
|
||||
zarith_stubs_js
|
||||
integers_stubs_js
|
||||
integers
|
||||
hex
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
ff-pbt
|
||||
bisect_ppx
|
||||
alcotest
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
{ lib
|
||||
, buildDunePackage
|
||||
, bls12-381
|
||||
, hex
|
||||
, integers
|
||||
, zarith
|
||||
, alcotest
|
||||
, bisect_ppx
|
||||
, ff-pbt
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "bls12-381-unix";
|
||||
|
||||
inherit (bls12-381) version src useDune2 doCheck;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bls12-381
|
||||
hex
|
||||
integers
|
||||
zarith
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
alcotest
|
||||
bisect_ppx
|
||||
ff-pbt
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "UNIX version of BLS12-381 primitives implementing the virtual package bls12-381";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,20 +1,19 @@
|
|||
{ lib, buildDunePackage, fetchurl
|
||||
, ke, duff, decompress, cstruct, optint, bigstringaf, stdlib-shims
|
||||
, bigarray-compat, checkseum, logs, psq, fmt
|
||||
, result, rresult, fpath, base64, bos, digestif, mmap, alcotest
|
||||
, ke, duff, decompress, cstruct, optint, bigstringaf
|
||||
, checkseum, logs, psq, fmt
|
||||
, result, rresult, fpath, base64, bos, digestif, alcotest
|
||||
, crowbar, alcotest-lwt, lwt, findlib, mirage-flow, cmdliner, hxd
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "carton";
|
||||
version = "0.4.3";
|
||||
version = "0.4.4";
|
||||
|
||||
useDune2 = true;
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz";
|
||||
sha256 = "sha256:0qz9ds5761wx4m7ly3av843b6dii7lmjpx2nnyijv8rm8aw95jgr";
|
||||
url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/git-${pname}-v${version}.tbz";
|
||||
sha256 = "sha256-7mgCgu87Cn4XhjEhonlz9lhgTw0Cu5hnxNJ1wXr+Qhw=";
|
||||
};
|
||||
|
||||
# remove changelogs for mimic and the git* packages
|
||||
|
|
@ -25,7 +24,6 @@ buildDunePackage rec {
|
|||
buildInputs = [
|
||||
cmdliner
|
||||
digestif
|
||||
mmap
|
||||
result
|
||||
rresult
|
||||
fpath
|
||||
|
|
@ -39,8 +37,6 @@ buildDunePackage rec {
|
|||
cstruct
|
||||
optint
|
||||
bigstringaf
|
||||
stdlib-shims
|
||||
bigarray-compat
|
||||
checkseum
|
||||
logs
|
||||
psq
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
buildDunePackage {
|
||||
pname = "carton-git";
|
||||
|
||||
inherit (carton) version src useDune2 postPatch;
|
||||
inherit (carton) version src postPatch;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
carton
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
buildDunePackage {
|
||||
pname = "carton-lwt";
|
||||
|
||||
inherit (carton) version src useDune2 postPatch;
|
||||
inherit (carton) version src postPatch;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
carton
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
{ lib, buildDunePackage, cstruct, async_unix }:
|
||||
{ lib, buildDunePackage, cstruct, async_unix, async, core }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "cstruct-async";
|
||||
inherit (cstruct) src version meta useDune2;
|
||||
inherit (cstruct) src version meta;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
async_unix
|
||||
async
|
||||
cstruct
|
||||
core
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,23 +1,20 @@
|
|||
{ lib, fetchurl, buildDunePackage, bigarray-compat, alcotest, ocaml }:
|
||||
{ lib, fetchurl, buildDunePackage, fmt, alcotest, crowbar }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "cstruct";
|
||||
version = "6.0.1";
|
||||
version = "6.1.1";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimumOCamlVersion = "4.03";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-v${version}.tbz";
|
||||
sha256 = "4a67bb8f042753453c59eabf0e47865631253ba694091ce6062aac05d47a9bed";
|
||||
url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-${version}.tbz";
|
||||
sha256 = "sha256-G3T5hw9qfuYAiSRZBxbdUzpyijyhC7GNqf6ovkZ/UY0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ bigarray-compat ];
|
||||
buildInputs = [ fmt ];
|
||||
|
||||
# alcotest isn't available for OCaml < 4.08 due to fmt
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.08";
|
||||
checkInputs = [ alcotest ];
|
||||
doCheck = true;
|
||||
checkInputs = [ alcotest crowbar ];
|
||||
|
||||
meta = {
|
||||
description = "Access C-like structures directly from OCaml";
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ if lib.versionOlder (cstruct.version or "1") "3"
|
|||
then cstruct
|
||||
else
|
||||
|
||||
buildDunePackage {
|
||||
pname = "cstruct-lwt";
|
||||
inherit (cstruct) version src useDune2 meta;
|
||||
buildDunePackage {
|
||||
pname = "cstruct-lwt";
|
||||
inherit (cstruct) version src meta;
|
||||
|
||||
minimumOCamlVersion = "4.03";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
propagatedBuildInputs = [ cstruct lwt ];
|
||||
}
|
||||
propagatedBuildInputs = [ cstruct lwt ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ else
|
|||
|
||||
buildDunePackage {
|
||||
pname = "ppx_cstruct";
|
||||
inherit (cstruct) version src useDune2 meta;
|
||||
inherit (cstruct) version src meta;
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
|
|
|
|||
|
|
@ -6,12 +6,11 @@ else
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "cstruct-sexp";
|
||||
inherit (cstruct) version src useDune2 meta;
|
||||
inherit (cstruct) version src meta;
|
||||
|
||||
minimumOCamlVersion = "4.03";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
# alcotest is only available on OCaml >= 4.08 due to fmt
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.08";
|
||||
doCheck = true;
|
||||
checkInputs = [ alcotest ];
|
||||
|
||||
propagatedBuildInputs = [ cstruct sexplib ];
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ if lib.versionOlder (cstruct.version or "1") "3"
|
|||
then cstruct
|
||||
else
|
||||
|
||||
buildDunePackage {
|
||||
pname = "cstruct-unix";
|
||||
inherit (cstruct) version src useDune2 meta;
|
||||
buildDunePackage {
|
||||
pname = "cstruct-unix";
|
||||
inherit (cstruct) version src meta;
|
||||
|
||||
minimumOCamlVersion = "4.06";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
propagatedBuildInputs = [ cstruct ];
|
||||
}
|
||||
propagatedBuildInputs = [ cstruct ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,30 +1,36 @@
|
|||
{ lib
|
||||
, fetchFromGitLab
|
||||
, buildDunePackage
|
||||
, ppx_hash
|
||||
, either
|
||||
, ezjsonm
|
||||
, zarith
|
||||
, zarith_stubs_js
|
||||
, hex
|
||||
, json-data-encoding
|
||||
, json-data-encoding-bson
|
||||
, alcotest
|
||||
, crowbar
|
||||
, ppx_expect
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "data-encoding";
|
||||
version = "0.4.0";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "nomadic-labs";
|
||||
repo = "data-encoding";
|
||||
rev = "v0.4";
|
||||
sha256 = "1f88l9azpfk730hps5v6zlg4yyyyhj1gl27qy3cbbkzjc82d2rhx";
|
||||
rev = "v0.5.3";
|
||||
sha256 = "sha256-HMNpjh5x7vU/kXQNRjJtOvShEENoNuxjNNPBJfm+Rhg=";
|
||||
};
|
||||
useDune2 = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
either
|
||||
ezjsonm
|
||||
ppx_hash
|
||||
zarith
|
||||
zarith_stubs_js
|
||||
hex
|
||||
json-data-encoding
|
||||
json-data-encoding-bson
|
||||
|
|
@ -33,6 +39,7 @@ buildDunePackage {
|
|||
checkInputs = [
|
||||
alcotest
|
||||
crowbar
|
||||
ppx_expect
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -1,25 +1,23 @@
|
|||
{ lib, fetchurl, buildDunePackage, ocaml
|
||||
, checkseum, bigarray-compat, optint, cmdliner
|
||||
, bigstringaf, alcotest, camlzip, base64, ctypes, fmt
|
||||
{ lib, fetchurl, buildDunePackage
|
||||
, checkseum, optint, cmdliner
|
||||
, bigstringaf, alcotest, camlzip, base64, ctypes, fmt, crowbar, rresult
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
version = "1.4.2";
|
||||
pname = "decompress";
|
||||
version = "1.5.1";
|
||||
|
||||
minimumOCamlVersion = "4.07";
|
||||
|
||||
useDune2 = true;
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
|
||||
sha256 = "822f125b46c87f4a902c334db8c86d4d5f33ebe978e93c40351a4d3269b95225";
|
||||
url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-${version}.tbz";
|
||||
sha256 = "sha256-y/OVojFxhksJQQvvtS38SF7ZnMEQhAtwDey0ISwypP4=";
|
||||
};
|
||||
|
||||
buildInputs = [ cmdliner ];
|
||||
propagatedBuildInputs = [ optint bigarray-compat checkseum ];
|
||||
checkInputs = [ alcotest bigstringaf ctypes fmt camlzip base64 ];
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.08";
|
||||
propagatedBuildInputs = [ optint checkseum ];
|
||||
checkInputs = [ alcotest bigstringaf ctypes fmt camlzip base64 crowbar rresult ];
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Pure OCaml implementation of Zlib";
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
{ buildDunePackage, git, git-cohttp
|
||||
, cohttp-lwt-unix, cohttp-lwt, fmt, lwt, result, rresult, uri
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "git-cohttp-unix";
|
||||
|
||||
inherit (git) version src minimumOCamlVersion useDune2;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
git git-cohttp cohttp-lwt-unix cohttp-lwt fmt lwt result rresult uri
|
||||
];
|
||||
|
||||
meta = git.meta // {
|
||||
description = "A package to use HTTP-based ocaml-git with Unix backend";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
{ buildDunePackage, git
|
||||
, cohttp, cohttp-lwt, fmt, lwt, result, rresult, uri
|
||||
, alcotest, alcotest-lwt, bigstringaf, cstruct, logs
|
||||
, mirage-flow, ke
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "git-cohttp";
|
||||
|
||||
inherit (git) version minimumOCamlVersion src useDune2;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
git cohttp cohttp-lwt fmt lwt result rresult uri
|
||||
];
|
||||
|
||||
meta = git.meta // {
|
||||
description = "A package to use HTTP-based ocaml-git with Unix backend";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,21 +1,20 @@
|
|||
{ stdenv, lib, fetchurl, buildDunePackage
|
||||
, alcotest, mtime, mirage-crypto-rng, tls, git-binary
|
||||
, angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt, checkseum
|
||||
, alcotest, mirage-crypto-rng, git-binary
|
||||
, angstrom, astring, cstruct, decompress, digestif, encore, fmt, checkseum
|
||||
, fpath, ke, logs, lwt, ocamlgraph, uri, rresult, base64, hxd
|
||||
, result, bigstringaf, optint, mirage-flow, domain-name, emile
|
||||
, mimic, carton, carton-lwt, carton-git, ipaddr, psq, crowbar, alcotest-lwt
|
||||
, mimic, carton, carton-lwt, carton-git, ipaddr, psq, crowbar, alcotest-lwt, cmdliner
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "git";
|
||||
version = "3.5.0";
|
||||
version = "3.9.1";
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
useDune2 = true;
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
|
||||
sha256 = "bcd5a0aef9957193cbaeeb17c22201e5ca4e815e67bbc696e88efdb38c25ec03";
|
||||
sha256 = "sha256-OyeMW5gsq4fMEWRmhzPq2qardFZtMjoQk6mMKz5+Ds4=";
|
||||
};
|
||||
|
||||
# remove changelog for the carton package
|
||||
|
|
@ -27,12 +26,12 @@ buildDunePackage rec {
|
|||
base64
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath
|
||||
angstrom astring checkseum cstruct decompress digestif encore fmt fpath
|
||||
ke logs lwt ocamlgraph uri rresult result bigstringaf optint mirage-flow
|
||||
domain-name emile mimic carton carton-lwt carton-git ipaddr psq hxd
|
||||
];
|
||||
checkInputs = [
|
||||
alcotest alcotest-lwt mtime mirage-crypto-rng tls git-binary crowbar
|
||||
alcotest alcotest-lwt mirage-crypto-rng git-binary crowbar cmdliner
|
||||
];
|
||||
doCheck = !stdenv.isAarch64;
|
||||
|
||||
|
|
|
|||
95
pkgs/development/ocaml-modules/git/mirage.nix
Normal file
95
pkgs/development/ocaml-modules/git/mirage.nix
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
{ lib, buildDunePackage
|
||||
, git
|
||||
, mimic
|
||||
, mimic-happy-eyeballs
|
||||
, base64
|
||||
, git-paf
|
||||
, awa
|
||||
, awa-mirage
|
||||
, dns
|
||||
, dns-client
|
||||
, tls
|
||||
, tls-mirage
|
||||
, uri
|
||||
, hex
|
||||
, happy-eyeballs-mirage
|
||||
, happy-eyeballs
|
||||
, ca-certs-nss
|
||||
, mirage-crypto
|
||||
, ptime
|
||||
, x509
|
||||
, cstruct
|
||||
, tcpip
|
||||
, domain-name
|
||||
, fmt
|
||||
, ipaddr
|
||||
, lwt
|
||||
, mirage-clock
|
||||
, mirage-flow
|
||||
, mirage-random
|
||||
, mirage-time
|
||||
, result
|
||||
, rresult
|
||||
, alcotest
|
||||
, alcotest-lwt
|
||||
, bigstringaf
|
||||
, logs
|
||||
, ke
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "git-mirage";
|
||||
|
||||
inherit (git) version src;
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
buildInputs = [
|
||||
dns
|
||||
dns-client
|
||||
happy-eyeballs-mirage
|
||||
ipaddr
|
||||
mirage-random
|
||||
rresult
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
git
|
||||
mimic
|
||||
mimic-happy-eyeballs
|
||||
base64
|
||||
git-paf
|
||||
awa
|
||||
awa-mirage
|
||||
tls
|
||||
tls-mirage
|
||||
uri
|
||||
hex
|
||||
happy-eyeballs
|
||||
ca-certs-nss
|
||||
mirage-crypto
|
||||
ptime
|
||||
x509
|
||||
cstruct
|
||||
tcpip
|
||||
domain-name
|
||||
fmt
|
||||
lwt
|
||||
mirage-clock
|
||||
mirage-flow
|
||||
mirage-time
|
||||
result
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
alcotest
|
||||
alcotest-lwt
|
||||
bigstringaf
|
||||
logs
|
||||
ke
|
||||
];
|
||||
|
||||
meta = git.meta // {
|
||||
description = "A package to use ocaml-git with MirageOS backend";
|
||||
};
|
||||
}
|
||||
|
|
@ -8,7 +8,6 @@
|
|||
, logs
|
||||
, lwt
|
||||
, mirage-clock
|
||||
, mirage-stack
|
||||
, mirage-time
|
||||
, result
|
||||
, rresult
|
||||
|
|
@ -25,7 +24,9 @@
|
|||
buildDunePackage {
|
||||
pname = "git-paf";
|
||||
|
||||
inherit (git) version src minimumOCamlVersion useDune2;
|
||||
inherit (git) version src;
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
git
|
||||
|
|
@ -39,7 +40,6 @@ buildDunePackage {
|
|||
ipaddr
|
||||
logs
|
||||
mirage-clock
|
||||
mirage-stack
|
||||
mirage-time
|
||||
tls
|
||||
uri
|
||||
|
|
|
|||
|
|
@ -1,37 +1,38 @@
|
|||
{ buildDunePackage, git
|
||||
, mmap, rresult, result, bigstringaf
|
||||
, fmt, bos, fpath, uri, digestif, logs, lwt, git-cohttp-unix
|
||||
, rresult, result, bigstringaf
|
||||
, fmt, bos, fpath, uri, digestif, logs, lwt
|
||||
, mirage-clock, mirage-clock-unix, astring, awa, cmdliner
|
||||
, cohttp-lwt-unix, decompress, domain-name, ipaddr, mtime
|
||||
, tcpip, awa-mirage, mirage-flow
|
||||
, decompress, domain-name, ipaddr, mtime
|
||||
, tcpip, awa-mirage, mirage-flow, mirage-unix
|
||||
, alcotest, alcotest-lwt, base64, cstruct
|
||||
, ke, mirage-crypto-rng, ocurl, git-binary
|
||||
, ptime, mimic, ca-certs-nss, tls, tls-mirage
|
||||
, cacert
|
||||
, cacert, happy-eyeballs-lwt, git-mirage
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "git-unix";
|
||||
inherit (git) version src minimumOCamlVersion;
|
||||
inherit (git) version src;
|
||||
|
||||
useDune2 = true;
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
buildInputs = [
|
||||
awa awa-mirage cmdliner git-cohttp-unix
|
||||
mirage-clock mirage-clock-unix tcpip
|
||||
awa awa-mirage cmdliner
|
||||
mirage-clock tcpip
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
mmap rresult result bigstringaf
|
||||
fmt bos fpath uri digestif logs lwt
|
||||
astring cohttp-lwt-unix decompress
|
||||
domain-name ipaddr mtime mirage-flow
|
||||
rresult result bigstringaf
|
||||
fmt bos fpath digestif logs lwt
|
||||
astring decompress
|
||||
domain-name ipaddr mirage-flow mirage-unix
|
||||
cstruct ptime mimic ca-certs-nss
|
||||
tls tls-mirage git
|
||||
tls tls-mirage git happy-eyeballs-lwt
|
||||
git-mirage mirage-clock-unix
|
||||
];
|
||||
checkInputs = [
|
||||
alcotest alcotest-lwt base64 ke
|
||||
mirage-crypto-rng git-binary
|
||||
cohttp-lwt-unix
|
||||
uri mtime
|
||||
cacert # sets up NIX_SSL_CERT_FILE
|
||||
];
|
||||
doCheck = true;
|
||||
|
|
@ -39,7 +40,5 @@ buildDunePackage {
|
|||
meta = {
|
||||
description = "Unix backend for the Git protocol(s)";
|
||||
inherit (git.meta) homepage license maintainers;
|
||||
# Not compatible with cmdliner ≥ 1.1
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, buildDunePackage, irmin, irmin-test, alcotest }:
|
||||
{ lib, buildDunePackage, irmin, irmin-test, fmt, logs, lwt, alcotest }:
|
||||
|
||||
buildDunePackage rec {
|
||||
|
||||
pname = "irmin-chunk";
|
||||
inherit (irmin) version src useDune2;
|
||||
inherit (irmin) version src strictDeps;
|
||||
|
||||
propagatedBuildInputs = [ irmin ];
|
||||
propagatedBuildInputs = [ irmin fmt logs lwt ];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ alcotest irmin-test ];
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
{ buildDunePackage
|
||||
, irmin, irmin-unix, irmin-git, ppx_irmin, lwt, mtime
|
||||
, irmin, irmin-fs, ppx_irmin, lwt, mtime
|
||||
, alcotest, alcotest-lwt, cacert
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "irmin-containers";
|
||||
|
||||
inherit (ppx_irmin) src version useDune2;
|
||||
inherit (ppx_irmin) src version strictDeps;
|
||||
|
||||
nativeBuildInputs = [
|
||||
ppx_irmin
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
irmin irmin-unix irmin-git ppx_irmin lwt mtime
|
||||
irmin irmin-fs ppx_irmin lwt mtime
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -1,33 +1,41 @@
|
|||
{ lib, buildDunePackage
|
||||
, astring, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri
|
||||
, repr, ppx_irmin, bheap, uutf
|
||||
, repr, ppx_irmin, bheap, uutf, mtime, lwt, optint
|
||||
, vector, hex, alcotest, qcheck-alcotest
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "irmin";
|
||||
|
||||
inherit (ppx_irmin) src version;
|
||||
inherit (ppx_irmin) src version strictDeps;
|
||||
|
||||
useDune2 = true;
|
||||
minimumOCamlVersion = "4.08";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
astring
|
||||
bheap
|
||||
digestif
|
||||
fmt
|
||||
jsonm
|
||||
logs
|
||||
ocaml_lwt
|
||||
lwt
|
||||
mtime
|
||||
ocamlgraph
|
||||
uri
|
||||
repr
|
||||
bheap
|
||||
optint
|
||||
ppx_irmin
|
||||
repr
|
||||
uri
|
||||
uutf
|
||||
];
|
||||
|
||||
# circular dependency on irmin-mem
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
vector
|
||||
hex
|
||||
alcotest
|
||||
qcheck-alcotest
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = ppx_irmin.meta // {
|
||||
description = "A distributed database built on the same principles as Git";
|
||||
|
|
|
|||
|
|
@ -1,16 +1,15 @@
|
|||
{ lib, buildDunePackage, irmin, irmin-test }:
|
||||
{ lib, buildDunePackage, irmin, astring, logs, lwt
|
||||
, alcotest, irmin-test, irmin-watcher }:
|
||||
|
||||
buildDunePackage rec {
|
||||
|
||||
pname = "irmin-fs";
|
||||
|
||||
inherit (irmin) version src;
|
||||
inherit (irmin) version src strictDeps;
|
||||
|
||||
propagatedBuildInputs = [ irmin ];
|
||||
propagatedBuildInputs = [ irmin astring logs lwt ];
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
checkInputs = lib.optional doCheck irmin-test;
|
||||
checkInputs = [ alcotest irmin-test irmin-watcher ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
@ -19,5 +18,3 @@ buildDunePackage rec {
|
|||
};
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,15 @@
|
|||
{ lib, buildDunePackage
|
||||
, git, irmin, irmin-test, ppx_irmin, git-cohttp-unix, git-unix
|
||||
, git, irmin, ppx_irmin, git-unix, irmin-watcher
|
||||
, digestif, cstruct, fmt, astring, fpath, logs, lwt, uri
|
||||
, mtime, alcotest, cacert
|
||||
, cohttp-lwt-unix, mimic
|
||||
, irmin-test, mtime, alcotest, cacert
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
|
||||
pname = "irmin-git";
|
||||
|
||||
inherit (irmin) version src;
|
||||
|
||||
useDune2 = true;
|
||||
inherit (irmin) version src strictDeps;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
git
|
||||
|
|
@ -24,9 +23,13 @@ buildDunePackage {
|
|||
logs
|
||||
lwt
|
||||
uri
|
||||
irmin-watcher
|
||||
git-unix
|
||||
mimic
|
||||
cohttp-lwt-unix
|
||||
];
|
||||
|
||||
checkInputs = [ mtime alcotest git-cohttp-unix git-unix irmin-test cacert ];
|
||||
checkInputs = [ mtime alcotest irmin-test cacert ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, buildDunePackage, cohttp-lwt, graphql-cohttp, graphql-lwt, irmin
|
||||
, alcotest, alcotest-lwt, logs, yojson, cohttp-lwt-unix, cacert
|
||||
{ lib, buildDunePackage, cohttp-lwt, cohttp-lwt-unix, graphql-cohttp, graphql-lwt, irmin, git-unix
|
||||
, alcotest, alcotest-lwt, logs, yojson, cacert
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
|
|
@ -8,26 +8,19 @@ buildDunePackage rec {
|
|||
|
||||
inherit (irmin) version src;
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
propagatedBuildInputs = [ cohttp-lwt graphql-cohttp graphql-lwt irmin ];
|
||||
propagatedBuildInputs = [ cohttp-lwt cohttp-lwt-unix graphql-cohttp graphql-lwt irmin git-unix ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkInputs = [
|
||||
alcotest
|
||||
alcotest-lwt
|
||||
logs
|
||||
cohttp-lwt-unix
|
||||
yojson
|
||||
cacert
|
||||
];
|
||||
|
||||
meta = irmin.meta // {
|
||||
description = "GraphQL server for Irmin";
|
||||
broken = true; # Not compatible with graphql 0.14
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib, buildDunePackage, cohttp-lwt, irmin, webmachine
|
||||
, checkseum, git-unix, irmin-git, irmin-test, digestif, git-cohttp-unix
|
||||
{ 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
|
||||
}:
|
||||
|
||||
|
|
@ -7,14 +8,13 @@ buildDunePackage rec {
|
|||
|
||||
pname = "irmin-http";
|
||||
|
||||
inherit (irmin) version src;
|
||||
inherit (irmin) version src strictDeps;
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
propagatedBuildInputs = [ cohttp-lwt irmin webmachine ];
|
||||
propagatedBuildInputs = [ astring cohttp-lwt cohttp-lwt-unix fmt jsonm logs lwt uri irmin webmachine ];
|
||||
|
||||
checkInputs = [
|
||||
digestif checkseum git-cohttp-unix git-unix irmin-git irmin-test cacert
|
||||
digestif git-unix irmin-git irmin-test irmin-fs cacert
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
{ buildDunePackage, irmin, mtime, logs, lwt }:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "irmin-layers";
|
||||
|
||||
inherit (irmin) version src useDune2;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
irmin
|
||||
mtime
|
||||
logs
|
||||
lwt
|
||||
];
|
||||
|
||||
meta = irmin.meta // {
|
||||
description = "Combine different Irmin stores into a single, layered store";
|
||||
};
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
buildDunePackage {
|
||||
pname = "irmin-mirage-git";
|
||||
|
||||
inherit (irmin-mirage) version src useDune2;
|
||||
inherit (irmin-mirage) version src strictDeps;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
irmin-mirage
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
buildDunePackage {
|
||||
pname = "irmin-mirage-graphql";
|
||||
|
||||
inherit (irmin-mirage) version src useDune2;
|
||||
inherit (irmin-mirage) version src strictDeps;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
irmin-mirage
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
buildDunePackage {
|
||||
pname = "irmin-mirage";
|
||||
|
||||
inherit (irmin) version src useDune2;
|
||||
inherit (irmin) version src strictDeps;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
irmin fmt ptime mirage-clock
|
||||
|
|
|
|||
|
|
@ -1,23 +1,22 @@
|
|||
{ lib, buildDunePackage
|
||||
, alcotest-lwt, index, irmin, irmin-layers, irmin-test, ocaml_lwt, fpath, optint
|
||||
, index, ppx_irmin, irmin, optint, fmt, logs, lwt, mtime, cmdliner
|
||||
, alcotest, alcotest-lwt, astring, irmin-test
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
minimumOCamlVersion = "4.02.3";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
pname = "irmin-pack";
|
||||
|
||||
inherit (irmin) version src;
|
||||
inherit (irmin) version src strictDeps;
|
||||
|
||||
useDune2 = true;
|
||||
nativeBuildInputs = [ ppx_irmin ];
|
||||
|
||||
buildInputs = [ fpath ];
|
||||
propagatedBuildInputs = [ index irmin irmin-layers ocaml_lwt optint ];
|
||||
propagatedBuildInputs = [ index irmin optint fmt logs lwt mtime cmdliner ];
|
||||
|
||||
checkInputs = [ alcotest-lwt irmin-test ];
|
||||
checkInputs = [ astring alcotest alcotest-lwt irmin-test ];
|
||||
|
||||
# Check fails with cmdliner ≥ 1.1
|
||||
doCheck = false;
|
||||
doCheck = true;
|
||||
|
||||
meta = irmin.meta // {
|
||||
description = "Irmin backend which stores values in a pack file";
|
||||
|
|
|
|||
|
|
@ -1,21 +1,22 @@
|
|||
{ lib, fetchurl, buildDunePackage, ppxlib, ppx_repr }:
|
||||
{ lib, fetchurl, buildDunePackage, ppxlib, ppx_repr, logs }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "ppx_irmin";
|
||||
version = "2.9.1";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz";
|
||||
sha256 = "10r7j4z4gx3dp48lavjhpb1cam27n6ch751amslb0drphy53l00n";
|
||||
sha256 = "sha256-kig2EWww7GgGijhpSgm7pSHPR+3Q5K5E4Ha5tJY9oYA=";
|
||||
};
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
minimalOCamlVersion = "4.10";
|
||||
|
||||
useDune2 = true;
|
||||
strictDeps = false; # We must provide checkInputs as buildInputs because dune builds tests at build time
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ppx_repr
|
||||
ppxlib
|
||||
logs
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,19 +1,34 @@
|
|||
{ buildDunePackage
|
||||
, alcotest, cmdliner, irmin, metrics-unix, mtime, irmin-layers
|
||||
{ buildDunePackage, irmin, ppx_irmin, mtime, astring, fmt, jsonm, logs, lwt
|
||||
, metrics-unix, ocaml-syntax-shims, cmdliner, metrics, alcotest-lwt
|
||||
, hex, vector
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
|
||||
pname = "irmin-test";
|
||||
|
||||
inherit (irmin) version src;
|
||||
inherit (irmin) version src strictDeps;
|
||||
|
||||
useDune2 = true;
|
||||
nativeBuildInputs = [ ppx_irmin ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
alcotest cmdliner irmin metrics-unix mtime irmin-layers
|
||||
irmin
|
||||
ppx_irmin
|
||||
alcotest-lwt
|
||||
mtime
|
||||
astring
|
||||
fmt
|
||||
jsonm
|
||||
logs
|
||||
lwt
|
||||
metrics-unix
|
||||
ocaml-syntax-shims
|
||||
cmdliner
|
||||
metrics
|
||||
];
|
||||
|
||||
checkInputs = [ hex vector ];
|
||||
|
||||
meta = irmin.meta // {
|
||||
description = "Irmin test suite";
|
||||
};
|
||||
|
|
|
|||
33
pkgs/development/ocaml-modules/irmin/tezos.nix
Normal file
33
pkgs/development/ocaml-modules/irmin/tezos.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ lib, buildDunePackage
|
||||
, irmin, irmin-pack, ppx_irmin, digestif, cmdliner, fmt, yojson, tezos-base58
|
||||
, alcotest, hex, irmin-test, fpath
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "irmin-tezos";
|
||||
|
||||
inherit (irmin) version src strictDeps;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
irmin
|
||||
irmin-pack
|
||||
ppx_irmin
|
||||
digestif
|
||||
fmt
|
||||
tezos-base58
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cmdliner
|
||||
yojson
|
||||
];
|
||||
|
||||
checkInputs = [ alcotest hex irmin-test fpath ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = irmin.meta // {
|
||||
description = "Irmin implementation of the Tezos context hash specification";
|
||||
maintainers = [ lib.maintainers.ulrikstrid ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
{ lib, buildDunePackage
|
||||
, checkseum, cmdliner, git-unix, git-cohttp-unix, yaml, fpath
|
||||
, irmin, irmin-fs, irmin-git, irmin-graphql, irmin-http
|
||||
, irmin-pack, irmin-watcher, irmin-test, cacert
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
|
||||
pname = "irmin-unix";
|
||||
|
||||
inherit (irmin) version src;
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
checkseum cmdliner git-unix yaml fpath
|
||||
irmin irmin-fs irmin-git irmin-graphql irmin-http
|
||||
irmin-pack irmin-watcher git-cohttp-unix
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
irmin-test cacert
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = irmin.meta // {
|
||||
description = "Unix backends for Irmin";
|
||||
mainProgram = "irmin";
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -9,7 +9,7 @@ buildDunePackage {
|
|||
|
||||
strictDeps = true;
|
||||
|
||||
buildInputs = [
|
||||
propagatedBuildInputs = [
|
||||
mimic
|
||||
happy-eyeballs-mirage
|
||||
];
|
||||
|
|
|
|||
|
|
@ -10,6 +10,11 @@ buildDunePackage rec {
|
|||
sha256 = "cc0e814fd54efe7a5b7a8c5eb1c04e2dece751b7d8dee2d95908a0768896e8af";
|
||||
};
|
||||
|
||||
# Make compatible with cstruct 6.1.0
|
||||
postPatch = ''
|
||||
substituteInPlace src/ramdisk.ml --replace 'Cstruct.len' 'Cstruct.length'
|
||||
'';
|
||||
|
||||
minimalOCamlVersion = "4.06";
|
||||
|
||||
propagatedBuildInputs = [ io-page mirage-block ];
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
{ lib, buildDunePackage, fetchurl, base64, either, fmt, jsonm, uutf, optint }:
|
||||
{ lib, buildDunePackage, fetchFromGitHub, base64, either, fmt, jsonm, uutf, optint }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "repr";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/${pname}/releases/download/${version}/${pname}-fuzz-${version}.tbz";
|
||||
sha256 = "1y9qnbaxcyxz7bzkkq5lwjrv715mvp2vphzcrd8vbvjhp7df3l1f";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mirage";
|
||||
repo = "repr";
|
||||
rev = version;
|
||||
sha256 = "sha256-jF8KmaG07CT26O/1ANc6s1yHFJqhXDtd0jgTA04tIgw=";
|
||||
};
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
useDune2 = true;
|
||||
minimalOCamlVersion = "4.08";
|
||||
strictDeps = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
base64
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
buildDunePackage {
|
||||
pname = "ppx_repr";
|
||||
|
||||
inherit (repr) src version useDune2;
|
||||
inherit (repr) src version strictDeps;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ppx_deriving
|
||||
|
|
|
|||
|
|
@ -2,19 +2,17 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "ringo";
|
||||
version = "0.5";
|
||||
version = "0.9";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "nomadic-labs";
|
||||
repo = "ringo";
|
||||
rev = "v${version}";
|
||||
sha256 = "1zwha0ycv3rm3qnw7nkg2m08ibx39yxnx5fan4lnn82b0pdasjag";
|
||||
sha256 = "sha256-lPb+WrRsmtOow9BX9FW4HoILlsTuuMrVlK0XPcXWZ9U=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.05";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# If we just run the test as is it will try to test ringo-lwt
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildDunePackage {
|
||||
pname = "ringo-lwt";
|
||||
inherit (ringo) version src doCheck useDune2;
|
||||
inherit (ringo) version src doCheck;
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildDunePackage, irmin-chunk, irmin-git, irmin-unix
|
||||
{ lib, buildDunePackage, irmin-chunk, irmin-git
|
||||
, mirage-block-ramdisk, mirage-block-unix, wodan }:
|
||||
|
||||
buildDunePackage rec {
|
||||
|
|
@ -9,7 +9,6 @@ buildDunePackage rec {
|
|||
/* io-page-unix */ # No longer available in nixpkgs
|
||||
irmin-chunk
|
||||
irmin-git
|
||||
irmin-unix
|
||||
mirage-block-ramdisk
|
||||
mirage-block-unix
|
||||
wodan
|
||||
|
|
|
|||
|
|
@ -92,7 +92,6 @@ let
|
|||
|
||||
bls12-381 = callPackage ../development/ocaml-modules/bls12-381 { };
|
||||
bls12-381-gen = callPackage ../development/ocaml-modules/bls12-381/gen.nix { };
|
||||
bls12-381-unix = callPackage ../development/ocaml-modules/bls12-381/unix.nix { };
|
||||
bls12-381-legacy = callPackage ../development/ocaml-modules/bls12-381/legacy.nix { };
|
||||
|
||||
bos = callPackage ../development/ocaml-modules/bos { };
|
||||
|
|
@ -578,9 +577,7 @@ let
|
|||
git-binary = pkgs.git;
|
||||
};
|
||||
|
||||
git-cohttp = callPackage ../development/ocaml-modules/git/cohttp.nix { };
|
||||
|
||||
git-cohttp-unix = callPackage ../development/ocaml-modules/git/cohttp-unix.nix { };
|
||||
git-mirage = callPackage ../development/ocaml-modules/git/mirage.nix { };
|
||||
|
||||
git-paf = callPackage ../development/ocaml-modules/git/paf.nix { };
|
||||
|
||||
|
|
@ -629,8 +626,6 @@ let
|
|||
|
||||
irmin-http = callPackage ../development/ocaml-modules/irmin/http.nix { };
|
||||
|
||||
irmin-layers = callPackage ../development/ocaml-modules/irmin/layers.nix { };
|
||||
|
||||
irmin-mirage = callPackage ../development/ocaml-modules/irmin/mirage.nix { };
|
||||
|
||||
irmin-mirage-git = callPackage ../development/ocaml-modules/irmin/mirage-git.nix { };
|
||||
|
|
@ -641,7 +636,7 @@ let
|
|||
|
||||
irmin-test = callPackage ../development/ocaml-modules/irmin/test.nix { };
|
||||
|
||||
irmin-unix = callPackage ../development/ocaml-modules/irmin/unix.nix { };
|
||||
irmin-tezos = callPackage ../development/ocaml-modules/irmin/tezos.nix { };
|
||||
|
||||
irmin-watcher = callPackage ../development/ocaml-modules/irmin-watcher { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue