diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2020-02-20 04:20:00 -0500 |
---|---|---|
committer | Mario Rodas <marsam@users.noreply.github.com> | 2020-02-20 04:20:00 -0500 |
commit | 3dd0593020532dee552929b3be089865099dca93 (patch) | |
tree | 390526e2a57963818ff6f4c877e9423ce67f44b5 | |
parent | b43ec412bbd52a96d8189caf3593e66f02c44292 (diff) | |
download | nixpkgs-3dd0593020532dee552929b3be089865099dca93.tar nixpkgs-3dd0593020532dee552929b3be089865099dca93.tar.gz nixpkgs-3dd0593020532dee552929b3be089865099dca93.tar.bz2 nixpkgs-3dd0593020532dee552929b3be089865099dca93.tar.lz nixpkgs-3dd0593020532dee552929b3be089865099dca93.tar.xz nixpkgs-3dd0593020532dee552929b3be089865099dca93.tar.zst nixpkgs-3dd0593020532dee552929b3be089865099dca93.zip |
bazel-buildtools: 0.29.0 -> 1.0.0
-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 | 9 |
2 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index fc5f98a8ccb..bd95e2b6340 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -1,20 +1,24 @@ -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "bazel-buildtools"; - version = "0.29.0"; - rev = "5bcc31df55ec1de770cb52887f2e989e7068301f"; + version = "1.0.0"; goPackagePath = "github.com/bazelbuild/buildtools"; - src = fetchgit { - inherit rev; - url = "https://github.com/bazelbuild/buildtools"; - sha256 = "0p2kgyawh3l46h7dzglqh9c7i16zr5mhmqlhy7qvr4skwif1l089"; + src = fetchFromGitHub { + owner = "bazelbuild"; + repo = "buildtools"; + rev = version; + sha256 = "1rgz1bpg2db6z4q04z061h5b9qjk8padi71xyjcwqfchwqpl7hiv"; }; goDeps = ./deps.nix; + excludedPackages = [ "generatetables" ]; + + buildFlagsArray = [ "-ldflags=-s -w -X main.buildVersion=${version} -X main.buildScmRevision=${src.rev}" ]; + meta = with stdenv.lib; { description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps."; homepage = https://github.com/bazelbuild/buildtools; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix index 4aaa37aa9a7..38be0dedc37 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix @@ -1,12 +1,11 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { goPackagePath = "github.com/golang/protobuf"; fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "4c88cc3f1a34ffade77b79abc53335d1e511f25b"; - sha256 = "0chbdc4q55z7myiwnbvhryc5ihf6cxh8p4w3c1imy2gyzjn9sf4r"; + rev = "d23c5127dc24889085f8ccea5c9d560a57a879d8"; + sha256 = "1cyyr52yhj3fzrily3rmsbqyj8va4ld75lmry0857m39rgpv8sy1"; }; } { @@ -14,8 +13,8 @@ fetch = { type = "git"; url = "https://github.com/google/starlark-go"; - rev = "988906f77f657477aa7ebf4d8fb5f12d6c50b767"; - sha256 = "0ivmbcq3avaxj8ixbc60h706d6wk9wi2mnsid6a483ia4yn7w9k8"; + rev = "6677ee5c7211380ec7e6a1b50dc45287e40ca9e1"; + sha256 = "1dl8q1lwvmm38w2lzfwray2djdcq40z89yy6vzy387w0xrax0jj0"; }; } ] |