Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-03-07 12:20:40 +00:00
committed by GitHub
45 changed files with 746 additions and 660 deletions
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, dune, benchmark }:
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, dune_2, benchmark }:
let param =
if lib.versionAtLeast ocaml.version "4.03"
@@ -6,7 +6,7 @@ let param =
version = "0.6.2";
url = "https://github.com/Chris00/ocaml-rope/releases/download/${version}/rope-${version}.tbz";
sha256 = "15cvfa0s1vjx7gjd07d3fkznilishqf4z4h2q5f20wm9ysjh2h2i";
buildInputs = [ dune ];
buildInputs = [ dune_2 ];
extra = {
buildPhase = "dune build -p rope";
installPhase = ''