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: 38cf2c2f30c9
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: da9db091a343
Choose a head ref
  • 6 commits
  • 10 files changed
  • 2 contributors

Commits on May 15, 2018

  1. misc mingw: Get rid of crossConfig and clean up 

    Style of dual implementation and headers derivations is take from
bb7067f.
    @Ericson2314
    Ericson2314 committed May 15, 2018
    2 Configuration menu
    Copy the full SHA
    9be1182 View commit details
    Browse the repository at this point in the history

  2. misc hurd stuff: Get rid of crossConfig 

    This stuff is horribly bit-rotted anyways, but I'm getting rid of
crossConfig so it must be changed.
    @Ericson2314
    Ericson2314 committed May 15, 2018
    Configuration menu
    Copy the full SHA
    84868b8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #40532 from obsidiansystems/mingw-cleanup 

    MinGW, Hurd: Clean ups and crossConfig removal
    @Ericson2314
    Ericson2314 committed May 15, 2018
    Configuration menu
    Copy the full SHA
    7a8f0b3 View commit details
    Browse the repository at this point in the history

  4. pam: Remove crossAttrs 

    It turns out none of this stuff is needed. The docs aren't evenly built
properly anyways so the build trivially succeeds either way, due to what
looks like upstream misunderstanding automake. If I try to build the
docs manually in a cross shell (before and after this change), there's a
make rule error such that some HTML files aren't even attempted to be
built and then a copy fails.

Even if this was all fixed, these been a good number of cross fixes
upstream getting them to use CC_FOR_BUILD and other good stuff, so I
doubt such hacks would be needed.

Progress towards #40531 and #33302.
    @Ericson2314
    Ericson2314 committed May 15, 2018
    Configuration menu
    Copy the full SHA
    29b62e0 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #40538 from obsidiansystems/linux-pam-cross 

    pam: Remove crossAttrs
    @Ericson2314
    Ericson2314 committed May 15, 2018
    Configuration menu
    Copy the full SHA
    f952058 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'upstream/release-18.03' into staging-18.03

    @Ericson2314
    Ericson2314 committed May 15, 2018
    Configuration menu
    Copy the full SHA
    da9db09 View commit details
    Browse the repository at this point in the history