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: 373d6151981e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 4e96a5fc5fa6
Choose a head ref
  • 5 commits
  • 3 files changed
  • 1 contributor

Commits on Sep 15, 2018

  1. LTS Haskell 12.9 

    (cherry picked from commit 3c1af12)
Signed-off-by: Domen Kožar <domen@dev.si>
    @peti @domenkozar
    peti authored and domenkozar committed Sep 15, 2018
    Copy the full SHA
    84d9adf View commit details
    Browse the repository at this point in the history

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

(cherry picked from commit 1b1cb63)
Signed-off-by: Domen Kožar <domen@dev.si>
    @peti @domenkozar
    peti authored and domenkozar committed Sep 15, 2018
    Copy the full SHA
    942e0be View commit details
    Browse the repository at this point in the history

  3. haskell-cabal2nix: update override for hpack 0.31.0 

    * pkgs/development/haskell-modules/configuration-common.nix:

(cherry picked from commit e0c081c)
Signed-off-by: Domen Kožar <domen@dev.si>
    @peti @domenkozar
    peti authored and domenkozar committed Sep 15, 2018
    Copy the full SHA
    1c02221 View commit details
    Browse the repository at this point in the history

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

    … set

(cherry picked from commit 838b4fe)
Signed-off-by: Domen Kožar <domen@dev.si>
    @peti @domenkozar
    peti authored and domenkozar committed Sep 15, 2018
    Copy the full SHA
    52f3681 View commit details
    Browse the repository at this point in the history

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

    (cherry picked from commit 1c5d7ad)
Signed-off-by: Domen Kožar <domen@dev.si>
    @peti @domenkozar
    peti authored and domenkozar committed Sep 15, 2018
    Copy the full SHA
    4e96a5f View commit details
    Browse the repository at this point in the history