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: fabdb3bd138e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 139a451b2367
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 22, 2018

  1. cockroachdb: fix darwin build

    @LnL7
    LnL7 committed Jan 22, 2018
    Copy the full SHA
    6f2b46f View commit details
    Browse the repository at this point in the history

  2. 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.

(cherry picked from commit 96f0d3b)
    @dtzWill @LnL7
    dtzWill authored and LnL7 committed Jan 22, 2018
    Copy the full SHA
    e1efcb3 View commit details
    Browse the repository at this point in the history

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

    (cherry picked from commit 48a5212)
    @dtzWill @LnL7
    dtzWill authored and LnL7 committed Jan 22, 2018
    Copy the full SHA
    139a451 View commit details
    Browse the repository at this point in the history