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: 1696eb4c52c0
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 9d47aaa3b69a
Choose a head ref
  • 12 commits
  • 11 files changed
  • 5 contributors

Commits on Sep 12, 2018

  1. Haskell builder: Use $abi/$libname as --libsubdir

    @peti
    Alex Biehl authored and peti committed Sep 12, 2018
    Copy the full SHA
    f8a158c View commit details
    Browse the repository at this point in the history

  2. More conservative SCC tagging for Haskell libraries 

    `all-functions` corresponds to `-fprof-auto` which places an SCC on every binding. It is well known that SCCs hinder GHC from doing its optimization magic and really slows down profiled code to a point where the profiling reports are completely skewed towards things that were completely optimized away in production settings. Concretely this shows up with things like lenses which do not carry runtime overhead when properly simplified.

`exported-functions` corresponds to GHCs `-fprof-auto-exported` which doesn't put SCCs on `INLINE`d code and in turn doesn't influence simplification of this basic but important stuff.
    @alexbiehl @peti
    alexbiehl authored and peti committed Sep 12, 2018
    Copy the full SHA
    88ce4f5 View commit details
    Browse the repository at this point in the history

  3. LTS Haskell 12.9

    @peti
    peti committed Sep 12, 2018
    Copy the full SHA
    3c1af12 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.11-9-gb3613cb from Hackage revision
commercialhaskell/all-cabal-hashes@3869e8d.
    @peti
    peti committed Sep 12, 2018
    Copy the full SHA
    1b1cb63 View commit details
    Browse the repository at this point in the history

  5. haskell-yaml: drop obsolete override

    @peti
    peti committed Sep 12, 2018
    Copy the full SHA
    1193085 View commit details
    Browse the repository at this point in the history

  6. cabal2nix: fix (and clean up)override for hpack dependency

    @peti
    peti committed Sep 12, 2018
    Copy the full SHA
    1c5d7ad View commit details
    Browse the repository at this point in the history

  7. haskellPackages.termonad: Add dontCheck and remove from dont-distribu… 

    …te-packages.

The doctests for termonad fail to build only with nix.  When building
without nix, the doctests run correctly:

cdepillabout/termonad#15

This PR disables the tests for termonad, as well as removing it from
dont-distribute-packages.
    @cdepillabout @peti
    cdepillabout authored and peti committed Sep 12, 2018
    Copy the full SHA
    da86e42 View commit details
    Browse the repository at this point in the history

  8. haskell-Cabal: keep a copy of the 2.2.x version around in the package… 

    … set
    @peti
    peti committed Sep 12, 2018
    Copy the full SHA
    838b4fe View commit details
    Browse the repository at this point in the history

  9. ghc: Apply fix to abi-hash with backpack. 

    See https://phabricator.haskell.org/D5123.
    @shlevy @peti
    shlevy authored and peti committed Sep 12, 2018
    Copy the full SHA
    e6e56bb View commit details
    Browse the repository at this point in the history

  10. haskell.compiler.ghc861: Apply fix to abi-hash with backpack. 

    See https://phabricator.haskell.org/D5123.
    @shlevy @peti
    shlevy authored and peti committed Sep 12, 2018
    Copy the full SHA
    cd41cad View commit details
    Browse the repository at this point in the history

  11. haskell-stm: update overrides that use version 2.4.5.0 to version 2.4… 

    ….5.1
    @peti
    peti committed Sep 12, 2018
    Copy the full SHA
    53d3430 View commit details
    Browse the repository at this point in the history

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

    This update was generated by hackage2nix v2.11-9-gb3613cb from Hackage revision
commercialhaskell/all-cabal-hashes@e44c7d3.
    @peti
    peti committed Sep 12, 2018
    Copy the full SHA
    9d47aaa View commit details
    Browse the repository at this point in the history