Merge pull request #244874 from marsam/update-ocaml-Zarith

ocamlPackages.zarith: 1.12 -> 1.13
This commit is contained in:
Ulrik Strid 2023-11-10 13:24:27 +01:00 committed by GitHub
commit d47a15a8b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions

View File

@ -9,12 +9,12 @@ else
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-zarith";
version = "1.12";
version = "1.13";
src = fetchFromGitHub {
owner = "ocaml";
repo = "Zarith";
rev = "release-${version}";
sha256 = "1jslm1rv1j0ya818yh23wf3bb6hz7qqj9pn5fwl45y9mqyqa01s9";
sha256 = "sha256-CNVKoJeO3fsmWaV/dwnUA8lgI4ZlxR/LKCXpCXUrpSg=";
};
nativeBuildInputs = [ pkg-config ocaml findlib ];
@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Fast, arbitrary precision OCaml integers";
homepage = "http://forge.ocamlcore.org/projects/zarith";
homepage = "https://github.com/ocaml/Zarith";
changelog = "https://github.com/ocaml/Zarith/raw/${src.rev}/Changes";
license = licenses.lgpl2;
inherit (ocaml.meta) platforms;
maintainers = with maintainers; [ thoughtpolice vbgl ];

View File

@ -9917,7 +9917,14 @@ with pkgs;
ldc = callPackage ../development/compilers/ldc { };
ligo =
let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; in
let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15.overrideScope (self: super: {
zarith = super.zarith.overrideAttrs (o: {
src = fetchzip {
url = "https://github.com/ocaml/Zarith/archive/refs/tags/release-1.12.tar.gz";
hash = "sha256-SQegsMc1+UIod8XeJDE+H5q1huNDQI8CUh7IsHOoVMs=";
};
});
}); in
callPackage ../development/compilers/ligo {
coq = coq_8_13.override {
customOCamlPackages = ocaml_p;