Merge branch 'master' into staging-next

2019-09-15 13:18:54 +02:00
parent 9f8a7d2679 c860babfe6
commit b6c6e1f9e8
192 changed files with 4150 additions and 2678 deletions
@@ -77,5 +77,6 @@ stdenv.mkDerivation rec {
    description = "A fork of the bacula project";
    license = licenses.agpl3;
    platforms = platforms.unix;
+    broken = true;
  };
 }