From 8e00adca9cd18bd70ef0873bb35cd923293a9007 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Mon, 13 May 2024 01:49:35 +0100 Subject: [PATCH] haskellPackages.saltine: re-enable tests --- pkgs/development/haskell-modules/configuration-common.nix | 1 - pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index aafc39aa205e..09931fbd46f7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -732,7 +732,6 @@ self: super: { Rlang-QQ = dontCheck super.Rlang-QQ; safecopy = dontCheck super.safecopy; sai-shape-syb = dontCheck super.sai-shape-syb; - saltine = dontCheck super.saltine; # https://github.com/tel/saltine/pull/56 scp-streams = dontCheck super.scp-streams; sdl2 = dontCheck super.sdl2; # the test suite needs an x server separated = dontCheck super.separated; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 31b3058ffae5..9a26c60a967e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -105,6 +105,7 @@ self: super: { terminfo_0_4_1_6 = doJailbreak super.terminfo_0_4_1_6; HaskellNet-SSL = doJailbreak super.HaskellNet-SSL; # bytestring >=0.9 && <0.12 raven-haskell = doJailbreak super.raven-haskell; # aeson <2.2 + saltine = doJailbreak super.saltine; # bytestring && <0.12, deepseq <1.5, text > 1.2 && <1.3 || >=2.0 && <2.1 stripe-concepts = doJailbreak super.stripe-concepts; # text >=1.2.5 && <1.3 || >=2.0 && <2.1 stripe-signature = doJailbreak super.stripe-signature; # text >=1.2.5 && <1.3 || >=2.0 && <2.1 string-random = doJailbreak super.string-random; # text >=1.2.2.1 && <2.1