Merge staging-next into staging

2021-03-07 12:20:40 +00:00
parent 65cddb74d7 69be5320bb
commit dcea8212b5
45 changed files with 746 additions and 660 deletions
@@ -1,8 +1,8 @@
-{ lib, stdenv, ocaml, findlib, dune, dune_2 }:
+{ lib, stdenv, ocaml, findlib, dune_1, dune_2 }:

 { pname, version, buildInputs ? [], enableParallelBuilding ? true, ... }@args:

-let Dune = if args.useDune2 or false then dune_2 else dune; in
+let Dune = if args.useDune2 or false then dune_2 else dune_1; in

 if args ? minimumOCamlVersion &&
   ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion