diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-02-04 00:08:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-04 00:08:07 +0000 |
| commit | 97dcdd5e57eb18950cabec5c17f88bdde0ef21ea (patch) | |
| tree | 6c7482402a0443ab385473fcc8fe00db2947daa1 /pkgs/development/haskell-modules | |
| parent | 2dfb8125f9e5cdda24d9aa065bc0a2902c035dba (diff) | |
| parent | f80278219f00b38762847049f6d482898051c2ca (diff) | |
| download | nixlib-97dcdd5e57eb18950cabec5c17f88bdde0ef21ea.tar nixlib-97dcdd5e57eb18950cabec5c17f88bdde0ef21ea.tar.gz nixlib-97dcdd5e57eb18950cabec5c17f88bdde0ef21ea.tar.bz2 nixlib-97dcdd5e57eb18950cabec5c17f88bdde0ef21ea.tar.lz nixlib-97dcdd5e57eb18950cabec5c17f88bdde0ef21ea.tar.xz nixlib-97dcdd5e57eb18950cabec5c17f88bdde0ef21ea.tar.zst nixlib-97dcdd5e57eb18950cabec5c17f88bdde0ef21ea.zip | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index df1582c11e74..58a8aaa7fd43 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -595,17 +595,7 @@ self: super: builtins.intersectAttrs super { sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6"; }; - spagoWithPatches = appendPatch ( - # Spago needs a small patch to work with versions-5.0.0: - # https://github.com/purescript/spago/pull/798 - # This can probably be removed with >spago-0.20.3. - pkgs.fetchpatch { - url = "https://github.com/purescript/spago/commit/dd4bf4413d9675c1c8065d24d0ed7b345c7fa5dd.patch"; - sha256 = "1i1r3f4n9mlkckx15bfrdy5m7gjf0zx7ycwyqra6qn34zpcbzpmf"; - } - ) super.spago; - - spagoWithOverrides = spagoWithPatches.override { + spagoWithOverrides = super.spago.override { # spago has not yet been updated for the latest dhall. dhall = self.dhall_1_38_1; }; |