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

Commits on Mar 20, 2018

  1. LTS Haskell 11.1 

    This update was generated by hackage2nix v2.9.1-1-g63041e4 from Hackage revision
commercialhaskell/all-cabal-hashes@6aec0b3.
    @peti
    peti committed Mar 20, 2018
    Copy the full SHA
    61d4538 View commit details

  2. haskell-matrix: the new version has fixed the test suite failure

    @peti
    peti committed Mar 20, 2018
    Copy the full SHA
    5330975 View commit details

  3. haskell-th-printf: drop obsolete override for ghc 8.4.x

    @peti
    peti committed Mar 20, 2018
    Copy the full SHA
    a413639 View commit details

  4. haskell-SHA: the new version has fixed the test suite failure

    @peti
    peti committed Mar 20, 2018
    Copy the full SHA
    c9777cd View commit details

  5. haskell-blaze-builder: drop obsolete override for ghc 8.4.x

    @peti
    peti committed Mar 20, 2018
    Copy the full SHA
    e4a5fea View commit details

  6. haskell-conduit: drop obsolete override for ghc 8.4.x

    @peti
    peti committed Mar 20, 2018
    Copy the full SHA
    92935ae View commit details

  7. haskell-src: drop obsolete override for ghc 8.4.x

    @peti
    peti committed Mar 20, 2018
    Copy the full SHA
    ad1cd53 View commit details

  8. haskell-getopt-generics: override to latest version for ghc-8.4.x

    @peti
    peti committed Mar 20, 2018
    Copy the full SHA
    97d56e9 View commit details
9 changes: 0 additions & 9 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1005,13 +1005,4 @@ self: super: {
# https://github.com/fpco/inline-c/issues/72
inline-c = dontCheck super.inline-c;

# Avoid GHC compiler crash a la https://ghc.haskell.org/trac/ghc/ticket/5361.
SHA = appendPatch super.SHA (pkgs.fetchpatch {
url = https://github.com/GaloisInc/SHA/commit/c258350e953c3de2f98c5625ac3857f1a6863afc.patch;
sha256 = "1485bbjca1wqbh3c9yqj85kmq8j7zxq79y5isxypy3r6wjpr3g6b";
});

# https://github.com/Daniel-Diaz/matrix/issues/55
matrix_0_3_6_0 = dontCheck super.matrix_0_3_6_0;

}
29 changes: 2 additions & 27 deletions pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View file
Original file line number Diff line number Diff line change
@@ -42,9 +42,6 @@ self: super: {
unix = null;
xhtml = null;

# Need newer version.
haskell-src = super.haskell-src_1_0_3_0;

## Shadowed:

## Needs bump to a versioned attribute
@@ -301,23 +298,6 @@ self: super: {

## Unmerged

## Unmerged. PR: https://github.com/lpsmith/blaze-builder/pull/10
## Issue: https://github.com/lpsmith/blaze-builder/issues/12
blaze-builder = overrideCabal super.blaze-builder (drv: {
## • No instance for (Semigroup Poke)
## arising from the superclasses of an instance declaration
## • In the instance declaration for ‘Monoid Poke’
src = pkgs.fetchFromGitHub {
owner = "bgamari";
repo = "blaze-builder";
rev = "b7195f160795a081adbb9013810d843f1ba5e062";
sha256 = "1g351fdpsvn2lbqiy9bg2s0wwrdccb8q1zh7gvpsx5nnj24b1c00";
};
## Setup: Encountered missing dependencies:
## base >=4 && <4.11
jailbreak = true;
});

## Unmerged. PR: https://github.com/wrengr/bytestring-trie/pull/3
bytestring-trie = overrideCabal super.bytestring-trie (drv: {
## • Could not deduce (Semigroup (Trie a))
@@ -679,9 +659,6 @@ self: super: {
sha256 = "1wwdzrbsjqb7ih4nl28sq5bbj125mxf93a74yh4viv5gmxwj606a";
});

# 1.3.0.0 does not compile.
conduit = self.conduit_1_3_0_1;

# https://github.com/jgm/pandoc-types/issues/37
pandoc-types = self.pandoc-types_1_17_4_2;

@@ -705,10 +682,8 @@ self: super: {
# Older versions don't compile.
brick = self.brick_0_35;
timezone-olson = self.timezone-olson_0_1_9;
matrix = self.matrix_0_3_6_0;

# https://github.com/pikajude/th-printf/issues/8
th-printf = doJailbreak super.th-printf;
matrix = self.matrix_0_3_6_1;
getopt-generics = self.getopt-generics_0_13_0_2;

# https://github.com/xmonad/xmonad/issues/155
xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch
Loading