From 63ad94602d2cfd3a0c8e529714a77b555bc7b3a5 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sat, 26 Nov 2022 02:28:54 -0500 Subject: [PATCH] spago: mark broken in ghc92 --- .../haskell-modules/configuration-nix.nix | 4 +++- .../tools/purescript/spago/default.nix | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 10222254dbe3..b97eac4ddb57 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -637,7 +637,9 @@ self: super: builtins.intersectAttrs super { # Tests require network access. spagoWithoutChecks = dontCheck spagoOldAeson; in - spagoWithoutChecks; + # spago doesn't currently build with ghc92. Top-level spago is pulled from + # ghc90 and explicitly marked unbroken. + markBroken spagoWithoutChecks; # checks SQL statements at compile time, and so requires a running PostgreSQL # database to run it's test suite diff --git a/pkgs/development/tools/purescript/spago/default.nix b/pkgs/development/tools/purescript/spago/default.nix index 70f0735af175..8006147e2dd1 100644 --- a/pkgs/development/tools/purescript/spago/default.nix +++ b/pkgs/development/tools/purescript/spago/default.nix @@ -11,14 +11,16 @@ let spago = - haskell.lib.compose.justStaticExecutables - (haskell.lib.compose.overrideCabal (oldAttrs: { - maintainers = (oldAttrs.maintainers or []) ++ [ - lib.maintainers.cdepillabout - ]; - changelog = - "https://github.com/purescript/spago/releases/tag/${oldAttrs.version}"; - }) haskell.packages.ghc90.spago); + lib.pipe + haskell.packages.ghc90.spago + [ haskell.lib.compose.justStaticExecutables + (haskell.lib.compose.overrideCabal (oldAttrs: { + maintainers = (oldAttrs.maintainers or []) ++ [ lib.maintainers.cdepillabout ]; + changelog = "https://github.com/purescript/spago/releases/tag/${oldAttrs.version}"; + })) + haskell.lib.compose.unmarkBroken + haskell.lib.compose.doDistribute + ]; in spago.overrideAttrs (oldAttrs: { @@ -57,4 +59,3 @@ spago.overrideAttrs (oldAttrs: { ''; }; }) -