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
base: 5d4f0de6891d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 9e9fec640eda
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 10, 2019

  1. bazel: greatly reduce time spent substituting, be smart which files 

    Files inspected: 2756 -> 40
Total size of inspected files: 20M -> 1016K
    @dtzWill @Profpatsch
    dtzWill authored and Profpatsch committed Jan 10, 2019
    Copy the full SHA
    7e31406 View commit details
    Browse the repository at this point in the history

  2. bazel: 0.20.0 -> 0.21.0 

    0.21 removed the bundled openjdk-distribution. Instead, tries to fetch
the “right” distribution on-the-fly when building.
So we need to provide our own openjdk.

According to
bazelbuild/bazel#6865 (comment)
we should set `--host_javabase="@local_jdk//:jdk` if we want to do
that. This uses the jdk that is currently in the environment, which is
openjdk 8 in our case. 0.21 defaulted to a toolchain for JDK9, which
we don’t package in nixpkgs, so we use the JDK8 toolchain.

This commit also replaces the line-number-based sed invocations with
something more stable.
    @Profpatsch
    Profpatsch committed Jan 10, 2019
    Copy the full SHA
    9e9fec6 View commit details
    Browse the repository at this point in the history