diff options
| author | Dennis Gosnell <cdep.illabout@gmail.com> | 2022-04-19 23:33:53 +0900 |
|---|---|---|
| committer | Dennis Gosnell <cdep.illabout@gmail.com> | 2022-04-19 23:33:53 +0900 |
| commit | 56c72fce7d2190ac2bbb5da2a7a3b51c0e57c4fe (patch) | |
| tree | 39fc20c2476c5089373297aa4490b8bb023b4fce /pkgs/development/haskell-modules | |
| parent | 471653824c1d2bf42f107c3f7942ba0d72aa7951 (diff) | |
spago: get working by using aeson-1.5.6.0
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml | 1 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 47a41044af55f..b83783786500b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -3650,7 +3650,6 @@ dont-distribute-packages: - soundgen - source-code-server - spade - - spago - sparkle - sparrow - sparsebit diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 1707877d30ed3..4116cf51ebedd 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -619,8 +619,15 @@ self: super: builtins.intersectAttrs super { ''; }) super.spago; + spagoOldAeson = spagoDocs.overrideScope (hfinal: hprev: { + # spago (and its dependency, bower-json) is not yet updated for aeson-2.0 + aeson = hfinal.aeson_1_5_6_0; + # bower-json needs aeson_1_5_6_0 and is marked broken without it. + bower-json = doDistribute (markUnbroken hprev.bower-json); + }); + # Tests require network access. - spagoWithoutChecks = dontCheck spagoDocs; + spagoWithoutChecks = dontCheck spagoOldAeson; in spagoWithoutChecks; |