Merge staging-next into staging

2018-10-17 08:36:28 +02:00
parent 7b2ed00ef6 18fcc337af
commit 89349fdae9
347 changed files with 8824 additions and 5155 deletions
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
  meta = with stdenv.lib; {
    homepage = https://projects.gnome.org/gconf/;
    description = "Deprecated system for storing application preferences";
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }