Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6373b7ac51ac
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a484c07d84f1
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Oct 22, 2019

  1. bazel: 1.0 -> 1.1

    @danjuv
    danjuv committed Oct 22, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    dadada Tim Schubert
    GPG key ID: EEB8D1CE62C4DFEA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    76af684 View commit details

Commits on Oct 24, 2019

  1. bazel: exclude tests.shebang from running on darwin

    @Profpatsch
    Profpatsch committed Oct 24, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    dadada Tim Schubert
    GPG key ID: EEB8D1CE62C4DFEA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fbd06ad View commit details

  2. Merge pull request #71612 from danjuv/master 

    bazel: 1.0 -> 1.1
    @flokli
    flokli authored Oct 24, 2019
    Copy the full SHA
    a484c07 View commit details
Showing with 25 additions and 23 deletions.
  1. +9 −7 pkgs/development/tools/build-managers/bazel/default.nix
  2. +16 −16 pkgs/development/tools/build-managers/bazel/src-deps.json
16 changes: 9 additions & 7 deletions pkgs/development/tools/build-managers/bazel/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
@@ -222,8 +222,10 @@ stdenv.mkDerivation rec {
sha256 = "03c1bwlq5bs3hg96v4g4pg2vqwhqq6w538h66rcpw02f83yy7fs8";
};

in {
in (if !stdenv.hostPlatform.isDarwin then {
# `extracted` doesn’t work on darwin
shebang = callPackage ./shebang-test.nix { inherit runLocal extracted bazelTest distDir; };
} else {}) // {
bashTools = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; };
cpp = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; };
java = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; };
32 changes: 16 additions & 16 deletions pkgs/development/tools/build-managers/bazel/src-deps.json
View file
Original file line number Diff line number Diff line change
@@ -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": {