Merge master into staging

2019-07-25 09:23:01 +00:00
parent aabb651b23 b5d1d50aa9
commit 32fbbc6f9b
193 changed files with 4440 additions and 1950 deletions
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
    description = "Objects and helper methods to read and write AppStream metadata";
    homepage = https://people.freedesktop.org/~hughsient/appstream-glib/;
    license = licenses.lgpl2Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    maintainers = with maintainers; [ lethalman matthewbauer ];
  };
 }