Merge branch 'staging-next' into staging

2020-06-10 04:10:57 +02:00
parent 8576d24b2a c637cbe992
commit acb53e0698
170 changed files with 5628 additions and 11438 deletions
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
    sha256 = "1ybk39ylvs32lywq7ra4l2kdr5izc80r9461hwfnw8pssxs9gjkk";
  };

-  outputs = [ "out" "doc" ];
+  outputs = [ "out" ] ++ stdenv.lib.optional withManual "doc";

  hardeningDisable = [ "format" ];