Merge remote-tracking branch 'upstream/staging-next' into HEAD

This commit is contained in:
Jörg Thalheim
2021-04-17 16:37:04 +02:00
239 changed files with 7439 additions and 3748 deletions
+2
View File
@@ -1194,6 +1194,8 @@ let
wasm = callPackage ../development/ocaml-modules/wasm { };
wayland = callPackage ../development/ocaml-modules/wayland { };
webbrowser = callPackage ../development/ocaml-modules/webbrowser { };
webmachine = callPackage ../development/ocaml-modules/webmachine { };