Merge master into staging-next

2019-07-25 11:52:18 +02:00
parent 3d00d8e4ee a8f174ff7c
commit 34eebf6844
194 changed files with 4476 additions and 1951 deletions
@@ -1,16 +1,16 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:

 buildGoPackage rec {
  name = "bazel-buildtools-${version}";
-  version = "0.22.0";
+  version = "0.28.0";
+  rev = "d7ccc5507c6c16e04f5e362e558d70b8b179b052";

  goPackagePath = "github.com/bazelbuild/buildtools";

-  src = fetchFromGitHub {
-    owner = "bazelbuild";
-    repo = "buildtools";
-    rev = "55b64c3d2ddfb57f06477c1d94ef477419c96bd6";
-    sha256 = "0n6q8pkgy3vvmwyrxvkmjfbcxc31i31czg2bjdzq7awwrr4fdbwy";
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/bazelbuild/buildtools";
+    sha256 = "1d8zjgbg77sk27cz9pjz1h6ajwxqmvdzqgwa2jbh6iykibhpadq0";
  };

  goDeps = ./deps.nix;
@@ -5,8 +5,8 @@
    fetch = {
      type = "git";
      url = "https://github.com/golang/protobuf";
-      rev = "b5d812f8a3706043e23a9cd5babf2e5423744d30";
-      sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";
+      rev = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7";
+      sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
    };
  }
  {
@@ -0,0 +1,30 @@
+{stdenv, fetchFromGitHub, python2, which}:
+stdenv.mkDerivation rec {
+  name = "redo-apenwarr-${version}";
+
+  version = "unstable-2019-06-21";
+
+  src = fetchFromGitHub {
+    owner = "apenwarr";
+    repo = "redo";
+    rev = "8924fa35fa7363b531f8e6b48a1328d2407ad5cf";
+    sha256 = "1dj20w29najqjyvk0jh5kqbcd10k32rad986q5mzv4v49qcwdc1q";
+  };
+
+  DESTDIR="";
+  PREFIX = placeholder "out";
+
+  patchPhase = ''
+    patchShebangs .
+  '';
+
+  buildInputs = [ python2 which ];
+
+  meta = with stdenv.lib; {
+    description = "Apenwarr version of the redo build tool.";
+    homepage = https://github.com/apenwarr/redo/;
+    license = stdenv.lib.licenses.asl20;
+    platforms = platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ andrewchambers ];
+  };
+}