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: bbb04db8feb5
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c16e8b21b84d
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 3, 2018

  1. ncurses: simplify patch expr, fix ncurses6 build w/clang 

    Somewhat amusingly given its name, "clang.patch" applies to both 5 and 6
but is the cause of ncurses6 breakage on 6 but is required on 5...
gcc is happy in all four configurations:

       5  5p 6  6p
gcc    ✓  ✓  ✓  ✓
clang  ✗  ✓  ✓  ✗

Which is why this commit enables the patch for 5 but not 6;
this matches behavior in Gentoo, for example.

For further simplification, we also use gcc-5 patch regardless.
    @dtzWill
    dtzWill committed Jan 3, 2018
    Copy the full SHA
    96f0d3b View commit details
    Browse the repository at this point in the history

  2. ncurses: use more complicated expression to avoid mass-rebuilds, note

    @dtzWill
    dtzWill committed Jan 3, 2018
    Copy the full SHA
    48a5212 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #33376 from dtzWill/fix/ncurses6-clang 

    ncurses: fix ncurses6 build w/clang
    @LnL7
    LnL7 committed Jan 3, 2018
    Copy the full SHA
    c16e8b2 View commit details
    Browse the repository at this point in the history