From cd29409a4594ce0fbe82e375ae921c1f6d41a7f6 Mon Sep 17 00:00:00 2001
From: Uri Baghin <uri@canva.com>
Date: Sat, 8 Dec 2018 19:34:12 +1100
Subject: [PATCH] bazel-watcher: 0.5.0 -> 0.9.0

---
 .../tools/bazel-watcher/default.nix           | 24 +++++++++----------
 .../update-gazelle-fix-ssl.patch              | 19 ---------------
 2 files changed, 11 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/development/tools/bazel-watcher/update-gazelle-fix-ssl.patch

diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix
index bedb55ec3742..3f952ef7140a 100644
--- a/pkgs/development/tools/bazel-watcher/default.nix
+++ b/pkgs/development/tools/bazel-watcher/default.nix
@@ -4,30 +4,22 @@
 , fetchpatch
 , git
 , go
+, python
 , stdenv
 }:
 
 buildBazelPackage rec {
   name = "bazel-watcher-${version}";
-  version = "0.5.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "bazelbuild";
     repo = "bazel-watcher";
     rev = "v${version}";
-    sha256 = "1sis723hwax4dg0c28x20yj0hjli66q1ykcvjirgy57znz4iwlq9";
+    sha256 = "0yphks1qlp3xcbq5mg95lxrhl3q8pza5g3f9i2j6y7dsfz0s0l4v";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/bazelbuild/bazel-watcher/commit/4d5928eee3dd5843a1b55136d914b78fef7f25d0.patch";
-      sha256 = "0gxzcdqgifrmvznfy0p5nd11b39n2pwxcvpmhc6hxf85mwlxz7dg";
-    })
-
-    ./update-gazelle-fix-ssl.patch
-  ];
-
-  nativeBuildInputs = [ go git ];
+  nativeBuildInputs = [ go git python ];
 
   bazelTarget = "//ibazel";
 
@@ -52,9 +44,15 @@ buildBazelPackage rec {
       # a different sha256 for the fetch phase.
       rm -rf $bazelOut/external/{go_sdk,\@go_sdk.marker}
       sed -e '/^FILE:@go_sdk.*/d' -i $bazelOut/external/\@*.marker
+
+      # Remove the gazelle tools, they contain go binaries that are built
+      # non-deterministically. As long as the gazelle version matches the tools
+      # should be equivalent.
+      rm -rf $bazelOut/external/{bazel_gazelle_go_repository_tools,\@bazel_gazelle_go_repository_tools.marker}
+      sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
     '';
 
-    sha256 = "1iyjvibvlwg980p7nizr6x5v31dyp4a344f0xn839x393583k59d";
+    sha256 = "14k1cpw4h78c2gk294xzq9a9nv09yabdrahbzgin8xizbgdxn1q8";
   };
 
   buildAttrs = {
diff --git a/pkgs/development/tools/bazel-watcher/update-gazelle-fix-ssl.patch b/pkgs/development/tools/bazel-watcher/update-gazelle-fix-ssl.patch
deleted file mode 100644
index 4cf69e9d1723..000000000000
--- a/pkgs/development/tools/bazel-watcher/update-gazelle-fix-ssl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/WORKSPACE b/WORKSPACE
-index 4011d9b..d085ae8 100644
---- a/WORKSPACE
-+++ b/WORKSPACE
-@@ -52,11 +52,9 @@ http_archive(
-
- http_archive(
-     name = "bazel_gazelle",
--    sha256 = "c0a5739d12c6d05b6c1ad56f2200cb0b57c5a70e03ebd2f7b87ce88cabf09c7b",
--    urls = [
--        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/0.14.0/bazel-gazelle-0.14.0.tar.gz",
--        "https://github.com/bazelbuild/bazel-gazelle/releases/download/0.14.0/bazel-gazelle-0.14.0.tar.gz",
--    ],
-+    sha256 = "0600ea2daf98170211dc561fd348a8a9328c91eb6df66a381eaaf0bcd122e80b",
-+    strip_prefix = "bazel-gazelle-b34f46af2f31ee0470e7364352c2376bcc10d079",
-+    url = "https://github.com/bazelbuild/bazel-gazelle/archive/b34f46af2f31ee0470e7364352c2376bcc10d079.tar.gz",
- )
-
- load("@io_bazel_rules_go//go:def.bzl", "go_register_toolchains", "go_rules_dependencies")