Merge master into staging-next

2021-02-17 00:36:31 +00:00
parent a97c4b69b0 42a33fa59f
commit 79b7a67b55
59 changed files with 2028 additions and 1319 deletions
@@ -229,6 +229,8 @@ qtModule {
    description = "A web engine based on the Chromium web browser";
    maintainers = with maintainers; [ matthewbauer ];
    platforms = platforms.unix;
+    # This build takes a long time; particularly on slow architectures
+    timeout = 24 * 3600;
  };

 }