diff options
| author | John Ericson <git@JohnEricson.me> | 2020-04-01 16:33:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-01 16:33:20 -0400 |
| commit | a5480d09dd3899cba3ff448044bbeb86a7dbc50e (patch) | |
| tree | 7b2195222e3af940557519fe1d935510df8c99e0 /pkgs/development | |
| parent | b31f8d9b0576ec2c71698a91c3ae86f5cfad467d (diff) | |
| parent | 6bf6ec8a96a0638bbea250a3d6783e65e497c09d (diff) | |
| download | nixlib-a5480d09dd3899cba3ff448044bbeb86a7dbc50e.tar nixlib-a5480d09dd3899cba3ff448044bbeb86a7dbc50e.tar.gz nixlib-a5480d09dd3899cba3ff448044bbeb86a7dbc50e.tar.bz2 nixlib-a5480d09dd3899cba3ff448044bbeb86a7dbc50e.tar.lz nixlib-a5480d09dd3899cba3ff448044bbeb86a7dbc50e.tar.xz nixlib-a5480d09dd3899cba3ff448044bbeb86a7dbc50e.tar.zst nixlib-a5480d09dd3899cba3ff448044bbeb86a7dbc50e.zip | |
Merge pull request #84028 from obsidiansystems/consistent-bazel-ref
bazel-*: Consistently self reference
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/bazel/bazel_1/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/bazel/bazel_2/default.nix (renamed from pkgs/development/tools/build-managers/bazel/bazel-latest/default.nix) | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/bazel/bazel_2/src-deps.json (renamed from pkgs/development/tools/build-managers/bazel/bazel-latest/src-deps.json) | 0 |
4 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix index 68adddebb0ac..19d33235a340 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix @@ -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"; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix index ffb5714631ca..1c731a0b9e25 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix @@ -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"; diff --git a/pkgs/development/tools/build-managers/bazel/bazel-latest/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_2/default.nix index 6c12003b9649..2de8f683d308 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-latest/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_2/default.nix @@ -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"; diff --git a/pkgs/development/tools/build-managers/bazel/bazel-latest/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_2/src-deps.json index 7517a8c1b958..7517a8c1b958 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-latest/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/bazel_2/src-deps.json |