Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-05-10 09:43:48 +02:00
132 changed files with 936 additions and 344 deletions
@@ -48,6 +48,5 @@ stdenv.mkDerivation rec {
description = "Project automation for Clojure";
license = stdenv.lib.licenses.epl10;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = with stdenv.lib.maintainers; [ the-kenny ];
};
}
@@ -36,7 +36,6 @@ stdenv.mkDerivation {
'';
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.the-kenny ];
license = stdenv.lib.licenses.asl20;
};
}