diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-04-01 16:12:46 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-04-01 16:16:26 -0400 |
| commit | 6f94f8fd3f4a31557abb4c44e62bc80efc2b69b5 (patch) | |
| tree | 9eb7e40bc0751cff130953cff5ccaa05766e9552 /pkgs/development | |
| parent | 4a4b44803cdc5c1bd4458d77aec71cb9e374d837 (diff) | |
| download | nixlib-6f94f8fd3f4a31557abb4c44e62bc80efc2b69b5.tar nixlib-6f94f8fd3f4a31557abb4c44e62bc80efc2b69b5.tar.gz nixlib-6f94f8fd3f4a31557abb4c44e62bc80efc2b69b5.tar.bz2 nixlib-6f94f8fd3f4a31557abb4c44e62bc80efc2b69b5.tar.lz nixlib-6f94f8fd3f4a31557abb4c44e62bc80efc2b69b5.tar.xz nixlib-6f94f8fd3f4a31557abb4c44e62bc80efc2b69b5.tar.zst nixlib-6f94f8fd3f4a31557abb4c44e62bc80efc2b69b5.zip | |
bazel-*: Consistently self reference
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.
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 7fa7b9737b30..4bd45f9cf655 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 @@ -246,7 +246,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 171b1f9fc64e..171b1f9fc64e 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 |