From 6f94f8fd3f4a31557abb4c44e62bc80efc2b69b5 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 1 Apr 2020 16:12:46 -0400 Subject: [PATCH] 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. --- .../bazel/bazel_0_29/default.nix | 4 ++-- .../build-managers/bazel/bazel_1/default.nix | 4 ++-- .../{bazel-latest => bazel_2}/default.nix | 4 ++-- .../{bazel-latest => bazel_2}/src-deps.json | 0 pkgs/top-level/all-packages.nix | 21 ++++++++++++------- 5 files changed, 19 insertions(+), 14 deletions(-) rename pkgs/development/tools/build-managers/bazel/{bazel-latest => bazel_2}/default.nix (99%) rename pkgs/development/tools/build-managers/bazel/{bazel-latest => bazel_2}/src-deps.json (100%) 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 68adddebb0a..19d33235a34 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 ffb5714631c..1c731a0b9e2 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 similarity index 99% rename from pkgs/development/tools/build-managers/bazel/bazel-latest/default.nix rename to pkgs/development/tools/build-managers/bazel/bazel_2/default.nix index 7fa7b9737b3..4bd45f9cf65 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 similarity index 100% rename from pkgs/development/tools/build-managers/bazel/bazel-latest/src-deps.json rename to pkgs/development/tools/build-managers/bazel/bazel_2/src-deps.json diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d5c7fbb41d..93d0e81599c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9698,14 +9698,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; @@ -9725,6 +9718,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 { @@ -9734,6 +9728,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 { };