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: ecd9be1b624a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 59159f9d8eb3
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jul 19, 2018

  1. haskellPackages.hnix: Fix build (#43824)

    @infinisil @domenkozar
    infinisil authored and domenkozar committed Jul 19, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    59159f9 View commit details
Showing with 7 additions and 5 deletions.
  1. +7 −5 pkgs/development/haskell-modules/configuration-common.nix
12 changes: 7 additions & 5 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -244,19 +244,21 @@ self: super: {
# base bound
digit = doJailbreak super.digit;

# https://github.com/jwiegley/hnix/issues/98 - tied to an older deriving-compat
hnix = (overrideCabal super.hnix (old: {
# dontCheck: Can be removed once https://github.com/haskell-nix/hnix/commit/471712f is in (5.2 probably)
# This is due to GenList having been removed from generic-random in 1.2.0.0
# doJailbreak: Can be removed once https://github.com/haskell-nix/hnix/pull/329 is in (5.2 probably)
# This is due to hnix currently having an upper bound of <0.5 on deriving-compat, works just fine with our current version 0.5.1 though
hnix = dontCheck (doJailbreak (overrideCabal super.hnix (old: {
patches = old.patches or [] ++ [
# should land in hnix-5.2
(pkgs.fetchpatch {
url = "https://github.com/haskell-nix/hnix/commit/9cfe060a9dbe9e7c64867956a0523eed9661803a.patch";
sha256 = "0ci4n7nw2pzqw0gkmkp4szzvxjyb143a4znjm39jmb0s397a68sh";
name = "disable-hpack-test-by-default.patch";
})
})
];
testHaskellDepends = old.testHaskellDepends or [] ++ [ pkgs.nix ];
broken = true; # can't cope with deriving-compat 0.5.x.
}));
})));

# Fails for non-obvious reasons while attempting to use doctest.
search = dontCheck super.search;