diff options
author | Colin <486199+c00w@users.noreply.github.com> | 2020-04-28 20:16:20 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-28 20:16:20 -0400 |
commit | 4007ceb6afa4bee457d7248ffcbb19740d2ecd78 (patch) | |
tree | efcaf2ec15bd80fb0aa67a0732b40f8c14115deb /pkgs/development/tools/bazel-watcher | |
parent | c01ac3ed129fafeff69025882b227f8612f0aeb7 (diff) |
treewide get rid of go 1.12 (#83253)
* treewide Drop unneeded go 1.12 overrides
* Fix packr to be go module compatible.
I updated to version 2.8.0 which is the latest on master.
Then due to the 2 different sets of go modules which are used, I split
the build into two different derivations, then merged them togethor
using symlinkJoin to have the same output structure as the existing derivation.
* Remove consul dependency on go1.12
I updated the consul version to 1.7.2 and flipped it to building using
modules.
* Remove go1.12 from perkeep.
Update the version to the latest unstable on master.
* Update scaleway-cli to not be pinned to go1.12
Switched the version to 1.20
* Update prometheus-varnish-exporter to not depend on go1.12
* Update lnd to build with go1.12
Updated the version
Forced only building subpackages with main to prevent panics over
multiple modules in one repo
* Remove go1.12 from openshift
Had to update the version to 4.1.0 and do a bit of munging to get this
to work
* Remove go1.12 completely.
These are no longer needed.
* Update bazel-watcher and make it build with go 1.14
Diffstat (limited to 'pkgs/development/tools/bazel-watcher')
-rw-r--r-- | pkgs/development/tools/bazel-watcher/default.nix | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 27c72b351e73..9cdd72eeaaf4 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -5,35 +5,29 @@ , go , python , stdenv +, iana-etc +, mailcap +, tzdata }: let patches = [ ./use-go-in-path.patch - - # update rules_go to fix the build. Remove these when updating past 0.10.3 - (fetchpatch { - url = "https://github.com/bazelbuild/bazel-watcher/commit/686130f50cea274f7453f6abc8c5249654047462.patch"; - sha256 = "0rzs01sfiinl5d3dq9sx1bhl8kkzppdwh964fr7bzafqcxv5llmb"; - }) - (fetchpatch { - url = "https://github.com/bazelbuild/bazel-watcher/commit/18bdb44832ccc533e0ab3923ef80060eeb24582d.patch"; - sha256 = "0k5hvlxlg4n092d53cbfxqqhzc6f1jv4licdhhi1dhckkhb4sdk6"; - }) ]; in buildBazelPackage rec { name = "bazel-watcher-${version}"; - version = "0.10.3"; + version = "0.13.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${version}"; - sha256 = "17z4nqqsdrainbh8fmhf6sgrxwf7aknadmn94z1yqpxa7kb9x33v"; + sha256 = "1fc3sp79znbbq1yjap56lham72n7cap8yfghpzrzmpl5brybjkvm"; }; nativeBuildInputs = [ go git python ]; + removeRulesCC = false; bazelTarget = "//ibazel"; @@ -55,6 +49,10 @@ buildBazelPackage rec { rm -rf $bazelOut/external/{go_sdk,\@go_sdk.marker} sed -e '/^FILE:@go_sdk.*/d' -i $bazelOut/external/\@*.marker + # Retains go build input markers + chmod -R 755 $bazelOut/external/{bazel_gazelle_go_repository_cache,@\bazel_gazelle_go_repository_cache.marker} + rm -rf $bazelOut/external/{bazel_gazelle_go_repository_cache,@\bazel_gazelle_go_repository_cache.marker} + # Remove the gazelle tools, they contain go binaries that are built # non-deterministically. As long as the gazelle version matches the tools # should be equivalent. @@ -62,7 +60,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "0cmj186n2y1g9kkdhcivmh2qvigvpnbp03m575b7hgsxi1cp3ssj"; + sha256 = "0wj573dcirssr2cmq90b4yl57mv3gsxaj1s26afvkz1dvyxmq7sz"; }; buildAttrs = { |