diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 537bce427b8e..460cdc6dad5e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -832,6 +832,15 @@ with haskellLib; # Tests require a Kafka broker running locally haskakafka = dontCheck super.haskakafka; + # https://github.com/itchyny/qhs/issues/8 + qhs = overrideSrc { + version = "0.4.3"; + src = pkgs.fetchzip { + url = "mirror://hackage/qhs-0.4.3/qhs-0.4.3.tar.gz"; + sha256 = "191015m47qdxzi8w5pvadgv95g8vk7v2gr76jzfgglyjy6zhb5wb"; + }; + } (warnAfterVersion "0.4.2" super.qhs); + # Fix build with time >= 1.10 while retaining compat with time < 1.9 mbox = appendPatch ./patches/mbox-time-1.10.patch ( overrideCabal { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 683cd7ef0eba..3e2852cd6669 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5160,7 +5160,6 @@ broken-packages: - qc-oi-testgenerator # failure in job https://hydra.nixos.org/build/233197822 at 2023-09-02 - qd # failure in job https://hydra.nixos.org/build/233213936 at 2023-09-02 - qed # failure in job https://hydra.nixos.org/build/233249635 at 2023-09-02 - - qhs # failure in job https://hydra.nixos.org/build/315099159 at 2025-11-29 - qhull-simple # failure in job https://hydra.nixos.org/build/233248108 at 2023-09-02 - qif # failure in job https://hydra.nixos.org/build/233227609 at 2023-09-02 - QIO # failure in job https://hydra.nixos.org/build/233233009 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index eae4e1c104f6..9645322c1a09 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -134,6 +134,18 @@ builtins.intersectAttrs super { ### END HASKELL-LANGUAGE-SERVER SECTION ### ########################################### + qhs = lib.pipe super.qhs [ + # Package does not declare tool dependency hspec-discover + (addTestToolDepends [ self.hspec-discover ]) + # tests depend on executable + (overrideCabal (drv: { + preCheck = '' + ${drv.preCheck or ""} + export PATH="$PWD/dist/build/qhs:$PATH" + ''; + })) + ]; + # Test suite needs executable agda2lagda = overrideCabal (drv: { preCheck = '' diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index da160a445ab3..b37b61acb201 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -569853,9 +569853,7 @@ self: { doHaddock = false; description = "Command line tool qhs, SQL queries on CSV and TSV files"; license = lib.meta.getLicenseFromSpdxId "MIT"; - hydraPlatforms = lib.platforms.none; mainProgram = "qhs"; - broken = true; } ) { };