mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-22 05:19:00 +02:00
Merge pull request #84028 from obsidiansystems/consistent-bazel-ref
bazel-*: Consistently self reference
This commit is contained in:
commit
a5480d09dd
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub
|
||||
, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs
|
||||
# this package (through the fixpoint glass)
|
||||
, bazel_1
|
||||
, bazel_self
|
||||
, lr, xe, zip, unzip, bash, writeCBin, coreutils
|
||||
, which, gawk, gnused, gnutar, gnugrep, gzip, findutils
|
||||
# updater
|
||||
|
@ -247,7 +247,7 @@ stdenv.mkDerivation rec {
|
|||
touch $out
|
||||
'');
|
||||
|
||||
bazelWithNixHacks = bazel_1.override { enableNixHacks = true; };
|
||||
bazelWithNixHacks = bazel_self.override { enableNixHacks = true; };
|
||||
|
||||
bazel-examples = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub
|
||||
, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs
|
||||
# this package (through the fixpoint glass)
|
||||
, bazel_1
|
||||
, bazel_self
|
||||
, lr, xe, zip, unzip, bash, writeCBin, coreutils
|
||||
, which, gawk, gnused, gnutar, gnugrep, gzip, findutils
|
||||
# updater
|
||||
|
@ -247,7 +247,7 @@ stdenv.mkDerivation rec {
|
|||
touch $out
|
||||
'');
|
||||
|
||||
bazelWithNixHacks = bazel_1.override { enableNixHacks = true; };
|
||||
bazelWithNixHacks = bazel_self.override { enableNixHacks = true; };
|
||||
|
||||
bazel-examples = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub
|
||||
, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs
|
||||
# this package (through the fixpoint glass)
|
||||
, bazel
|
||||
, bazel_self
|
||||
, lr, xe, zip, unzip, bash, writeCBin, coreutils
|
||||
, which, gawk, gnused, gnutar, gnugrep, gzip, findutils
|
||||
# updater
|
||||
|
@ -247,7 +247,7 @@ stdenv.mkDerivation rec {
|
|||
touch $out
|
||||
'');
|
||||
|
||||
bazelWithNixHacks = bazel.override { enableNixHacks = true; };
|
||||
bazelWithNixHacks = bazel_self.override { enableNixHacks = true; };
|
||||
|
||||
bazel-examples = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
|
@ -9884,14 +9884,7 @@ in
|
|||
|
||||
bam = callPackage ../development/tools/build-managers/bam {};
|
||||
|
||||
bazel = callPackage ../development/tools/build-managers/bazel/bazel-latest {
|
||||
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 = bazel_2;
|
||||
|
||||
bazel_0 = bazel_0_26;
|
||||
|
||||
|
@ -9911,6 +9904,7 @@ in
|
|||
buildJdkName = "jdk8";
|
||||
runJdk = jdk11_headless;
|
||||
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 {
|
||||
|
@ -9920,6 +9914,17 @@ in
|
|||
buildJdkName = "jdk8";
|
||||
runJdk = jdk11_headless;
|
||||
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 { };
|
||||
|
|
Loading…
Reference in a new issue