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: 46b03cd5b2ed
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a6ede9f46e54
Choose a head ref
  • 9 commits
  • 9 files changed
  • 2 contributors

Commits on Jul 24, 2018

  1. elfutils: Don't use crossAttrs

    @Ericson2314
    Ericson2314 committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    4116754 View commit details
    Browse the repository at this point in the history

  2. flex: Don't use crossAttrs

    @Ericson2314
    Ericson2314 committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    1833a04 View commit details
    Browse the repository at this point in the history

  3. util-linux: No more crossAttrs 

    More cleanup will come later
    @Ericson2314
    Ericson2314 committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    519e87a View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2018

  1. qt-4.8: Don't use crossAttrs

    @Ericson2314
    Ericson2314 committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    6bee6b8 View commit details
    Browse the repository at this point in the history

  2. stdenv: Remove crossAttrs, now that it is no longer used 

    Fix #33302
    @Ericson2314
    Ericson2314 committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    87b4a5d View commit details
    Browse the repository at this point in the history

  3. stdenv cross adapter: Use extraNativeBuildInputs 

    This means we don't need to hackily avoid overwriting `mkDerivation`.
    @Ericson2314
    Ericson2314 committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    c12b50b View commit details
    Browse the repository at this point in the history

  4. crossLibcStdenv: Just use overrideCC 

    Now that we don't hackily override `mkDerivation`, the TODO is solved
and we just can!
    @Ericson2314
    Ericson2314 committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    839f96a View commit details
    Browse the repository at this point in the history

  5. makeStdenvCross: Remove 

    It is inlined into the cross stdenv, which is its last use-case after
the previous commit.
    @Ericson2314
    Ericson2314 committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    b81ee9d View commit details
    Browse the repository at this point in the history

  6. Merge pull request #44068 from Ericson2314/no-crossAttrs-master 

    treewide: Get rid off `crossAttrs`, and `makeStdenvCross`
    @Ericson2314
    Ericson2314 committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    a6ede9f View commit details
    Browse the repository at this point in the history