about summary refs log tree commit diff
diff options
context:
space:
mode:
authort4ccer <t4ccer@gmail.com>2024-02-16 23:40:20 -0700
committert4ccer <t4ccer@gmail.com>2024-02-16 23:44:37 -0700
commit65c7cdc3a77c59881cb0f7c39dbce5c8ca950df3 (patch)
treecc89cfc54e146278040ec4aec320259fb99638c6
parent2f576c19f72184165ac7a318f9dee5936a15ef7b (diff)
downloadnixlib-65c7cdc3a77c59881cb0f7c39dbce5c8ca950df3.tar
nixlib-65c7cdc3a77c59881cb0f7c39dbce5c8ca950df3.tar.gz
nixlib-65c7cdc3a77c59881cb0f7c39dbce5c8ca950df3.tar.bz2
nixlib-65c7cdc3a77c59881cb0f7c39dbce5c8ca950df3.tar.lz
nixlib-65c7cdc3a77c59881cb0f7c39dbce5c8ca950df3.tar.xz
nixlib-65c7cdc3a77c59881cb0f7c39dbce5c8ca950df3.tar.zst
nixlib-65c7cdc3a77c59881cb0f7c39dbce5c8ca950df3.zip
haskellPackages.containers-unicode-symbols: unbreak
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix9
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml1
2 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ce2fe4adcca1..01a5f75d7aa4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -309,6 +309,15 @@ self: super: {
   # > https://github.com/roelvandijk/numerals
   numerals = doJailbreak (dontCheck super.numerals);
 
+  # Bound on containers is too strict but jailbreak doesn't work with conditional flags
+  # https://github.com/NixOS/jailbreak-cabal/issues/24
+  containers-unicode-symbols = overrideCabal {
+    postPatch = ''
+      substituteInPlace containers-unicode-symbols.cabal \
+        --replace 'containers >= 0.5 && < 0.6.5' 'containers'
+    '';
+  } super.containers-unicode-symbols;
+
   # This test keeps being aborted because it runs too quietly for too long
   Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2;
 
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 5ab0290bbed6..ac1efbb96be7 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -917,7 +917,6 @@ broken-packages:
   - consul-haskell # failure in job https://hydra.nixos.org/build/233195306 at 2023-09-02
   - Consumer # failure in job https://hydra.nixos.org/build/233227840 at 2023-09-02
   - containers-benchmark # failure in job https://hydra.nixos.org/build/233244707 at 2023-09-02
-  - containers-unicode-symbols # failure in job https://hydra.nixos.org/build/233206693 at 2023-09-02
   - containers-verified # failure in job https://hydra.nixos.org/build/233228855 at 2023-09-02
   - ContArrow # failure in job https://hydra.nixos.org/build/233215540 at 2023-09-02
   - ContextAlgebra # failure in job https://hydra.nixos.org/build/233197054 at 2023-09-02