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

Commits on May 9, 2018

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

    This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
commercialhaskell/all-cabal-hashes@6ab957c.
    @peti
    peti committed May 9, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5c26dd3 View commit details

  2. haskell-gi: apply upstream patch to fix the doctest suite

    @peti
    peti committed May 9, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    77fbd14 View commit details

  3. haskell-brick: update override for ghc-8.4.x to the latest version

    @peti
    peti committed May 9, 2018
    Copy the full SHA
    a9577da View commit details
7 changes: 5 additions & 2 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -422,8 +422,11 @@ self: super: {
# https://github.com/evanrinehart/mikmod/issues/1
mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;

# https://github.com/haskell-gi/haskell-gi/pull/163
haskell-gi = dontCheck super.haskell-gi;
# Version 0.21.2 calls its doctest suite with incorrect paths.
haskell-gi = appendPatch super.haskell-gi (pkgs.fetchpatch {
url = https://github.com/haskell-gi/haskell-gi/pull/163/commits/b876c4f351893370d4ae597aab6ecc0422e7f665.patch;
sha256 = "03vzpvnr3vnz2zgsr504iyf0n9aw6mkz8rkj6zhazfixl3dzfkyd";
});

# https://github.com/basvandijk/threads/issues/10
threads = dontCheck super.threads;
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View file
Original file line number Diff line number Diff line change
@@ -441,7 +441,7 @@ self: super: {
});

# Older versions don't compile.
brick = self.brick_0_36_3;
brick = self.brick_0_37;
dhall = self.dhall_1_13_0;
dhall_1_13_0 = doJailbreak super.dhall_1_13_0; # support ansi-terminal 0.8.x
HaTeX = self.HaTeX_3_19_0_0;
Loading