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: c2e1b9c269cb
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 3c080a36134c
Choose a head ref
  • 5 commits
  • 34 files changed
  • 2 contributors

Commits on Jan 9, 2017

  1. cc-wrapper: expand response files 

    Fixes #11762

(cherry picked from commit 1ad1edb)
    @corngood @peti
    corngood authored and peti committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    33653bf View commit details
    Browse the repository at this point in the history

  2. cc-wrapper: don't expand $ in response files 

    This makes the response file handling more consistent with GCC.

For example, a reponse file may contain:

    "-Wl,$ORIGIN"

GCC will treat this as a double quoted string and not expand the
variable reference.  Previously, cc-wrapper would expand the variable
in the same was as if the string was provided on the command line.

(cherry picked from commit 175461e)
    @corngood @peti
    corngood authored and peti committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    164b8fa View commit details
    Browse the repository at this point in the history

  3. Synchronize Haskell infrastructure with 'master' at 6d58ab2.

    @peti
    peti committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    e16a287 View commit details
    Browse the repository at this point in the history

  4. hackage-packages.nix: automatic Haskell package set update 

    This update was generated by hackage2nix v2.0.4-7-g48fad11 from Hackage revision
commercialhaskell/all-cabal-hashes@e89923e.
    @peti
    peti committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    7b151fe View commit details
    Browse the repository at this point in the history

  5. haskell-stack: fix reference to http-client-tls

    @peti
    peti committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    3c080a3 View commit details
    Browse the repository at this point in the history