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: 2099f0afccd3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bec5ffee155f
Choose a head ref
  • 7 commits
  • 13 files changed
  • 2 contributors

Commits on May 17, 2017

  1. linux cross stdenv: Use the cross stdenv and nativeBuildInputs

    This is a cross derivation---it's built on one platform to run on
    another---so let's structure it like all the other cross derivations.
    Ericson2314 committed May 17, 2017
    Copy the full SHA
    bfa8f30 View commit details
  2. binutils on darwin: Clean up the rats nest

     - No more *Cross duplication for binutils on darwin either.
       `cctools_cross` is merged into plain `cctools`, so `buildPackages`
       chains alone are used to disambiguate.
    
     - Always use a mashup of cctools and actual GNU Binutils as `binutils`.
       Previously, this was only done in the native case as nobody had
       bothered to implement the masher in the cross case. Implemented it
       basically consisted of extending the wrapper to deal with prefixed
       binaries.
    Ericson2314 committed May 17, 2017
    Copy the full SHA
    88ea646 View commit details
  3. binutils and cctools: Prefix derivation names with target for cross

    We want platform triple prefixes and suffixes on derivation names to
    be used consistently. The ideom this commit strives for is
    
     - suffix means build != host, i.e. cross *built* packages. This is
       already done.
    
     - prefix means build != target, i.e. cross tools. This matches the
       tradition of such binaries themselves being prefixed to disambiguate.]
       Binutils and cctools, as build tools, now use the latter
    Ericson2314 committed May 17, 2017
    Copy the full SHA
    7018dfb View commit details
  4. gcc: When cross compiling, always expect prefixed binutils

    Previously this was just done on Darwin.
    Ericson2314 committed May 17, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    20fa6fd View commit details
  5. release-cross: Add arms test from Darwin for binutils

    This does a decent job of testing everything in this PR up to here.
    Ericson2314 committed May 17, 2017
    Copy the full SHA
    d34079c View commit details
  6. lib platform parsing: Whitelist darwin10 and darwin14 as stopgap

    Something better should be done longer term to support such version
    suffixes.
    Ericson2314 committed May 17, 2017
    Copy the full SHA
    80ed251 View commit details
  7. 1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    bec5ffe View commit details
Loading