diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 599169116512..eb3fe8004aa6 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -15,12 +15,12 @@ ocamlPackages.buildDunePackage rec { pname = "ligo"; - version = "1.6.0"; + version = "1.7.1"; src = fetchFromGitLab { owner = "ligolang"; repo = "ligo"; rev = version; - hash = "sha256-ZPHOgozuUij9+4YXZTnn1koddQEQZe/yrpb+OPHO+nA="; + hash = "sha256-pBoLgS/9MLMrc98niI+o2JoJ3gpvhyRY2o9GmVc5hIA="; fetchSubmodules = true; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7780c5958d3a..77b6a3e34d3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9555,7 +9555,7 @@ with pkgs; last-resort = callPackage ../data/fonts/last-resort { }; ligo = - let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; in + let ocaml_p = ocaml-ng.ocamlPackages_4_14; in callPackage ../development/compilers/ligo { coq = coq_8_13.override { customOCamlPackages = ocaml_p; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 259864f22a78..fe284a62718d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -2036,13 +2036,6 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages = ocamlPackages_5_1; - # This is a nasty way to replace toplevel janestreet attributes in the scope, - # so that modules outside of ocamlPackages that depend on JS OCaml libraries - # *and* non-JS OCaml libraries can pull in the same version of JS transitive - # dependencies. Remove this once ligo and stanc can be compiled against - # janestreet 0.16 libraries. - ocamlPackages_4_14_janeStreet_0_15 = ocamlPackages_4_14.overrideScope (self: super: super // super.janeStreet_0_15); - # We still have packages that rely on unsafe-string, which is deprecated in OCaml 4.06.0. # Below are aliases for porting them to the latest versions of the OCaml 4 series. ocamlPackages_4_14_unsafe_string = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.14.nix {