diff options
| author | Ryan Mulligan <ryan@ryantm.com> | 2019-02-17 06:49:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-17 06:49:31 -0800 |
| commit | a954ca52e5a2204e15bb7da67bfe8a7775e68d9b (patch) | |
| tree | 963c5ed84ea4bf59576c18e7b9c9e76d173da138 /pkgs/development | |
| parent | f56693f25a89e4c7fc18623870b8e0922f91d7a7 (diff) | |
| parent | 2b2854e5221a1e551c60f8b5f36870c4eb83b647 (diff) | |
| download | nixpkgs-a954ca52e5a2204e15bb7da67bfe8a7775e68d9b.tar nixpkgs-a954ca52e5a2204e15bb7da67bfe8a7775e68d9b.tar.gz nixpkgs-a954ca52e5a2204e15bb7da67bfe8a7775e68d9b.tar.bz2 nixpkgs-a954ca52e5a2204e15bb7da67bfe8a7775e68d9b.tar.lz nixpkgs-a954ca52e5a2204e15bb7da67bfe8a7775e68d9b.tar.xz nixpkgs-a954ca52e5a2204e15bb7da67bfe8a7775e68d9b.tar.zst nixpkgs-a954ca52e5a2204e15bb7da67bfe8a7775e68d9b.zip | |
Merge pull request #55035 from uri-canva/bazel-deps
bazel-deps: 2018-11-01 -> 2019-02-01
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/tools/bazel-watcher/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 3f952ef7140..5bb1825d035 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -29,9 +29,6 @@ buildBazelPackage rec { # tell rules_go to use the Go binary found in the PATH sed -e 's:go_register_toolchains():go_register_toolchains(go_version = "host"):g' -i WORKSPACE - - # tell rules_go to invoke GIT with custom CAINFO path - export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt" ''; preInstall = '' diff --git a/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix index 142f729517d..6fdb5734507 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix @@ -2,7 +2,7 @@ buildBazelPackage rec { name = "bazel-deps-${version}"; - version = "2018-11-01"; + version = "2019-02-01"; meta = with stdenv.lib; { homepage = "https://github.com/johnynek/bazel-deps"; @@ -15,8 +15,8 @@ buildBazelPackage rec { src = fetchFromGitHub { owner = "johnynek"; repo = "bazel-deps"; - rev = "1af8921d52f053fad575f26762533a3823b4a847"; - sha256 = "0srz0sbz4bq9n7cp4g1n3kd3j6rcjqfi25sq8aa64l27yqzbk53x"; + rev = "6585033409e09028852403ec15ec0c77851234be"; + sha256 = "0hypf7mcbpx2djqm92k82vn1k6pbnv564xbnazx8nw60f6ns0x87"; }; bazelTarget = "//src/scala/com/github/johnynek/bazel_deps:parseproject_deploy.jar"; @@ -66,7 +66,7 @@ buildBazelPackage rec { find . -type d -empty -delete ''; - sha256 = "1gvl4a9z8p4ch2gmcj3lpp0imrkrvy8wng949p3wlkibi14hc6ww"; + sha256 = "1yirrzhhrsmbgd27fg709plhrhyi8pzwqv84yg72sd3799kswh9m"; }; buildAttrs = { |