From dcf6af335a6c0f3cafb04178925c6c3f75f0262a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 25 May 2025 12:06:14 +0000 Subject: [PATCH] haskellPackages.lz4-frame-conduit: Fix test by adding lz4 binary --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 2 ++ pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 25f1b95bc68a..3ecf5d97b7e4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3739,7 +3739,6 @@ broken-packages: - lxd-client-config # failure in job https://hydra.nixos.org/build/233225008 at 2023-09-02 - lxd-client # failure in job https://hydra.nixos.org/build/233231826 at 2023-09-02 - lye # failure in job https://hydra.nixos.org/build/233229866 at 2023-09-02 - - lz4-frame-conduit # failure in job https://hydra.nixos.org/build/233225578 at 2023-09-02 - lzip # failure in job https://hydra.nixos.org/build/233215027 at 2023-09-02 - lzma-streams # failure in job https://hydra.nixos.org/build/233229106 at 2023-09-02 - lzo # failure in job https://hydra.nixos.org/build/233200657 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 1937f9e616a1..59d67c1f7f34 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -404,6 +404,8 @@ builtins.intersectAttrs super { # The curl executable is required for withApplication tests. warp = addTestToolDepend pkgs.curl super.warp; + lz4-frame-conduit = addTestToolDepends [ pkgs.lz4 ] super.lz4-frame-conduit; + safe-exceptions = overrideCabal (drv: { # Fix strictDeps build error "could not execute: hspec-discover" testToolDepends = drv.testToolDepends or [ ] ++ [ self.hspec-discover ]; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 32a135ebd8bf..92d38067a93f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -430986,9 +430986,7 @@ self: { ]; description = "Conduit implementing the official LZ4 frame streaming format"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "haskell-lz4c"; - broken = true; } ) { };