colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bazel-watcher: 0.21.2 -> 0.23.1

Browse Source 
Changelogs:
https://github.com/bazelbuild/bazel-watcher/releases

Removing patch for https://github.com/bazelbuild/rules_go/issues/3408
because now it should be included in newer `rules_go` transitive
dependency.

Also removing `bazel-watcher` from `bazel_*` builds because it is
always using `bazel_5` and also [bazel-watcher](https://github.com/bazelbuild/bazel-watcher)
`is not an official Google product` so maybe not the best choice
for tests + there are some built-in tests in `examples/*` in bazel
builds. As suggested in https://github.com/NixOS/nixpkgs/pull/231439#issuecomment-1546467559
This commit is contained in:
Dmitry Ivankov 2023-05-14 14:22:30 +02:00
parent 70d8a790cd
commit 0d8594ef0d
5 changed files with 3 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/tools/bazel-watcher/default.nix
View File

@ -10,7 +10,6 @@
let
patches = [
./use-go-in-path.patch
./fix-rules-go-3408.patch
];
# Patch the protoc alias so that it always builds from source.
@ -30,13 +29,13 @@ let
in
buildBazelPackage rec {
pname = "bazel-watcher";
version = "0.21.2";
version = "0.23.1";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = "bazel-watcher";
rev = "v${version}";
sha256 = "sha256-wigrE9u1VuFnqLWyVJK3M7xsjyme2dDG6YTcD9whKnw=";
sha256 = "sha256-fnhbxrgwffFQDIRLGisi1Wk3EjfkN8Mi8wtWT/Gy+78=";
};
nativeBuildInputs = [ go git python3 ];
@ -82,7 +81,7 @@ buildBazelPackage rec {
rm -rf $bazelOut/external/com_google_protobuf
'';
sha256 = "sha256-lC9e5Z2cxLAeWXkiFGmcB6aOaurMvwrP/k5jl3gCfAc=";
sha256 = "sha256-7/sLGgUCG4SU2nbK0596467dlrKylewiewhIvNFTMvY=";
};
buildAttrs = {

18
pkgs/development/tools/bazel-watcher/fix-rules-go-3408.patch
View File

@ -1,18 +0,0 @@
diff --git a/WORKSPACE b/WORKSPACE
index 555ab93..9f3b8a0 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -46,10 +46,11 @@ rules_proto_toolchains()
# gazelle:repository go_repository name=com_github_bazelbuild_rules_go importpath=github.com/bazelbuild/rules_go
http_archive(
name = "io_bazel_rules_go",
- sha256 = "56d8c5a5c91e1af73eca71a6fab2ced959b67c86d12ba37feedb0a2dfea441a6",
+ sha256 = "7fd912837cc971b708037ab1d0d721b892c62dadbfdcfae5066e8e90d25876e9",
+ strip_prefix = "rules_go-8d309d5af15814b4096d80b60f80fa86128c43f2",
urls = [
- "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.37.0/rules_go-v0.37.0.zip",
- "https://github.com/bazelbuild/rules_go/releases/download/v0.37.0/rules_go-v0.37.0.zip",
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_go/archive/8d309d5af15814b4096d80b60f80fa86128c43f2.zip",
+ "https://github.com/bazelbuild/rules_go/archive/8d309d5af15814b4096d80b60f80fa86128c43f2.zip",
],
)

8
pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
View File

@ -12,8 +12,6 @@
, buildJdk, runJdk
, buildJdkName
, runtimeShell
# Downstream packages for tests
, bazel-watcher
# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
, enableNixHacks ? false
@ -336,12 +334,6 @@ stdenv.mkDerivation rec {
javaWithNixHacks = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; };
protobufWithNixHacks = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
# downstream packages using buildBazelPackage
# fixed-output hashes of the fetch phase need to be spot-checked manually
downstream = recurseIntoAttrs ({
inherit bazel-watcher;
});
};
src_for_updater = stdenv.mkDerivation rec {

8
pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
View File

@ -11,8 +11,6 @@
# Allow to independently override the jdks used to build and run respectively
, buildJdk, runJdk
, runtimeShell
# Downstream packages for tests
, bazel-watcher
# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
, enableNixHacks ? false
@ -301,12 +299,6 @@ stdenv.mkDerivation rec {
javaWithNixHacks = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; };
protobufWithNixHacks = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
# downstream packages using buildBazelPackage
# fixed-output hashes of the fetch phase need to be spot-checked manually
downstream = recurseIntoAttrs ({
inherit bazel-watcher;
});
};
src_for_updater = stdenv.mkDerivation rec {

8
pkgs/development/tools/build-managers/bazel/bazel_6/default.nix
View File

@ -11,8 +11,6 @@
# Allow to independently override the jdks used to build and run respectively
, buildJdk, runJdk
, runtimeShell
# Downstream packages for tests
, bazel-watcher
# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
, enableNixHacks ? false
@ -311,12 +309,6 @@ stdenv.mkDerivation rec {
javaWithNixHacks = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; };
protobufWithNixHacks = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
# downstream packages using buildBazelPackage
# fixed-output hashes of the fetch phase need to be spot-checked manually
downstream = recurseIntoAttrs ({
inherit bazel-watcher;
});
};
src_for_updater = stdenv.mkDerivation rec {