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: bb729316dd95
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 016aa581a757
Choose a head ref
  • 8 commits
  • 9 files changed
  • 1 contributor

Commits on Dec 30, 2017

  1. ghc: drop obsolete version 7.8.3 

    We have the newer minor release 7.8.4.
    @peti
    peti committed Dec 30, 2017
    Copy the full SHA
    af6f4f0 View commit details
    Browse the repository at this point in the history

  2. Drop Haskell package set for GHC 7.8.4. 

    We support only the last three major releases, i.e. 7.10.x is the latest
compiler we worry about.

The *compiler* is still there, though; it's just the package set that's been
removed.
    @peti
    peti committed Dec 30, 2017
    Copy the full SHA
    f5a5010 View commit details
    Browse the repository at this point in the history

  3. hackage2nix: disable broken Hydra builds 

     - Ping @khumba for failing "hoppy-runtime":
   https://hydra.nixos.org/build/66704172.

 - Drop "persistent-redis" from the list of maintained packages (@psibi)
   because it continues to fail: https://hydra.nixos.org/build/66704120.
    @peti
    peti committed Dec 30, 2017
    Copy the full SHA
    0232282 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.7.1-1-gc1b61fc from Hackage revision
commercialhaskell/all-cabal-hashes@fa9adf3.
    @peti
    peti committed Dec 30, 2017
    Copy the full SHA
    f84d863 View commit details
    Browse the repository at this point in the history

  5. haskell: configure overrides to fix numerous package builds with GHC … 

    …7.10.3
    @peti
    peti committed Dec 30, 2017
    Copy the full SHA
    7eeea3d View commit details
    Browse the repository at this point in the history

  6. haskell-vaultenv: build is broken due to "optparse-applicative <0.14"… 

    … dependency

Ping @LnL7.
    @peti
    peti committed Dec 30, 2017
    Copy the full SHA
    8128c17 View commit details
    Browse the repository at this point in the history

  7. haskell-intero-nix-shim: build is broken

    @peti
    peti committed Dec 30, 2017
    Copy the full SHA
    a05d950 View commit details
    Browse the repository at this point in the history

  8. haskell: extend generic builder to recognize mis-configured Cabal 2.x… 

    … builds

Cabal 1.x says:

 | Warning: This package indirectly depends on multiple versions of the same
 | package. This is highly likely to cause a compile failure.

But in version 2.x, that warning is split into two lines differently:

 | Warning:
 |     This package indirectly depends on multiple versions of the same package. This is very likely to cause a compile failure.

This commit modifies the call to "egrep" to recognize both versions by virtue
of the "-z" flag, which essentially interprets the whole configure-time output
as one long line.
    @peti
    peti committed Dec 30, 2017
    Copy the full SHA
    016aa58 View commit details
    Browse the repository at this point in the history