Merge branch 'staging-next' into staging

Commits from master, conflict resolutions, etc.
2018-08-13 20:57:50 +02:00
parent 98df4f6351 5b0398dc36
commit ded9a4b1aa
368 changed files with 5460 additions and 6226 deletions
@@ -44,5 +44,6 @@ stdenv.mkDerivation rec {

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