dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

bazel-*: Consistently self reference

Browse Source 
Using `bazel_self` for self-references makes managing bazel versions
easier: their less risk of changing defaults or copy pasted code for no
versions leading to incorrect self-references.
This commit is contained in:
John Ericson 2020-04-01 16:12:46 -04:00
parent 4a4b44803c
commit 6f94f8fd3f
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub { stdenv, callPackage, lib, fetchurl, fetchFromGitHub
, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs
# this package (through the fixpoint glass) # this package (through the fixpoint glass)
, bazel_1 , bazel_self
, lr, xe, zip, unzip, bash, writeCBin, coreutils , lr, xe, zip, unzip, bash, writeCBin, coreutils
, which, gawk, gnused, gnutar, gnugrep, gzip, findutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils
# updater # updater
@ -247,7 +247,7 @@ stdenv.mkDerivation rec {
touch $out touch $out
''); '');
bazelWithNixHacks = bazel_1.override { enableNixHacks = true; }; bazelWithNixHacks = bazel_self.override { enableNixHacks = true; };
bazel-examples = fetchFromGitHub { bazel-examples = fetchFromGitHub {
owner = "bazelbuild"; owner = "bazelbuild";

4
pkgs/development/tools/build-managers/bazel/bazel_1/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub { stdenv, callPackage, lib, fetchurl, fetchFromGitHub
, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs
# this package (through the fixpoint glass) # this package (through the fixpoint glass)
, bazel_1 , bazel_self
, lr, xe, zip, unzip, bash, writeCBin, coreutils , lr, xe, zip, unzip, bash, writeCBin, coreutils
, which, gawk, gnused, gnutar, gnugrep, gzip, findutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils
# updater # updater
@ -247,7 +247,7 @@ stdenv.mkDerivation rec {
touch $out touch $out
''); '');
bazelWithNixHacks = bazel_1.override { enableNixHacks = true; }; bazelWithNixHacks = bazel_self.override { enableNixHacks = true; };
bazel-examples = fetchFromGitHub { bazel-examples = fetchFromGitHub {
owner = "bazelbuild"; owner = "bazelbuild";

4
pkgs/development/tools/build-managers/bazel/bazel-latest/default.nix → pkgs/development/tools/build-managers/bazel/bazel_2/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub { stdenv, callPackage, lib, fetchurl, fetchFromGitHub
, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs
# this package (through the fixpoint glass) # this package (through the fixpoint glass)
, bazel , bazel_self
, lr, xe, zip, unzip, bash, writeCBin, coreutils , lr, xe, zip, unzip, bash, writeCBin, coreutils
, which, gawk, gnused, gnutar, gnugrep, gzip, findutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils
# updater # updater
@ -246,7 +246,7 @@ stdenv.mkDerivation rec {
touch $out touch $out
''); '');
bazelWithNixHacks = bazel.override { enableNixHacks = true; }; bazelWithNixHacks = bazel_self.override { enableNixHacks = true; };
bazel-examples = fetchFromGitHub { bazel-examples = fetchFromGitHub {
owner = "bazelbuild"; owner = "bazelbuild";

0
pkgs/development/tools/build-managers/bazel/bazel-latest/src-deps.json → pkgs/development/tools/build-managers/bazel/bazel_2/src-deps.json
View File

21
pkgs/top-level/all-packages.nix
View File

@ -9698,14 +9698,7 @@ in
bam = callPackage ../development/tools/build-managers/bam {}; bam = callPackage ../development/tools/build-managers/bam {};
bazel = callPackage ../development/tools/build-managers/bazel/bazel-latest { bazel = bazel_2;
inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
buildJdk = jdk8;
buildJdkName = "jdk8";
runJdk = jdk11_headless;
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
};
bazel_0 = bazel_0_26; bazel_0 = bazel_0_26;
@ -9725,6 +9718,7 @@ in
buildJdkName = "jdk8"; buildJdkName = "jdk8";
runJdk = jdk11_headless; runJdk = jdk11_headless;
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
bazel_self = bazel_0_29;
}; };
bazel_1 = callPackage ../development/tools/build-managers/bazel/bazel_1 { bazel_1 = callPackage ../development/tools/build-managers/bazel/bazel_1 {
@ -9734,6 +9728,17 @@ in
buildJdkName = "jdk8"; buildJdkName = "jdk8";
runJdk = jdk11_headless; runJdk = jdk11_headless;
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
bazel_self = bazel_1;
};
bazel_2 = callPackage ../development/tools/build-managers/bazel/bazel_2 {
inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
buildJdk = jdk8;
buildJdkName = "jdk8";
runJdk = jdk11_headless;
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
bazel_self = bazel_2;
}; };
bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { };