diff options
| author | Dennis Gosnell <cdep.illabout@gmail.com> | 2022-02-03 12:47:13 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-03 12:47:13 +0900 |
| commit | 09ca0f5a50ed9d91e2612a1ad467bf6f10d3cd63 (patch) | |
| tree | 060c6c0760279950fc58f607bba16cf0fac015b8 /pkgs | |
| parent | f29a28b19ad43ab988837024a3f3776c1a44616b (diff) | |
| parent | 48c625215f4786ab3d1bd3d4da6d6146ef6885b9 (diff) | |
Merge pull request #157624 from cdepillabout/spago-0.20.4
spago: 0.20.2 -> 0.20.4
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/tools/purescript/spago/spago.nix | 6 |
2 files changed, 4 insertions, 14 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 48ef3d1515e65..f76c91c64d9ef 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -605,17 +605,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; }; diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index 0bd33f19f8e99..d5646a6c2fff4 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -14,11 +14,11 @@ }: mkDerivation { pname = "spago"; - version = "0.20.2"; + version = "0.20.4"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "11jh3bszvl8zfi4xcabpx43jply28dxdywd6fadxspaa05jdxxn2"; - rev = "0f38c9153e46f30e9d87963e181f5c1a595f4b64"; + sha256 = "0dj7z2yr4s2kqjklbjdzsrmc5lqli322wg5k412jixxpmlx11a5f"; + rev = "33da63176fe07967761f43c83af9715f104013f0"; fetchSubmodules = true; }; isLibrary = true; |