Merge remote-tracking branch 'upstream/master' into HEAD

This commit is contained in:
Frederik Rietdijk
2017-08-14 09:34:10 +02:00
270 changed files with 1294 additions and 449 deletions
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "0.4.5";
meta = with stdenv.lib; {
homepage = http://github.com/bazelbuild/bazel/;
homepage = https://github.com/bazelbuild/bazel/;
description = "Build tool that builds code quickly and reliably";
license = licenses.asl20;
maintainers = [ maintainers.philandstuff ];
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = http://leiningen.org/;
homepage = https://leiningen.org/;
description = "Project automation for Clojure";
license = stdenv.lib.licenses.epl10;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;