Merge branch 'master' into staging-next

2018-10-01 19:42:07 +02:00
parent 9c4b11e9a0 83fd9785f6
commit 1383c08f2c
385 changed files with 12348 additions and 6335 deletions
@@ -58,5 +58,6 @@ stdenv.mkDerivation rec {
    homepage = https://www.cyrusimap.org/sasl;
    description = "Library for adding authentication support to connection-based protocols";
    platforms = platforms.unix;
+    license = licenses.bsdOriginal;
  };
 }