nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 15:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55035 from uri-canva/bazel-deps

Browse Source 
bazel-deps: 2018-11-01 -> 2019-02-01
This commit is contained in:
Ryan Mulligan 2019-02-17 06:49:31 -08:00 committed by GitHub
commit a954ca52e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/build-bazel-package/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, bazel, enableNixHacks ? true }:
{ stdenv, bazel, cacert, enableNixHacks ? true }:
args@{ name, bazelFlags ? [], bazelTarget, buildAttrs, fetchAttrs, ... }:
@ -20,6 +20,8 @@ in stdenv.mkDerivation (fBuildAttrs // {
export bazelOut="$(echo ''${NIX_BUILD_TOP}/output | sed -e 's,//,/,g')"
export bazelUserRoot="$(echo ''${NIX_BUILD_TOP}/tmp | sed -e 's,//,/,g')"
export HOME="$NIX_BUILD_TOP"
# This is needed for git_repository with https remotes
export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt"
'';
buildPhase = fFetchAttrs.buildPhase or ''

3
pkgs/development/tools/bazel-watcher/default.nix
View File

@ -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 = ''

8
pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix
View File

@ -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 = {