From 19fae07daa776ee8a26767b15cfb4a050a2e1b7f Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 12 Aug 2025 01:17:11 +0200 Subject: [PATCH] haskellPackages.wai-app-file-cgi: fix missing +x in test scripts --- .../configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 9 +++++++++ pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 3a0cd128ed51..f31f05b8d188 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -6598,7 +6598,6 @@ broken-packages: - vty-ui # failure in job https://hydra.nixos.org/build/233200900 at 2023-09-02 - wacom-daemon # failure in job https://hydra.nixos.org/build/233213077 at 2023-09-02 - waddle # failure in job https://hydra.nixos.org/build/233239973 at 2023-09-02 - - wai-app-file-cgi # failure in job https://hydra.nixos.org/build/252733772 at 2024-03-16 - wai-control # failure in job https://hydra.nixos.org/build/295098171 at 2025-04-22 - wai-git-http # failure in job https://hydra.nixos.org/build/233191513 at 2023-09-02 - wai-graceful # failure in job https://hydra.nixos.org/build/233243180 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index bdc2bd9afcb0..1db8049987b9 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1746,6 +1746,15 @@ builtins.intersectAttrs super { jsaddle-warp = addTestToolDepends [ pkgs.nodejs ] super.jsaddle-warp; + # Hackage tarball doesn't have the executable bits from git repo + wai-app-file-cgi = overrideCabal (drv: { + preCheck = '' + ${drv.preCheck or ""} + chmod +x test/cgi-bin/* + patchShebangs test/cgi-bin + ''; + }) super.wai-app-file-cgi; + # Makes the mpi-hs package respect the choice of mpi implementation in Nixpkgs. # Also adds required test dependencies for checks to pass mpi-hs = diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 37dcef5f1675..a7b4f53c5afe 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -704611,8 +704611,6 @@ self: { ]; description = "File/CGI/Rev Proxy App of WAI"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { };