From 439841cc15cdc76523115eca65a10429167ce46b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 30 Dec 2022 11:57:16 +0100 Subject: [PATCH] haskellPackages.multistate: allow hspec == 2.9.* --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 - pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 3 --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 205f101f132c..b585fc184392 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -665,6 +665,10 @@ self: super: { idris = self.generateOptparseApplicativeCompletions [ "idris" ] (doJailbreak (dontCheck super.idris)); + # Too strict bound on hspec + # https://github.com/lspitzner/multistate/issues/9#issuecomment-1367853016 + multistate = doJailbreak super.multistate; + # https://github.com/pontarius/pontarius-xmpp/issues/105 pontarius-xmpp = dontCheck super.pontarius-xmpp; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 00ecac6db57e..4da798b542e2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -168,7 +168,6 @@ self: super: { brittany czipwith extra ghc-exactprint ghcide hls-plugin-api hls-test-utils lens lsp-types ]) (super.hls-brittany-plugin.overrideScope (lself: lsuper: { brittany = doJailbreak lself.brittany_0_13_1_2; - multistate = unmarkBroken (dontCheck lsuper.multistate); lsp-types = doJailbreak lsuper.lsp-types; # Checks require aeson >= 2.0 }))); diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index d74d70a3bc6d..f9426d97110d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -157,9 +157,6 @@ self: super: { # Restrictive upper bound on ormolu hls-ormolu-plugin = doJailbreak super.hls-ormolu-plugin; - # Too strict bounds on base - # https://github.com/lspitzner/multistate/issues/9 - multistate = doJailbreak super.multistate; # https://github.com/lspitzner/butcher/issues/7 butcher = doJailbreak super.butcher; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 5db553177bc2..fa97c5c18ec1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3468,7 +3468,6 @@ broken-packages: - multiplate-simplified - multipool - multirec - - multistate - Munkres-simple - muon - murmur diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7cbe6567faba..067dbd489f6b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -198084,8 +198084,6 @@ self: { testHaskellDepends = [ base hspec transformers ]; description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "multivariant" = callPackage