summary refs log tree commit diff
diff options
context:
space:
mode:
authorDanju Visvanathan <danju@canva.com>2019-10-22 14:18:12 +1100
committerDanju Visvanathan <danju@canva.com>2019-10-22 14:18:12 +1100
commit76af684141cfcf82f60dbcff366a854484e4290b (patch)
treeadf7047b1cd9d237325a3a072f9b9d9aa148fa0a
parent36ffad1d7e7b71696548cfddf37120d18cbb3972 (diff)
downloadnixpkgs-76af684141cfcf82f60dbcff366a854484e4290b.tar
nixpkgs-76af684141cfcf82f60dbcff366a854484e4290b.tar.gz
nixpkgs-76af684141cfcf82f60dbcff366a854484e4290b.tar.bz2
nixpkgs-76af684141cfcf82f60dbcff366a854484e4290b.tar.lz
nixpkgs-76af684141cfcf82f60dbcff366a854484e4290b.tar.xz
nixpkgs-76af684141cfcf82f60dbcff366a854484e4290b.tar.zst
nixpkgs-76af684141cfcf82f60dbcff366a854484e4290b.zip
bazel: 1.0 -> 1.1
-rw-r--r--pkgs/development/tools/build-managers/bazel/default.nix12
-rw-r--r--pkgs/development/tools/build-managers/bazel/src-deps.json32
2 files changed, 22 insertions, 22 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index d5cbd642e70..4bd74ad95b5 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -22,11 +22,11 @@
 }:
 
 let
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    sha256 = "1b4c9wav5zsldlwzsb064z3m5l4ns8i90bsvd5f215fxd45sy7f6";
+    sha256 = "1awm5wa4y4c37zy7d1ass83amwq5992wydkj5v9jx0zp7b4shrjb";
   };
 
   # Update with `eval $(nix-build -A bazel.updater)`,
@@ -46,11 +46,11 @@ let
       srcs.io_bazel_rules_sass
       srcs.platforms
       (if stdenv.hostPlatform.isDarwin
-       then srcs."java_tools_javac11_darwin-v5.1.zip"
-       else srcs."java_tools_javac11_linux-v5.1.zip")
+       then srcs."java_tools_javac11_darwin-v6.1.zip"
+       else srcs."java_tools_javac11_linux-v6.1.zip")
       srcs."coverage_output_generator-v2.0.zip"
       srcs.build_bazel_rules_nodejs
-      srcs."android_tools_pkg-0.10.tar.gz"
+      srcs."android_tools_pkg-0.11.tar.gz"
       srcs."0.28.3.tar.gz"
       srcs.rules_pkg
       srcs.rules_cc
@@ -107,7 +107,7 @@ let
   remote_java_tools = stdenv.mkDerivation {
     name = "remote_java_tools_${system}";
 
-    src = srcDepsSet."java_tools_javac11_${system}-v5.1.zip";
+    src = srcDepsSet."java_tools_javac11_${system}-v6.1.zip";
 
     nativeBuildInputs = [ autoPatchelfHook unzip ];
     buildInputs = [ gcc-unwrapped ];
diff --git a/pkgs/development/tools/build-managers/bazel/src-deps.json b/pkgs/development/tools/build-managers/bazel/src-deps.json
index 5b9256c1e13..152cce5093e 100644
--- a/pkgs/development/tools/build-managers/bazel/src-deps.json
+++ b/pkgs/development/tools/build-managers/bazel/src-deps.json
@@ -55,11 +55,11 @@
             "https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz"
         ]
     },
-    "android_tools_pkg-0.10.tar.gz": {
-        "name": "android_tools_pkg-0.10.tar.gz",
-        "sha256": "9c5081f93276fefb3db7ca61cc1225ff6d1913e7e315568265bb1a728265a9b1",
+    "android_tools_pkg-0.11.tar.gz": {
+        "name": "android_tools_pkg-0.11.tar.gz",
+        "sha256": "6fc50151063bffdda700038ea7df99c89d54dc066e9377a5baff60d55d482ad2",
         "urls": [
-            "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.10.tar.gz"
+            "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.11.tar.gz"
         ]
     },
     "bazel_j2objc": {
@@ -165,25 +165,25 @@
             "https://github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz"
         ]
     },
-    "java_tools_javac11_darwin-v5.1.zip": {
-        "name": "java_tools_javac11_darwin-v5.1.zip",
-        "sha256": "2fa01b4cb69e33f85a96ba0620a2e6261f789eefdbeaeb1d2879140b50108db7",
+    "java_tools_javac11_darwin-v6.1.zip": {
+        "name": "java_tools_javac11_darwin-v6.1.zip",
+        "sha256": "f0c488dac18f18ab1a0d18bbd65288c7a128e90a24d9c16f65bd8243f79483a0",
         "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v5.1/java_tools_javac11_darwin-v5.1.zip"
+            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v6.1/java_tools_javac11_darwin-v6.1.zip"
         ]
     },
-    "java_tools_javac11_linux-v5.1.zip": {
-        "name": "java_tools_javac11_linux-v5.1.zip",
-        "sha256": "ea2ee2f9eab37e04eae5aa8a266373132fe57676c25ea033504bc5438d6bc1ba",
+    "java_tools_javac11_linux-v6.1.zip": {
+        "name": "java_tools_javac11_linux-v6.1.zip",
+        "sha256": "12f7940ed0bc4c2e82238951cdf19b4179c7dcc361d16fe40fe4266538fb4ac6",
         "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v5.1/java_tools_javac11_linux-v5.1.zip"
+            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v6.1/java_tools_javac11_linux-v6.1.zip"
         ]
     },
-    "java_tools_javac11_windows-v5.1.zip": {
-        "name": "java_tools_javac11_windows-v5.1.zip",
-        "sha256": "b2cfebc049c349268a7ca0e5ff37160899f87f6fe6a80a789de3df90db4ce4ef",
+    "java_tools_javac11_windows-v6.1.zip": {
+        "name": "java_tools_javac11_windows-v6.1.zip",
+        "sha256": "e2deb2efff684de78787e0bdc7620f9672d13f04a12856d8e7f677369a8e286b",
         "urls": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v5.1/java_tools_javac11_windows-v5.1.zip"
+            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v6.1/java_tools_javac11_windows-v6.1.zip"
         ]
     },
     "java_tools_langtools_javac10": {