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: e97d8fc0cbdf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 127de7480e8d
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on May 6, 2018

  1. hackage2nix: disable failing Hydra builds 

    @gebner: hledger-diff no longer compiles
    @peti
    peti committed May 6, 2018
    Copy the full SHA
    11096b2 View commit details

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

    This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision
commercialhaskell/all-cabal-hashes@d2c0010.
    @peti
    peti committed May 6, 2018
    Copy the full SHA
    fe95c5c View commit details

  3. haskell-gi, gi-gdkx11: fix builds 

    The `haskell-gi` build fails its doctests because of a missing
library; I'm not 100% convinced that setting it to `dontCheck` is the
right thing to do, but I don't have a better idea at the moment.

The `gi-gdkx11` build fails because, surprise, Gdk-X11 isn't found; by
looking around in my store, I found that that that library seems to
live in gtk3 these days; this override is just a stop-gap, though,
I've also submitted the change to cabal2nix that I believe will fix
the automatic generation of the package in the future.
    @mdorman @peti
    mdorman authored and peti committed May 6, 2018
    1
    Copy the full SHA
    4764a6e View commit details

  4. haskell-attoparsec-varword: fix infinite recursion in test dependencies

    @peti
    peti committed May 6, 2018
    Copy the full SHA
    127de74 View commit details
5 changes: 4 additions & 1 deletion pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -47,12 +47,12 @@ self: super: {
hoogleLocal = { packages ? [] }: self.callPackage ./hoogle.nix { inherit packages; };

# Break infinite recursions.
attoparsec-varword = super.attoparsec-varword.override { bytestring-builder-varword = dontCheck self.bytestring-builder-varword; };
clock = dontCheck super.clock;
Dust-crypto = dontCheck super.Dust-crypto;
hasql-postgres = dontCheck super.hasql-postgres;
hspec = super.hspec.override { stringbuilder = dontCheck self.stringbuilder; };
hspec-core = super.hspec-core.override { silently = dontCheck self.silently; temporary = dontCheck self.temporary; };

hspec-expectations = dontCheck super.hspec-expectations;
HTTP = dontCheck super.HTTP;
http-streams = dontCheck super.http-streams;
@@ -422,6 +422,9 @@ self: super: {
# https://github.com/evanrinehart/mikmod/issues/1
mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;

haskell-gi = dontCheck super.haskell-gi;
gi-gdkx11 = super.gi-gdkx11.override { gdk-x11 = pkgs.gtk3; };

# https://github.com/basvandijk/threads/issues/10
threads = dontCheck super.threads;

Loading