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 7ceefc098de7..b8748b911eb9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -64,6 +64,9 @@ self: super: { # Becomes a core package in GHC >= 9.8 semaphore-compat = doDistribute self.semaphore-compat_1_0_0; + # only broken for >= 9.6 + calligraphy = doDistribute (unmarkBroken super.calligraphy); + # Only required for ghc >= 9.2 nothunks = super.nothunks.override { wherefrom-compat = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index c3503f2bc152..d3263031ad0a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -135,6 +135,9 @@ self: super: { # A given major version of ghc-exactprint only supports one version of GHC. ghc-exactprint = super.ghc-exactprint_1_5_0; + # only broken for >= 9.6 + calligraphy = doDistribute (unmarkBroken super.calligraphy); + # Packages which need compat library for GHC < 9.6 inherit (lib.mapAttrs (_: addBuildDepends [ self.foldable1-classes-compat ]) super) indexed-traversable diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 906c6972b01c..5913e29bbebc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -66,6 +66,9 @@ in # Becomes a core package in GHC >= 9.8 semaphore-compat = doDistribute self.semaphore-compat_1_0_0; + # only broken for >= 9.6 + calligraphy = doDistribute (unmarkBroken super.calligraphy); + # Jailbreaks & Version Updates hashable-time = doJailbreak super.hashable-time; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 7aafe700a4a0..f3f30057d479 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -641,6 +641,7 @@ broken-packages: - cal-layout # failure in job https://hydra.nixos.org/build/233191194 at 2023-09-02 - call-haskell-from-anything # failure in job https://hydra.nixos.org/build/233222493 at 2023-09-02 - call-plantuml # failure in job https://hydra.nixos.org/build/233241670 at 2023-09-02 + - calligraphy # only supports ghc < 9.6 - canon # failure in job https://hydra.nixos.org/build/233235027 at 2023-09-02 - canonical-filepath # failure in job https://hydra.nixos.org/build/233233390 at 2023-09-02 - canteven-listen-http # failure in job https://hydra.nixos.org/build/233210500 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 248dc0b94710..9bf25ada3473 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -127678,7 +127678,9 @@ self: { ]; description = "HIE-based Haskell call graph and source code visualizer"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "calligraphy"; + broken = true; } ) { };