Merge master into staging-next

2019-11-16 11:45:07 +01:00
parent 27313767b8 1421eee65d
commit be7125dde7
133 changed files with 1826 additions and 2024 deletions
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -111,7 +111,7 @@ python3Packages.buildPythonApplication rec {
  isCross = stdenv.targetPlatform != stdenv.hostPlatform;

  meta = with lib; {
-    homepage = http://mesonbuild.com;
+    homepage = https://mesonbuild.com;
    description = "SCons-like build system that use python as a front-end language and Ninja as a building backend";
    license = licenses.asl20;
    maintainers = with maintainers; [ mbe rasendubi ];