Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2019-11-16 11:45:07 +01:00
133 changed files with 1826 additions and 2024 deletions

View File

@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, dune }:
let
pname = "cppo";
webpage = "http://mjambon.com/${pname}.html";
webpage = "https://github.com/ocaml-community/${pname}";
in
assert stdenv.lib.versionAtLeast ocaml.version "3.12";