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: eec35cb6bd82
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2090aa4f65e8
Choose a head ref
  • 3 commits
  • 55 files changed
  • 1 contributor

Commits on Apr 14, 2017

  1. A fixed version of commit eb750f9 

    For detailed explanation see:
24444513fb5#commitcomment-21767916
    @vcunat
    vcunat committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    6617c8b View commit details
    Browse the repository at this point in the history

  2. Merge the two "same" merges 

    This only takes the state from the second parent.
The purpose is that when this commit depends on the failed one,
simply merging this commit is a safe way to fix the problems.  Details:
24444513fb5#commitcomment-21767916
    @vcunat
    vcunat committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    4aec96b View commit details
    Browse the repository at this point in the history

  3. Merge: fixup a bad merge 

    For details see:
24444513fb5#commitcomment-21767916
    @vcunat
    vcunat committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    2090aa4 View commit details
    Browse the repository at this point in the history