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

Commits on Mar 6, 2019

  1. purescript: fix build compiling with ghc 8.4.4 

    Closes #53597.
    @jacereda
    jacereda committed Mar 6, 2019
    Copy the full SHA
    dd2dff3 View commit details

Commits on Mar 7, 2019

  1. Merge pull request #56162 from jacereda/fix-purescript-build 

    purescript: fix build compiling with ghc 8.4.4
    @peti
    peti authored Mar 7, 2019
    Copy the full SHA
    33ebe0c View commit details
Showing with 6 additions and 1 deletion.
  1. +4 −0 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
  2. +2 −1 pkgs/top-level/all-packages.nix
4 changes: 4 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View file
Original file line number Diff line number Diff line change
@@ -40,6 +40,10 @@ self: super: {
unix = null;
xhtml = null;

# Restricts aeson to <1.4
# https://github.com/purescript/purescript/pull/3537
purescript = doJailbreak super.purescript;

# https://github.com/jcristovao/enclosed-exceptions/issues/12
enclosed-exceptions = dontCheck super.enclosed-exceptions;

3 changes: 2 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -7082,7 +7082,8 @@ in

all-cabal-hashes = callPackage ../data/misc/hackage { };

purescript = haskell.lib.justStaticExecutables haskellPackages.purescript;
# Build with ghc 8.4 due to https://github.com/NixOS/nixpkgs/issues/53597
purescript = haskell.lib.justStaticExecutables haskell.packages.ghc844.purescript;
psc-package = haskell.lib.justStaticExecutables
(haskellPackages.callPackage ../development/compilers/purescript/psc-package { });