From 77f2b0312b7302c3fe515a320412f14a46bc0483 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Fri, 13 Dec 2024 16:15:15 +0100 Subject: [PATCH 1/2] ocamlPackages.elpi: 2.0.5 -> 2.0.6 --- pkgs/development/ocaml-modules/elpi/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 8c60431432c8d..957e3aa4990b1 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -8,7 +8,7 @@ , ppxlib, ppx_deriving , ppxlib_0_15, ppx_deriving_0_15 , coqPackages -, version ? if lib.versionAtLeast ocaml.version "4.13" then "2.0.5" +, version ? if lib.versionAtLeast ocaml.version "4.13" then "2.0.6" else if lib.versionAtLeast ocaml.version "4.08" then "1.20.0" else "1.15.2" }: @@ -17,6 +17,7 @@ let p5 = camlp5; in let camlp5 = p5.override { legacy = true; }; in let fetched = coqPackages.metaFetch ({ + release."2.0.6".sha256 = "sha256-tRUYXQZ0VXrjIZBZ1skdzieUsww4rSNEe5ik+iKpk3U="; release."2.0.5".sha256 = "sha256-cHgERFqrfSg5WtUX3UxR6L+QkzS7+t6n4V+wweiEacc="; release."1.20.0".sha256 = "sha256-lctZAIQgOg5d+LfILtWsBVcsemV3zTZYfJfDlCxHtcA="; release."1.19.2".sha256 = "sha256-dBj5Ek7PWq/8Btq/dggJUqa8cUtfvbi6EWo/lJEDOU4="; From ea27f40ced90be742a1247e0e8ec30b90135860d Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Fri, 13 Dec 2024 17:30:45 +0100 Subject: [PATCH 2/2] coqPackages.coq-elpi: support master --- pkgs/development/coq-modules/coq-elpi/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 5a6146de50b13..b4aa7727d6ab4 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -167,6 +167,10 @@ in stdlib ]; + preConfigure = '' + make elpi/dune || true + ''; + meta = { description = "Coq plugin embedding ELPI"; maintainers = [ lib.maintainers.cohencyril ];