BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #231129 from vbgl/ocaml-prepare-dune-3

Browse source 
ocamlPackages: prepare for Dune 3
This commit is contained in:
Weijia Wang 2023-05-10 23:32:19 +03:00 committed by GitHub
commit e7d6e5b740
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/ocaml-modules/odoc/default.nix
View file

@ -13,8 +13,7 @@ buildDunePackage rec {
sha256 = "sha256-9XTb0ozQ/DorlVJcS7ld320fZAi7T+EhV/pTeIT5h/0=";
};
# dune 3 is required for tests to pass
duneVersion = if doCheck then "3" else "2";
duneVersion = "3";
nativeBuildInputs = [ cppo ];
buildInputs = [ astring cmdliner fpath result tyxml odoc-parser fmt ];

2
pkgs/development/tools/ocaml/cppo/default.nix
View file

@ -23,7 +23,7 @@ buildDunePackage rec {
inherit pname;
version = "1.6.9";
useDune2 = true;
duneVersion = "3";
src = fetchFromGitHub {
owner = "ocaml-community";

7
pkgs/development/tools/ocaml/cppo/ocamlbuild.nix
View file

@ -4,10 +4,13 @@ if lib.versionOlder (lib.getVersion cppo) "1.6"
then cppo
else
buildDunePackage rec {
buildDunePackage {
pname = "cppo_ocamlbuild";
inherit (cppo) version useDune2 src;
inherit (cppo) version src;
minimalOCamlVersion = "4.03";
duneVersion = "3";
propagatedBuildInputs = [ ocamlbuild ];

9
pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix
View file

@ -1,15 +1,18 @@
{ lib, fetchurl, yojson, csexp, buildDunePackage, merlin-lib, merlin }:
{ lib, fetchurl, yojson, csexp, findlib, buildDunePackage, merlin-lib, merlin }:
buildDunePackage rec {
pname = "dot-merlin-reader";
duneVersion = "3";
inherit (merlin) version src;
minimalOCamlVersion = "4.06";
buildInputs = if lib.versionAtLeast version "4.7-414"
buildInputs = [ findlib ]
++ (if lib.versionAtLeast version "4.7-414"
then [ merlin-lib ]
else [ yojson csexp ];
else [ yojson csexp ]);
meta = with lib; {
description = "Reads config files for merlin";