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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 18ff275f171a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c4630613a4b3
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 23, 2016

  1. Merge pull request #20257 from expipiplus1/haskell-doc-typo 

    fix documentation typo in doc/languages-frameworks/haskell.md
(cherry picked from commit 0a685cf)
    @peti @vcunat
    peti authored and vcunat committed Nov 23, 2016

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2e2a0ab View commit details

  2. manual: add section: reviewing contributions (#20626) 

    (cherry picked from commit 2b1d67a)
    @ericsagnes @vcunat
    ericsagnes authored and vcunat committed Nov 23, 2016
    Copy the full SHA
    c463061 View commit details
Showing with 395 additions and 1 deletion.
  1. +1 −1 doc/languages-frameworks/haskell.md
  2. +1 −0 doc/manual.xml
  3. +393 −0 doc/reviewing-contributions.xml
2 changes: 1 addition & 1 deletion doc/languages-frameworks/haskell.md
View file
Original file line number Diff line number Diff line change
@@ -633,7 +633,7 @@ Now the builds succeeds.
Of course, in the concrete example of `ghc-events` this whole exercise is not
an ideal solution, because `ghc-events` can analyze the output emitted by any
version of GHC later than 6.12 regardless of the compiler version that was used
to build the `ghc-events' executable, so strictly speaking there's no reason to
to build the `ghc-events` executable, so strictly speaking there's no reason to
prefer one built with GHC 7.8.x in the first place. However, for users who
cannot use GHC 7.10.x at all for some reason, the approach of downgrading to an
older version might be useful.
1 change: 1 addition & 0 deletions doc/manual.xml
View file
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@
<xi:include href="package-notes.xml" />
<xi:include href="coding-conventions.xml" />
<xi:include href="submitting-changes.xml" />
<xi:include href="reviewing-contributions.xml" />
<xi:include href="contributing.xml" />

</book>
Loading