diff options
| author | Claudio Bley <claudio.bley@gmail.com> | 2022-07-05 17:54:40 +0200 |
|---|---|---|
| committer | Claudio Bley <claudio.bley@gmail.com> | 2022-08-01 06:39:12 +0200 |
| commit | 680f5bfc0c1a0de4469a2b77c2caf16793decd2c (patch) | |
| tree | 46cc40facb104a4ead258cd2255bb9c34bcf05e7 | |
| parent | a54fb7fc4ce8a2973097851eabfdb068a19d2211 (diff) | |
| download | nixpkgs-680f5bfc0c1a0de4469a2b77c2caf16793decd2c.tar nixpkgs-680f5bfc0c1a0de4469a2b77c2caf16793decd2c.tar.gz nixpkgs-680f5bfc0c1a0de4469a2b77c2caf16793decd2c.tar.bz2 nixpkgs-680f5bfc0c1a0de4469a2b77c2caf16793decd2c.tar.lz nixpkgs-680f5bfc0c1a0de4469a2b77c2caf16793decd2c.tar.xz nixpkgs-680f5bfc0c1a0de4469a2b77c2caf16793decd2c.tar.zst nixpkgs-680f5bfc0c1a0de4469a2b77c2caf16793decd2c.zip | |
bazel-watcher: 0.14.0 -> 0.16.2
| -rw-r--r-- | pkgs/development/tools/bazel-watcher/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/tools/bazel-watcher/use-go-in-path.patch | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 5b0dd034943..5ec39ffa4c7 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -1,4 +1,5 @@ { buildBazelPackage +, bazel_5 , fetchFromGitHub , git , go @@ -13,18 +14,19 @@ let in buildBazelPackage rec { pname = "bazel-watcher"; - version = "0.14.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${version}"; - sha256 = "0gigl1lg8sb4bj5crvj54329ws4yirldbncs15f96db6vhp0ig7r"; + sha256 = "sha256-yRXta6pPhgIonTL0q9GSzNQg/jHMIeC7xvfVYrZMmnc="; }; nativeBuildInputs = [ go git python3 ]; removeRulesCC = false; + bazel = bazel_5; bazelTarget = "//ibazel"; fetchAttrs = { @@ -32,6 +34,8 @@ buildBazelPackage rec { preBuild = '' patchShebangs . + + echo ${bazel_5.version} > .bazelversion ''; preInstall = '' @@ -56,7 +60,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "1j175z3d4fbi4pl35py7yjq7ywrvwin6id131jv32hx0ck4g1m46"; + sha256 = "sha256-vij20VMBlKTBOACjH+XP4Z15BOmXYvlmErkVgjOln3M="; }; buildAttrs = { @@ -66,10 +70,11 @@ buildBazelPackage rec { patchShebangs . substituteInPlace ibazel/BUILD --replace '{STABLE_GIT_VERSION}' ${version} + echo ${bazel_5.version} > .bazelversion ''; installPhase = '' - install -Dm755 bazel-bin/ibazel/*_pure_stripped/ibazel $out/bin/ibazel + install -Dm755 bazel-bin/ibazel/ibazel_/ibazel $out/bin/ibazel ''; }; diff --git a/pkgs/development/tools/bazel-watcher/use-go-in-path.patch b/pkgs/development/tools/bazel-watcher/use-go-in-path.patch index 010ba56165d..d9d90c9127f 100644 --- a/pkgs/development/tools/bazel-watcher/use-go-in-path.patch +++ b/pkgs/development/tools/bazel-watcher/use-go-in-path.patch @@ -6,7 +6,7 @@ index 51273b6..fcf9ffb 100644 go_rules_dependencies() --go_register_toolchains() +-go_register_toolchains(version = "1.17.6") +go_register_toolchains(go_version = "host") load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") |