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: 11f6566b3178
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8abcedd90e22
Choose a head ref
  • 5 commits
  • 6 files changed
  • 1 contributor

Commits on Dec 5, 2017

  1. LTS Haskell 9.16

    @peti
    peti committed Dec 5, 2017
    Copy the full SHA
    d7d8b76 View commit details

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

    This update was generated by hackage2nix v2.7 from Hackage revision
commercialhaskell/all-cabal-hashes@497e5d1.
    @peti
    peti committed Dec 5, 2017
    Copy the full SHA
    1e027f1 View commit details

  3. haskell-Cabal: update overrides for new 2.0.1.1 release

    @peti
    peti committed Dec 5, 2017
    Copy the full SHA
    8737c96 View commit details

  4. idris: update overrides for new 1.1.1 default version

    @peti
    peti committed Dec 5, 2017
    Copy the full SHA
    c722252 View commit details

  5. haskell-utf8-string: fix build with ghc 7.4.x

    @peti
    peti committed Dec 5, 2017
    Copy the full SHA
    8abcedd View commit details
9 changes: 2 additions & 7 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ self: super: {

# cabal-install needs Cabal 2.x. hackage-security's test suite does not compile with
# Cabal 2.x, though. See https://github.com/haskell/hackage-security/issues/188.
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_0; });
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_1; });
hackage-security = dontCheck super.hackage-security;

# Link statically to avoid runtime dependency on GHC.
@@ -730,14 +730,9 @@ self: super: {
'';
});

# test suite cannot find its own "idris" binary
# The standard libraries are compiled separately
idris = doJailbreak (dontCheck super.idris);

idris_1_1_1 = overrideCabal (doJailbreak (dontCheck super.idris_1_1_1)) (drv: {
# The standard libraries are compiled separately
configureFlags = (drv.configureFlags or []) ++ [ "-fexeconly" ];
});

# https://github.com/bos/math-functions/issues/25
math-functions = dontCheck super.math-functions;

3 changes: 3 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
View file
Original file line number Diff line number Diff line change
@@ -111,4 +111,7 @@ self: super: {
network_2_6_3_1 = dontCheck super.network_2_6_3_1;
network = self.network_2_6_3_1;

# Haddock fails with an internal error.
utf8-string = dontHaddock super.utf8-string;

}
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
View file
Original file line number Diff line number Diff line change
@@ -60,6 +60,6 @@ self: super: {
apply-refact = super.apply-refact_0_3_0_1;

# This builds needs the latest Cabal version.
cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_0; });
cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_1; });

}
Loading