Add bazel 1.2.1

NixOS · Mar 2, 2020 · 1c4f22a · 1c4f22a
1 parent 4eb9e9a
commit 1c4f22a
Show file tree

Hide file tree

Showing 6 changed files with 1,157 additions and 5 deletions.
diff --git a/...nt/tools/build-managers/bazel/default.nix → ...d-managers/bazel/bazel-latest/default.nix b/...nt/tools/build-managers/bazel/default.nix → ...d-managers/bazel/bazel-latest/default.nix
@@ -160,7 +160,7 @@ stdenv.mkDerivation rec {
     # On Darwin, the last argument to gcc is coming up as an empty string. i.e: ''
     # This is breaking the build of any C target. This patch removes the last
     # argument if it's found to be an empty string.
-    ./trim-last-argument-to-gcc-if-empty.patch
+    ../trim-last-argument-to-gcc-if-empty.patch
 
     # --experimental_strict_action_env (which may one day become the default
     # see bazelbuild/bazel#2574) hardcodes the default
@@ -169,17 +169,17 @@ stdenv.mkDerivation rec {
     # So we are replacing this bazel paths by defaultShellPath,
     # improving hermeticity and making it work in nixos.
     (substituteAll {
-      src = ./strict_action_env.patch;
+      src = ../strict_action_env.patch;
       strictActionEnvPatch = defaultShellPath;
     })
 
     # bazel reads its system bazelrc in /etc
     # override this path to a builtin one
     (substituteAll {
-      src = ./bazel_rc.patch;
+      src = ../bazel_rc.patch;
       bazelSystemBazelRCPath = bazelRC;
     })
-  ] ++ lib.optional enableNixHacks ./nix-hacks.patch;
+  ] ++ lib.optional enableNixHacks ../nix-hacks.patch;
 
 
   # Additional tests that check bazel’s functionality. Execute

diff --git a/.../tools/build-managers/bazel/src-deps.json → ...managers/bazel/bazel-latest/src-deps.json b/.../tools/build-managers/bazel/src-deps.json → ...managers/bazel/bazel-latest/src-deps.json