Merge branch 'staging-next' into staging

2021-03-01 19:30:56 +01:00
parent 58aa8e36e2 4b494c403e
commit 913394a1d9
138 changed files with 6595 additions and 4660 deletions
@@ -1,9 +1,11 @@
-{ lib, fetchFromGitHub, buildDunePackage }:
+{ lib, fetchFromGitHub, buildDunePackage, ocaml }:

 buildDunePackage rec {
  pname = "ppx_derivers";
  version = "1.2.1";

+  useDune2 = lib.versionAtLeast ocaml.version "4.08";
+
  minimumOCamlVersion = "4.02";

  src = fetchFromGitHub {