Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-04-19 18:11:54 +00:00
committed by GitHub
54 changed files with 512 additions and 279 deletions
+5 -1
View File
@@ -1017,7 +1017,11 @@ let
ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { };
ocaml_extlib = callPackage ../development/ocaml-modules/extlib { };
ocaml_extlib = ocaml_extlib-1-7-8;
ocaml_extlib-1-7-8 = callPackage ../development/ocaml-modules/extlib { };
ocaml_extlib-1-7-7 = callPackage ../development/ocaml-modules/extlib/1.7.7.nix { };
ocb-stubblr = callPackage ../development/ocaml-modules/ocb-stubblr { };