diff options
author | Ulrik Strid <ulrik.strid@outlook.com> | 2023-06-20 14:03:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-20 14:03:59 +0200 |
commit | 83fe300f2b0f874f9aff8da48766a8e835931c48 (patch) | |
tree | f4c24a68504b8de28efd773a4e976d67803da979 /pkgs/development/ocaml-modules | |
parent | 50847470ba43e608d4b77c406ca26313229a49a0 (diff) | |
parent | 2278b4b61b2d5e986294d3bd370f0fc57a83d583 (diff) | |
download | nixlib-83fe300f2b0f874f9aff8da48766a8e835931c48.tar nixlib-83fe300f2b0f874f9aff8da48766a8e835931c48.tar.gz nixlib-83fe300f2b0f874f9aff8da48766a8e835931c48.tar.bz2 nixlib-83fe300f2b0f874f9aff8da48766a8e835931c48.tar.lz nixlib-83fe300f2b0f874f9aff8da48766a8e835931c48.tar.xz nixlib-83fe300f2b0f874f9aff8da48766a8e835931c48.tar.zst nixlib-83fe300f2b0f874f9aff8da48766a8e835931c48.zip |
Merge pull request #236659 from ligolang/ligo--0_67_1
ligo: 0.66.0 -> 0.67.1
Diffstat (limited to 'pkgs/development/ocaml-modules')
6 files changed, 40 insertions, 157 deletions
diff --git a/pkgs/development/ocaml-modules/bls12-381-hash/default.nix b/pkgs/development/ocaml-modules/bls12-381-hash/default.nix deleted file mode 100644 index 1b39439c747a..000000000000 --- a/pkgs/development/ocaml-modules/bls12-381-hash/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, fetchFromGitLab -, buildDunePackage -, bls12-381 -}: - -buildDunePackage rec { - pname = "bls12-381-hash"; - version = "1.0.0"; - src = fetchFromGitLab { - owner = "nomadic-labs"; - repo = "cryptography/ocaml-bls12-381-hash"; - rev = "${version}"; - sha256 = "sha256-cfsSVmN4rbKcLcPcy6NduZktJhPXiVdK75LypmaSe9I="; - }; - - duneVersion = "3"; - - propagatedBuildInputs = [ bls12-381 ]; - - meta = { - description = "Implementation of some cryptographic hash primitives using the scalar field of BLS12-381"; - license = lib.licenses.mit; - homepage = "https://gitlab.com/nomadic-labs/privacy-team"; - maintainers = [ lib.maintainers.ulrikstrid ]; - }; -} diff --git a/pkgs/development/ocaml-modules/bls12-381/default.nix b/pkgs/development/ocaml-modules/bls12-381/default.nix index 20b2cd66a758..65b1a476f9dd 100644 --- a/pkgs/development/ocaml-modules/bls12-381/default.nix +++ b/pkgs/development/ocaml-modules/bls12-381/default.nix @@ -1,40 +1,47 @@ -{ lib, buildDunePackage, fetchFromGitLab -, ff-sig, zarith +{ lib +, buildDunePackage +, fetchFromGitLab +, zarith , zarith_stubs_js ? null , integers_stubs_js -, integers, hex -, alcotest, ff-pbt +, integers +, hex +, alcotest }: buildDunePackage rec { pname = "bls12-381"; - version = "5.0.0"; + version = "6.1.0"; src = fetchFromGitLab { - owner = "dannywillems"; - repo = "ocaml-bls12-381"; + owner = "nomadic-labs"; + repo = "cryptography/ocaml-bls12-381"; rev = version; - sha256 = "sha256-Hy/I+743HSToZgGPFFiAbx7nrybHsE2PwycDsu3DuHM="; + sha256 = "sha256-z2ZSOrXgm+XjdrY91vqxXSKhA0DyJz6JkkNljDZznX8="; }; minimalOCamlVersion = "4.08"; - duneVersion = "3"; + + postPatch = '' + patchShebangs ./src/*.sh + ''; propagatedBuildInputs = [ - ff-sig zarith zarith_stubs_js integers_stubs_js - integers hex + integers ]; - checkInputs = [ alcotest ff-pbt ]; + checkInputs = [ + alcotest + ]; doCheck = true; meta = { - homepage = "https://gitlab.com/dannywillems/ocaml-bls12-381"; - description = "OCaml binding for bls12-381 from librustzcash"; + homepage = " https://nomadic-labs.gitlab.io/cryptography/ocaml-bls12-381/bls12-381/"; + description = "Implementation of BLS12-381 and some cryptographic primitives built on top of it"; license = lib.licenses.mit; maintainers = [ lib.maintainers.ulrikstrid ]; }; diff --git a/pkgs/development/ocaml-modules/seqes/default.nix b/pkgs/development/ocaml-modules/seqes/default.nix new file mode 100644 index 000000000000..04bed64ac649 --- /dev/null +++ b/pkgs/development/ocaml-modules/seqes/default.nix @@ -0,0 +1,19 @@ +{ lib, fetchurl, buildDunePackage, qcheck, qcheck-alcotest, alcotest }: + +buildDunePackage rec { + pname = "seqes"; + version = "0.2"; + src = fetchurl { + url = "https://gitlab.com/nomadic-labs/seqes/-/archive/${version}/seqes-${version}.tar.gz"; + sha256 = "sha256-IxLA0jaIPdX9Zn/GL8UHDJYjA1UBW6leGbZmp64YMjI="; + }; + + checkInputs = [ qcheck qcheck-alcotest alcotest ]; + + meta = with lib; { + description = "Variations of the Seq module with monads folded into the type"; + homepage = "https://gitlab.com/nomadic-labs/seqes"; + license = licenses.lgpl2; # Same as OCaml + maintainers = [ maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix b/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix deleted file mode 100644 index 2d5c5c27494b..000000000000 --- a/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, fetchFromGitLab -, buildDunePackage -, bls12-381 -, data-encoding -, bigstringaf -, alcotest -, alcotest-lwt -, bisect_ppx -, qcheck-alcotest -, ppx_repr -}: - -buildDunePackage rec { - pname = "tezos-bls12-381-polynomial"; - version = "1.0.1"; - duneVersion = "3"; - src = fetchFromGitLab { - owner = "nomadic-labs/cryptography"; - repo = "privacy-team"; - rev = "v${version}"; - sha256 = "sha256-5qDa/fQoTypjaceQ0MBzt0rM+0hSJcpGlXMGAZKRboo="; - }; - - propagatedBuildInputs = [ ppx_repr bls12-381 data-encoding bigstringaf ]; - - checkInputs = [ alcotest alcotest-lwt bisect_ppx qcheck-alcotest ]; - - doCheck = false; # circular dependencies - - meta = { - description = "Polynomials over BLS12-381 finite field"; - license = lib.licenses.mit; - homepage = "https://gitlab.com/nomadic-labs/privacy-team"; - maintainers = [ lib.maintainers.ulrikstrid ]; - }; -} diff --git a/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix b/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix deleted file mode 100644 index 62ddb432e47f..000000000000 --- a/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, buildDunePackage -, hacl-star -, bls12-381 -, bls12-381-hash -, tezos-bls12-381-polynomial -, polynomial -, data-encoding -, hex -, stdint -, ff -, mec -, alcotest -, qcheck-alcotest -, bisect_ppx -}: - -buildDunePackage rec { - pname = "tezos-plompiler"; - duneVersion = "3"; - - inherit (tezos-bls12-381-polynomial) version src; - - propagatedBuildInputs = [ - hacl-star - bls12-381 - bls12-381-hash - tezos-bls12-381-polynomial - data-encoding - hex - stdint - ff - mec - polynomial - ]; - - checkInputs = [ alcotest qcheck-alcotest bisect_ppx ]; - - doCheck = false; # circular deps - - meta = tezos-bls12-381-polynomial.meta // { - description = "Library to write arithmetic circuits for Plonk"; - }; -} diff --git a/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plonk.nix b/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plonk.nix deleted file mode 100644 index f9b78e11d332..000000000000 --- a/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plonk.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, buildDunePackage -, hacl-star -, bls12-381 -, tezos-bls12-381-polynomial -, data-encoding -, tezos-plompiler -, alcotest -, qcheck-alcotest -, bisect_ppx -, -}: - -buildDunePackage rec { - pname = "tezos-plonk"; - duneVersion = "3"; - - inherit (tezos-bls12-381-polynomial) version src; - - propagatedBuildInputs = [ - hacl-star - bls12-381 - tezos-bls12-381-polynomial - data-encoding - tezos-plompiler - ]; - - checkInputs = [ alcotest qcheck-alcotest bisect_ppx ]; - - doCheck = false; # broken - - meta = tezos-bls12-381-polynomial.meta // { - description = "Plonk zero-knowledge proving system"; - }; -} |