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

Commits on Oct 13, 2019

  1. Copy the full SHA
    980a73b View commit details

Commits on Oct 14, 2019

  1. Merge pull request #71027 from turboMaCk/haskell-updates

    ghc-8.8.x: jailbreak io-streams-haproxy
    peti authored Oct 14, 2019
    Copy the full SHA
    4a9845e View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
2 changes: 2 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
Original file line number Diff line number Diff line change
@@ -64,6 +64,8 @@ self: super: {
tasty-hedgehog = doJailbreak super.tasty-hedgehog;
test-framework = doJailbreak super.test-framework;
th-expand-syns = doJailbreak super.th-expand-syns;
# TODO: remove when upstream accepts https://github.com/snapframework/io-streams-haproxy/pull/17
io-streams-haproxy = doJailbreak super.io-streams-haproxy; # base >=4.5 && <4.13

# use latest version to fix the build
hackage-db = self.hackage-db_2_1_0;