Merge master into staging

2018-10-13 09:48:20 +02:00
parent ef93155f60 35ce480d69
commit 6f5142e48e
309 changed files with 11221 additions and 3339 deletions
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -63,6 +63,7 @@ stdenv.mkDerivation {
    homepage = http://www.freedesktop.org/wiki/Software/HarfBuzz;
    downloadPage = "https://www.freedesktop.org/software/harfbuzz/release/";
    maintainers = [ maintainers.eelco ];
+    license = licenses.mit;
    platforms = with platforms; linux ++ darwin;
    inherit version;
    updateWalker = true;