diff options
| author | Ulrik Strid <ulrik.strid@outlook.com> | 2023-10-03 21:43:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-03 21:43:33 +0200 |
| commit | d30afdf08975270d62d92634e75069d7e7bcdf3f (patch) | |
| tree | f889aacdb1334460c8040b8d5d5771697aa90731 /pkgs/top-level | |
| parent | e61356b9863f71e7b965f9b8ac3820e7d71af1a0 (diff) | |
| parent | 67bd77f0ea318f506c7384daff1d25f39c619fb2 (diff) | |
Merge pull request #257704 from ligolang/ligo--1_0_0
ligo: 0.72.0 -> 1.0.0
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30e461377c1dc..31b4b12ba4edd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9877,9 +9877,13 @@ with pkgs; ldc = callPackage ../development/compilers/ldc { }; - ligo = callPackage ../development/compilers/ligo { - coq = coq_8_14; - ocamlPackages = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; + ligo = + let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; in + callPackage ../development/compilers/ligo { + coq = coq_8_13.override { + customOCamlPackages = ocaml_p; + }; + ocamlPackages = ocaml_p; }; lego = callPackage ../tools/admin/lego { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index fb9aa161a3e24..f7ce96f135fa7 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1162,6 +1162,8 @@ let mparser-pcre = callPackage ../development/ocaml-modules/mparser/pcre.nix { }; + msgpck = callPackage ../development/ocaml-modules/msgpck { }; + mrmime = callPackage ../development/ocaml-modules/mrmime { }; mtime_1 = callPackage ../development/ocaml-modules/mtime/1_x.nix { }; |