From 73695f486b990b4de8daab9a288fe0cf6da2ca2e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 19 Feb 2025 06:53:18 +0100 Subject: [PATCH] =?UTF-8?q?ocamlPackages.lambdapi:=202.3.1=20=E2=86=92=202?= =?UTF-8?q?.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.pratter: 2.0.0 → 3.0.0 --- .../development/ocaml-modules/lambdapi/default.nix | 13 ++++++++++--- pkgs/development/ocaml-modules/pratter/default.nix | 14 +++++++------- pkgs/top-level/ocaml-packages.nix | 4 +--- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/development/ocaml-modules/lambdapi/default.nix b/pkgs/development/ocaml-modules/lambdapi/default.nix index fc4a0728b046..9e6de8a37e8c 100644 --- a/pkgs/development/ocaml-modules/lambdapi/default.nix +++ b/pkgs/development/ocaml-modules/lambdapi/default.nix @@ -7,6 +7,8 @@ bindlib, camlp-streams, cmdliner, + dream, + lwt_ppx, menhir, pratter, sedlex, @@ -18,20 +20,25 @@ buildDunePackage rec { pname = "lambdapi"; - version = "2.3.1"; + version = "2.6.0"; minimalOCamlVersion = "4.12"; src = fetchurl { url = "https://github.com/Deducteam/lambdapi/releases/download/${version}/lambdapi-${version}.tbz"; - hash = "sha256-7ww2TjVcbEQyfmLnnEhLGAjW4US9a4mdOfDJw6NR1fI="; + hash = "sha256-0B5fE9suq6bk/jMGZxSeAFnUiGxlH/nWtnLbLfyXZe0="; }; - nativeBuildInputs = [ menhir ]; + nativeBuildInputs = [ + dream + menhir + ]; + buildInputs = [ lwt_ppx ]; propagatedBuildInputs = [ bindlib camlp-streams cmdliner + dream pratter sedlex stdlib-shims diff --git a/pkgs/development/ocaml-modules/pratter/default.nix b/pkgs/development/ocaml-modules/pratter/default.nix index dcaead619d98..9c680b3ce742 100644 --- a/pkgs/development/ocaml-modules/pratter/default.nix +++ b/pkgs/development/ocaml-modules/pratter/default.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitHub, + fetchFromGitLab, buildDunePackage, camlp-streams, alcotest, @@ -9,17 +9,17 @@ }: buildDunePackage rec { - version = "2.0.0"; + version = "3.0.0"; pname = "pratter"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; - src = fetchFromGitHub { - owner = "gabrielhdt"; + src = fetchFromGitLab { + domain = "forge.tedomum.net"; + owner = "koizel"; repo = "pratter"; - rev = version; - hash = "sha256-QEq8Zt2pfsRT04Zd+ugGKcHdzkqYcDDUg/iAFMMDdEE="; + tag = version; + hash = "sha256-O9loVYPJ9xoYf221vBbclqNNq2AA3ImUFGHxtfK3Jwc="; }; propagatedBuildInputs = [ camlp-streams ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index fcd91264cbb5..7bebc3af9364 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -984,9 +984,7 @@ let lambda-term = callPackage ../development/ocaml-modules/lambda-term { }; lambdapi = callPackage ../development/ocaml-modules/lambdapi { - why3 = pkgs.why3.override { ocamlPackages = self; - version = "1.7.2"; coqPackages = pkgs.coqPackages_8_18; - }; + why3 = pkgs.why3.override { ocamlPackages = self; }; }; lambdasoup = callPackage ../development/ocaml-modules/lambdasoup { };