From 409d682a57d75bd303b35bdb95b933291674f338 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 24 Aug 2023 09:58:14 +0200 Subject: [PATCH] coqPackages_8_14.coq-elpi: fix by using old camlp5 --- pkgs/development/ocaml-modules/elpi/default.nix | 3 +++ pkgs/development/tools/ocaml/camlp5/default.nix | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 4467ce3de8cd..ad3130a4ca0f 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -12,6 +12,9 @@ else if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1" }: +let p5 = camlp5; in +let camlp5 = p5.override { legacy = true; }; in + let fetched = coqPackages.metaFetch ({ release."1.16.5".sha256 = "sha256-tKX5/cVPoBeHiUe+qn7c5FIRYCwY0AAukN7vSd/Nz9A="; release."1.15.2".sha256 = "sha256-XgopNP83POFbMNyl2D+gY1rmqGg03o++Ngv3zJfCn2s="; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index a09f226b3f13..02355cb9846c 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib, perl, makeWrapper , rresult, bos, ocaml_pcre, re, camlp-streams +, legacy ? false }: if lib.versionOlder ocaml.version "4.02" @@ -7,7 +8,7 @@ then throw "camlp5 is not available for OCaml ${ocaml.version}" else let params = - if lib.versionAtLeast ocaml.version "4.12" + if lib.versionAtLeast ocaml.version "4.12" && !legacy then rec { version = "8.00.05";