Merge master into staging-next

pkgs/development/tools/build-managers/cmake/2.8.nix

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   patches =
     [(fetchpatch { # see https://www.cmake.org/Bug/view.php?id=13959
       name = "FindFreetype-2.5.patch";
-      url = "https://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug";
+      url = "https://public.kitware.com/Bug/file/4660/0001-Support-finding-freetype2-using-pkg-config.patch";
       sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj";
     })] ++
     # Don't search in non-Nix locations such as /usr, but do search in our libc.

pkgs/development/tools/build-managers/mage/default.nix

@@ -0,0 +1,32 @@
+{ buildGoPackage, fetchFromGitHub, lib }:
+
+with lib;
+
+buildGoPackage rec {
+  name = "mage-${version}";
+  version = "1.7.1";
+
+  goPackagePath = "github.com/magefile/mage";
+  subPackages = [ "." ];
+
+  src = fetchFromGitHub {
+    owner = "magefile";
+    repo = "mage";
+    rev = "v${version}";
+    sha256 = "0n4k5dy338rxwzj654smxzlanmd0zws6mdzv0wc4byqjhr7mqhg2";
+  };
+
+  buildFlagsArray = [ 
+    "-ldflags="
+    "-X github.com/magefile/mage/mage.commitHash=v${version}"
+    "-X github.com/magefile/mage/mage.gitTag=v${version}"
+  ];
+
+  meta = {
+    description = "A Make/Rake-like Build Tool Using Go";
+    license = licenses.asl20;
+    maintainers = [ maintainers.swdunlop ];
+    homepage = https://magefile.org/;
+    platforms = platforms.all;
+  };
+}