From eacf840bcaa35ee0ba0ae05ae094fc7f2469c8a2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 18 Mar 2023 08:03:30 +0100 Subject: [PATCH] =?UTF-8?q?ocamlPackages.pgocaml:=204.2.2-dev-20210111=20?= =?UTF-8?q?=E2=86=92=204.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/pgocaml/default.nix | 10 +++++----- pkgs/development/ocaml-modules/pgocaml/ppx.nix | 7 +++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix index 5c00f2c8991..22ef94af92e 100644 --- a/pkgs/development/ocaml-modules/pgocaml/default.nix +++ b/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -4,16 +4,16 @@ buildDunePackage rec { pname = "pgocaml"; - version = "4.2.2-dev-20210111"; + version = "4.3.0"; src = fetchFromGitHub { owner = "darioteixeira"; repo = "pgocaml"; - rev = "1bb0025deeb3d14029afdcc69aaa7847026e243e"; - sha256 = "11inbjf87gclc2xmpq56ag4cm4467y9q9hjgbdn69fa1bman2zn2"; + rev = version; + hash = "sha256-W1fbRnU1l61qqxfVY2qiBnVpGD81xrBO8k0tWr+RXMY="; }; - minimumOCamlVersion = "4.08"; - useDune2 = true; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ calendar csv hex ppx_deriving ppx_sexp_conv re rresult sexplib ]; diff --git a/pkgs/development/ocaml-modules/pgocaml/ppx.nix b/pkgs/development/ocaml-modules/pgocaml/ppx.nix index dce2e2b0c99..b649f70d198 100644 --- a/pkgs/development/ocaml-modules/pgocaml/ppx.nix +++ b/pkgs/development/ocaml-modules/pgocaml/ppx.nix @@ -2,7 +2,10 @@ buildDunePackage { pname = "pgocaml_ppx"; - inherit (pgocaml) src version useDune2 meta; + inherit (pgocaml) src version meta; - propagatedBuildInputs = [ pgocaml ppx_optcomp ]; + duneVersion = "3"; + + buildInputs = [ ppx_optcomp ]; + propagatedBuildInputs = [ pgocaml ]; }