diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2021-04-11 04:20:00 +0000 |
|---|---|---|
| committer | Mario Rodas <marsam@users.noreply.github.com> | 2021-04-11 04:20:00 +0000 |
| commit | ec2e4b2d74b6a691e5ae42ece559462dc75cf51d (patch) | |
| tree | 78b885153bf04dabafda06802dc60cdb5c5df904 | |
| parent | df57532baf20c5cff73411f56d47befb51834866 (diff) | |
| download | nixpkgs-ec2e4b2d74b6a691e5ae42ece559462dc75cf51d.tar nixpkgs-ec2e4b2d74b6a691e5ae42ece559462dc75cf51d.tar.gz nixpkgs-ec2e4b2d74b6a691e5ae42ece559462dc75cf51d.tar.bz2 nixpkgs-ec2e4b2d74b6a691e5ae42ece559462dc75cf51d.tar.lz nixpkgs-ec2e4b2d74b6a691e5ae42ece559462dc75cf51d.tar.xz nixpkgs-ec2e4b2d74b6a691e5ae42ece559462dc75cf51d.tar.zst nixpkgs-ec2e4b2d74b6a691e5ae42ece559462dc75cf51d.zip | |
bazel-buildtools: 3.5.0 -> 4.0.1
| -rw-r--r-- | pkgs/development/tools/build-managers/bazel/buildtools/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/bazel/buildtools/deps.nix | 20 |
2 files changed, 11 insertions, 27 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 441254ce263..e181917c417 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -1,19 +1,23 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "bazel-buildtools"; - version = "3.5.0"; - - goPackagePath = "github.com/bazelbuild/buildtools"; + version = "4.0.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; rev = version; - sha256 = "179k0kwh7i2azkhk8dw7ac50a05q7n3i29pqaf69yw7jrpbf8k85"; + sha256 = "0q7b9zh38vblqs5lwhjk28km89p706aky4wv6bwz2vg9gl6bfclq"; }; - goDeps = ./deps.nix; + vendorSha256 = "1w6i1lb72mfdyb901gpl9yc6ql73j5kik6li0j5jv5ab2m3j9qvf"; + + preBuild = '' + rm -r warn/docs + ''; + + doCheck = false; excludedPackages = [ "generatetables" ]; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix deleted file mode 100644 index a64f96d2c07..00000000000 --- a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "84668698ea25b64748563aa20726db66a6b8d299"; - sha256 = "1gkd1942vk9n8kfzdwy1iil6wgvlwjq7a3y5jc49ck4lz9rhmgkq"; - }; - } - { - goPackagePath = "go.starlark.net"; - fetch = { - type = "git"; - url = "https://github.com/google/starlark-go"; - rev = "6677ee5c7211380ec7e6a1b50dc45287e40ca9e1"; - sha256 = "1dl8q1lwvmm38w2lzfwray2djdcq40z89yy6vzy387w0xrax0jj0"; - }; - } -] |