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

Commits on Nov 18, 2020

  1. spago: get building again with ghc8102

    @cdepillabout
    cdepillabout committed Nov 18, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    fcc0a77 View commit details

  2. Merge pull request #104164 from cdepillabout/update-spago 

    spago: get building again with ghc8102
    @maralorn
    maralorn authored Nov 18, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    f323e4c View commit details
Showing with 20 additions and 3 deletions.
  1. +20 −3 pkgs/development/haskell-modules/configuration-nix.nix
23 changes: 20 additions & 3 deletions pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -664,9 +664,26 @@ self: super: builtins.intersectAttrs super {
let
# Spago needs a small patch to work with the latest versions of rio.
# https://github.com/purescript/spago/pull/647
spagoWithPatches = appendPatch super.spago (pkgs.fetchpatch {
url = "https://github.com/purescript/spago/pull/647/commits/917ee541a966db74f0f5d11f2f86df0030c35dd7.patch";
sha256 = "1nspqgcjk6z90cl9zhard0rn2q979kplcqz72x8xv5mh57zabk0w";
spagoWithPatches = overrideCabal (appendPatch super.spago (
# Spago-0.17 needs a small patch to work with the latest version of dhall.
# This can probably be removed with Spago-0.18.
# https://github.com/purescript/spago/pull/695
pkgs.fetchpatch {
url = "https://github.com/purescript/spago/commit/6258ac601480e776c215c989cc5faae46d5ca9f7.patch";
sha256 = "02zy4jf24qlqz9fkcs2rqg64ijd8smncmra8s5yp2mln4dmmii1k";
}
)) (old: {
# The above patch contains a completely new spago.cabal file, but our
# source tree from Hackage already contains a cabal file. Delete the
# local cabal file and just take the one from the patch.
#
# WARNING: The empty line above the `rm` needs to be kept.
prePatch = old.prePatch or "" + ''
rm spago.cabal
'';
# The above patch also adds a dependency on the stringsearch package.
libraryHaskellDepends = old.libraryHaskellDepends or [] ++ [ self.stringsearch ];
});

# spago requires an older version of megaparsec, but it appears to work