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: 593062ddc210
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 30d24a2e3f82
Choose a head ref
  • 2 commits
  • 0 files changed
  • 2 contributors

Commits on Sep 26, 2018

  1. stdenv: partial revert of f2bb59e 

    /cc @Ericson2314

PR was #46857

This line broke MacOS cross compilation. paxctl cannot be built on
macOS. Maybe it can be fixed, but no reason to break things
unnecessarily.

Regardless, you definitely need to be more careful about backporting.
I think it’s fine to move fast and break things on master but
with release-18.09 we should be more careful. Something like more
automated testing for cross compilation would also be
helpful (hopefully even making it block).

(cherry picked from commit f9c4075)
    @matthewbauer @Ericson2314
    matthewbauer authored and Ericson2314 committed Sep 26, 2018
    Copy the full SHA
    607063f View commit details
    Browse the repository at this point in the history

  2. Merge commit '607063f61be3b19a2da054776b360d9c5b03038a' 

    This gets the partial revert on the common ancestor of master and
staging, easier further devlopment.
    @Ericson2314
    Ericson2314 committed Sep 26, 2018
    Copy the full SHA
    30d24a2 View commit details
    Browse the repository at this point in the history