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: 84e34cbde2ea
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: dc423728091b
Choose a head ref
  • 7 commits
  • 4 files changed
  • 1 contributor

Commits on May 9, 2019

  1. release-cross: remove androidndk 

    It is no longer provided
    @matthewbauer
    matthewbauer committed May 9, 2019
    Copy the full SHA
    1671eed View commit details
    Browse the repository at this point in the history

  2. androidenv: add more context to os not found error 

    We don’t have android sdk available for aarch64, so this error happens
a lot. Adding some context on what is going on makes this clearer.
    @matthewbauer
    matthewbauer committed May 9, 2019
    Copy the full SHA
    4acc434 View commit details
    Browse the repository at this point in the history

  3. mesa: use platforms instead of throw 

    mesaPlatforms can be used in the platforms attr.
    @matthewbauer
    matthewbauer committed May 9, 2019
    Copy the full SHA
    9225890 View commit details
    Browse the repository at this point in the history

  4. mesa: don’t use valgrind-light on aarch32 

    valgrind-light doesn’t appear to work correctly on aarch32. It’s also
not a required dependency on mesa, so in the future we may be able to
disable it for other platforms
    @matthewbauer
    matthewbauer committed May 9, 2019
    Copy the full SHA
    476c580 View commit details
    Browse the repository at this point in the history

  5. busybox: only use stdenv.cc.libc.static when it exists 

    causes on evaluation error on macOS otherwise
    @matthewbauer
    matthewbauer committed May 9, 2019
    Copy the full SHA
    dbd1a44 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2019

  1. Merge branch 'staging' into release-cross-fixes

    @matthewbauer
    matthewbauer committed May 18, 2019
    Copy the full SHA
    872100c View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2019

  1. Merge pull request #61168 from matthewbauer/release-cross-fixes 

    release-cross.nix changes/fixes
    @matthewbauer
    matthewbauer committed Jun 4, 2019
    Copy the full SHA
    dc42372 View commit details
    Browse the repository at this point in the history