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

Commits on Jun 7, 2019

  1. haskell-dhall: fix broken overrides

    @peti
    peti committed Jun 7, 2019
    Copy the full SHA
    d28f44c View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 pkgs/development/haskell-modules/configuration-common.nix
  2. +1 −1 pkgs/development/haskell-modules/configuration-nix.nix
4 changes: 2 additions & 2 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1264,8 +1264,8 @@ self: super: {
temporary-resourcet = doJailbreak super.temporary-resourcet;

# Requires dhall >= 1.23.0
ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_23_0; };
dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_23_0; };
ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_24_0; };
dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_24_0; };

# Test suite doesn't work with current QuickCheck
# https://github.com/pruvisto/heap/issues/11
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -579,6 +579,6 @@ self: super: builtins.intersectAttrs super {
snap-server = dontCheck super.snap-server;

# Tests require internet
dhall_1_23_0 = dontCheck super.dhall_1_23_0;
dhall_1_24_0 = dontCheck super.dhall_1_24_0;

}