From 389a82c81d16b1c269942a874ad249440255eaa0 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Wed, 12 Jun 2019 21:27:45 -0700 Subject: [PATCH 1/2] bazel-watcher: 0.9.1 -> 0.10.3 --- pkgs/development/tools/bazel-watcher/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index c75a053acb2..1a56933548f 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -10,13 +10,13 @@ buildBazelPackage rec { name = "bazel-watcher-${version}"; - version = "0.9.1"; + version = "0.10.3"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${version}"; - sha256 = "1gjbv67ydyb0mafpp59qr9n8f8vva2mwhgan6lxxl0i9yfx7qc6p"; + sha256 = "17z4nqqsdrainbh8fmhf6sgrxwf7aknadmn94z1yqpxa7kb9x33v"; }; nativeBuildInputs = [ go git python ]; @@ -49,7 +49,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "0p6yarz4wlb6h33n4slkczkdkaa93zc9jx55h8wl9vv81ahp0md5"; + sha256 = "1ck1rsg5msd77abs889nl2n2i3jlah4d4vjz5wbsb3jyhzn8n5ny"; }; buildAttrs = { From 222dca99822118a8d2942395a741db4eb8ab0154 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Wed, 12 Jun 2019 21:33:42 -0700 Subject: [PATCH 2/2] bazel-watcher: disable nix hacks on bazel --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93b4a3fca9d..5b7553bb7ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8847,7 +8847,9 @@ in bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { }; - bazel-watcher = callPackage ../development/tools/bazel-watcher { }; + bazel-watcher = callPackage ../development/tools/bazel-watcher { + buildBazelPackage = buildBazelPackage.override { enableNixHacks = false; }; + }; bazelisk = callPackage ../development/tools/bazelisk { };