diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-02-09 00:08:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-09 00:08:15 +0000 |
| commit | 5c325c71b3e25328ef916fc2fd87910a087e49ce (patch) | |
| tree | c00c8bca96be49ecd6103c56a61d3413ac9b318f /pkgs/development/haskell-modules | |
| parent | ed91ac41293ee80d3e18e910aa53a20eb90e9b0c (diff) | |
| parent | 3ecddf791da4d893beb35fb09eb9da55b326f4fb (diff) | |
| download | nixlib-5c325c71b3e25328ef916fc2fd87910a087e49ce.tar nixlib-5c325c71b3e25328ef916fc2fd87910a087e49ce.tar.gz nixlib-5c325c71b3e25328ef916fc2fd87910a087e49ce.tar.bz2 nixlib-5c325c71b3e25328ef916fc2fd87910a087e49ce.tar.lz nixlib-5c325c71b3e25328ef916fc2fd87910a087e49ce.tar.xz nixlib-5c325c71b3e25328ef916fc2fd87910a087e49ce.tar.zst nixlib-5c325c71b3e25328ef916fc2fd87910a087e49ce.zip | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 544b29c64a24..032b2577c515 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -595,11 +595,6 @@ self: super: builtins.intersectAttrs super { sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6"; }; - spagoWithOverrides = super.spago.override { - # spago has not yet been updated for the latest dhall. - dhall = self.dhall_1_38_1; - }; - spagoDocs = overrideCabal (drv: { postUnpack = (drv.postUnpack or "") + '' # Spago includes the following two files directly into the binary @@ -625,7 +620,7 @@ self: super: builtins.intersectAttrs super { "$sourceRoot/templates/docs-search-app-0.0.11.js" \ "$sourceRoot/templates/purescript-docs-search-0.0.11" ''; - }) spagoWithOverrides; + }) super.spago; # Tests require network access. spagoWithoutChecks = dontCheck spagoDocs; |