From bc33919e63d6a69c19aea5cc850498bccaf1be97 Mon Sep 17 00:00:00 2001 From: Qiming Chu Date: Thu, 15 May 2025 22:07:57 +0800 Subject: [PATCH] haskellPackages.sv2v: fix build and enable * Jailbreak sv2v package to relax too strict bounds on base <4.19 * Remove sv2v from broken packages list * Remove hydraPlatforms and broken flags to enable building Signed-off-by: Qiming Chu --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1c64baf583d9..d99970e5d8ad 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3230,6 +3230,9 @@ self: super: # 2025-04-19: Tests randomly fail 5 out of 10 times fft = dontCheck super.fft; + + # 2025-5-15: Too strict bounds on base <4.19, see: https://github.com/zachjs/sv2v/issues/317 + sv2v = doJailbreak super.sv2v; } // import ./configuration-tensorflow.nix { inherit pkgs haskellLib; } self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 533f1e99c532..25f1b95bc68a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5935,7 +5935,6 @@ broken-packages: - supplemented # failure in job https://hydra.nixos.org/build/233237397 at 2023-09-02 - supply-chain-core # failure in job https://hydra.nixos.org/build/252715612 at 2024-03-16 - surjective # failure in job https://hydra.nixos.org/build/233242908 at 2023-09-02 - - sv2v # failure in job https://hydra.nixos.org/build/295097359 at 2025-04-22 - sv-core # failure in job https://hydra.nixos.org/build/233217245 at 2023-09-02 - SVD2HS # failure in job https://hydra.nixos.org/build/233248575 at 2023-09-02 - svfactor # failure in job https://hydra.nixos.org/build/233256743 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 96fb57ee7651..32a135ebd8bf 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -642669,9 +642669,7 @@ self: { ]; description = "SystemVerilog to Verilog conversion"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "sv2v"; - broken = true; } ) { };