Merge branch 'master' into staging-next

Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
parent 580cab57e4 bb3f7d14a1
commit 00df25ee57
298 changed files with 3752 additions and 5727 deletions
--- a/pkgs/tools/typesetting/xmlroff/default.nix
+++ b/pkgs/tools/typesetting/xmlroff/default.nix
@@ -44,5 +44,6 @@ stdenv.mkDerivation rec {

  meta = {
    platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.bsd3;
  };
 }