Merge pull request #105669 from avdv/bazel-watcher-0.14.0

This commit is contained in:
Sandro 2020-12-07 20:19:13 +01:00 committed by GitHub
commit d4de077c9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -13,13 +13,13 @@ let
in in
buildBazelPackage rec { buildBazelPackage rec {
name = "bazel-watcher-${version}"; name = "bazel-watcher-${version}";
version = "0.13.1"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bazelbuild"; owner = "bazelbuild";
repo = "bazel-watcher"; repo = "bazel-watcher";
rev = "v${version}"; rev = "v${version}";
sha256 = "0n28q27510ymg5d455hrbk7z8wawszgjmqjjhb4zximqhvxks7kh"; sha256 = "0gigl1lg8sb4bj5crvj54329ws4yirldbncs15f96db6vhp0ig7r";
}; };
nativeBuildInputs = [ go git python ]; nativeBuildInputs = [ go git python ];
@ -56,7 +56,7 @@ buildBazelPackage rec {
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
''; '';
sha256 = "0rfdwss8aahydiybwhi3j0qw12j1l91k9lbn1vaip0bmnq5qfwh9"; sha256 = "0yl5rs6y1xifxjfsa9zv8bjcwiky7rxk9y3rmi01pqpsm7ik12a9";
}; };
buildAttrs = { buildAttrs = {
@ -64,6 +64,8 @@ buildBazelPackage rec {
preBuild = '' preBuild = ''
patchShebangs . patchShebangs .
substituteInPlace ibazel/BUILD --replace '{STABLE_GIT_VERSION}' ${version}
''; '';
installPhase = '' installPhase = ''
@ -77,5 +79,7 @@ buildBazelPackage rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ kalbasit ]; maintainers = with maintainers; [ kalbasit ];
platforms = platforms.all; platforms = platforms.all;
# broken on darwin, see https://github.com/NixOS/nixpkgs/issues/105573
broken = stdenv.isDarwin;
}; };
} }