From f10f860cbfc8b6d7f7a4df72a489c97075582ef7 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Wed, 26 Jun 2019 18:05:49 -0700 Subject: bazel-watcher: update rules_go and fix the hash of the fetch derivation --- pkgs/development/tools/bazel-watcher/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'pkgs/development/tools/bazel-watcher') diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index a30b5c9bd4e..db04c2026d8 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -1,5 +1,6 @@ { buildBazelPackage , fetchFromGitHub +, fetchpatch , git , go , python @@ -7,7 +8,19 @@ }: let - patches = [ ./use-go-in-path.patch ]; + patches = [ + ./use-go-in-path.patch + + # update rules_go to fix the build. Remove these when updating past 0.10.3 + (fetchpatch { + url = "https://github.com/bazelbuild/bazel-watcher/commit/686130f50cea274f7453f6abc8c5249654047462.patch"; + sha256 = "0rzs01sfiinl5d3dq9sx1bhl8kkzppdwh964fr7bzafqcxv5llmb"; + }) + (fetchpatch { + url = "https://github.com/bazelbuild/bazel-watcher/commit/18bdb44832ccc533e0ab3923ef80060eeb24582d.patch"; + sha256 = "0k5hvlxlg4n092d53cbfxqqhzc6f1jv4licdhhi1dhckkhb4sdk6"; + }) + ]; in buildBazelPackage rec { name = "bazel-watcher-${version}"; @@ -49,7 +62,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "1ck1rsg5msd77abs889nl2n2i3jlah4d4vjz5wbsb3jyhzn8n5ny"; + sha256 = "01d4m4kb2mhz8fxl9apzsdq0pd7i79w3q49x51rwa524caml9zfv"; }; buildAttrs = { -- cgit 1.4.1