From b42bd1a3d2dfd4fc05d8a5458d87486511eb5a47 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 29 Apr 2022 10:35:36 +0200 Subject: [PATCH] haskell.packages.ghc8107.spectacle: mark as unbroken Closes #135145. GHC >= 9.0 is unsupported at this moment (same goes for 8.8.4): https://github.com/awakesecurity/spectacle/issues/49 --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 4 ++++ pkgs/top-level/release-haskell.nix | 3 +++ 2 files changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 8806f8274ea41..c8e7c8179e6d3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -133,4 +133,8 @@ self: super: { # Depends on OneTuple for GHC < 9.0 universe-base = addBuildDepends [ self.OneTuple ] super.universe-base; + + # Not possible to build in the main GHC 9.0 package set + # https://github.com/awakesecurity/spectacle/issues/49 + spectacle = doDistribute (markUnbroken super.spectacle); } diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 972bb02ca7fea..4eebc684860da 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -361,6 +361,9 @@ let ghc-lib = released; ghc-lib-parser = released; ghc-lib-parser-ex = released; + spectacle = [ + compilerNames.ghc8107 + ]; }) { mergeable = pkgs.releaseTools.aggregate {