Unverified Commit ab6fc500 authored by Ulrik Strid's avatar Ulrik Strid Committed by GitHub
Browse files

Merge pull request #304720 from vbgl/ligo-1.6.0 

ligo: 1.4.0 → 1.6.0
parents 5d8f1c01 4922992a

pkgs/development/compilers/ligo/default.nix

+4 −5
Original line number Diff line number Diff line
@@ -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

  ];

pkgs/development/ocaml-modules/clap/default.nix

0 → 100644
+24 −0
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub

, buildDunePackage

}:



buildDunePackage rec {

  pname = "clap";

  version = "0.3.0";



  minimalOCamlVersion = "4.07";



  src = fetchFromGitHub {

    owner = "rbardou";

    repo = pname;

    rev = version;

    hash = "sha256-IEol27AVYs55ntvNprBxOk3/EsBKAdPkF3Td3w9qOJg=";

  };



  meta = {

    description = "Command-Line Argument Parsing, imperative style with a consumption mechanism";

    license = lib.licenses.mit;

  };

}

pkgs/development/ocaml-modules/data-encoding/default.nix

+4 −14
Original line number Diff line number Diff line
@@ -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";

pkgs/development/ocaml-modules/index/default.nix

+2 −3
Original line number Diff line number Diff line
@@ -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

pkgs/development/ocaml-modules/irmin/chunk.nix

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
buildDunePackage rec {



  pname = "irmin-chunk";

  inherit (irmin) version src strictDeps;

  inherit (irmin) version src;



  propagatedBuildInputs = [ irmin fmt logs lwt ];