Merge staging-next into staging

2020-09-03 19:21:10 +02:00
parent ccde657295 5f7aecdf91
commit 377242d587
278 changed files with 3663 additions and 2242 deletions
@@ -16,9 +16,6 @@ with stdenv.lib;
 assert stdenv.isLinux -> utillinuxMinimal != null;

 # TODO:
-# * Add gio-module-fam
-#     Problem: cyclic dependency on gamin
-#     Possible solution: build as a standalone module, set env. vars
 # * Make it build without python
 #     Problem: an example (test?) program needs it.
 #     Possible solution: disable compilation of this example somehow