From 23010cc67afa6d796265ee5224791238cb38ea9d Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Wed, 2 Dec 2020 08:48:00 +0100 Subject: [PATCH 1/3] bazel-watcher: 0.13.1 -> 0.14.0 --- 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 59a345faf29..9986f8c979d 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -13,13 +13,13 @@ let in buildBazelPackage rec { name = "bazel-watcher-${version}"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${version}"; - sha256 = "0n28q27510ymg5d455hrbk7z8wawszgjmqjjhb4zximqhvxks7kh"; + sha256 = "0gigl1lg8sb4bj5crvj54329ws4yirldbncs15f96db6vhp0ig7r"; }; nativeBuildInputs = [ go git python ]; @@ -56,7 +56,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "0rfdwss8aahydiybwhi3j0qw12j1l91k9lbn1vaip0bmnq5qfwh9"; + sha256 = "0yl5rs6y1xifxjfsa9zv8bjcwiky7rxk9y3rmi01pqpsm7ik12a9"; }; buildAttrs = { From cc234879dd64dd57e190664203d856e71f3ae3b4 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Wed, 2 Dec 2020 09:33:14 +0100 Subject: [PATCH 2/3] bazel-watcher: Show version string instead of `{STABLE_GIT_VERSION}` --- pkgs/development/tools/bazel-watcher/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 9986f8c979d..922ec319017 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -64,6 +64,8 @@ buildBazelPackage rec { preBuild = '' patchShebangs . + + substituteInPlace ibazel/BUILD --replace '{STABLE_GIT_VERSION}' ${version} ''; installPhase = '' From 919d3ea2a0c19d2bed0afb5d71636b7c0237637b Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Mon, 7 Dec 2020 12:33:22 +0100 Subject: [PATCH 3/3] bazel-watcher: Mark broken on darwin --- pkgs/development/tools/bazel-watcher/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 922ec319017..e0a7febb875 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -79,5 +79,7 @@ buildBazelPackage rec { license = licenses.asl20; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.all; + # broken on darwin, see https://github.com/NixOS/nixpkgs/issues/105573 + broken = stdenv.isDarwin; }; }