ocamlPackages.opam-core: fix for opam 2.2

This commit is contained in:
Vincent Laporte 2024-07-24 08:01:17 +02:00 committed by Vincent Laporte
parent 185a57d2b5
commit fd9cbc663d
2 changed files with 5 additions and 7 deletions

View File

@ -1,15 +1,13 @@
{ lib, buildDunePackage, unzip { lib, buildDunePackage, opam
, opam, ocamlgraph, re, cppo }: , jsonm, ocamlgraph, re, sha, swhid_core, uutf
}:
buildDunePackage rec { buildDunePackage rec {
pname = "opam-core"; pname = "opam-core";
inherit (opam) src version; inherit (opam) src version;
useDune2 = true; propagatedBuildInputs = [ jsonm ocamlgraph uutf re sha swhid_core ];
nativeBuildInputs = [ unzip cppo ];
propagatedBuildInputs = [ ocamlgraph re ];
# get rid of check for curl at configure time # get rid of check for curl at configure time
# opam-core does not call curl at run time # opam-core does not call curl at run time

View File

@ -1379,7 +1379,7 @@ let
omd = callPackage ../development/ocaml-modules/omd { }; omd = callPackage ../development/ocaml-modules/omd { };
opam-core = callPackage ../development/ocaml-modules/opam-core { opam-core = callPackage ../development/ocaml-modules/opam-core {
inherit (pkgs) opam unzip; inherit (pkgs) opam;
}; };
opam-file-format = callPackage ../development/ocaml-modules/opam-file-format { }; opam-file-format = callPackage ../development/ocaml-modules/opam-file-format { };