From 8b62337df767573a2191709b2d8da52cc2edae97 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 19 Jan 2026 01:01:48 +0000 Subject: [PATCH 1/8] haskellPackages.safe-exceptions: simplify override --- pkgs/development/haskell-modules/configuration-nix.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a2ff42270836..e551dd77afde 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -508,10 +508,8 @@ builtins.intersectAttrs super { 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 ]; - }) super.safe-exceptions; + # Fix strictDeps build error "could not execute: hspec-discover" + safe-exceptions = addTestToolDepends [ self.hspec-discover ] super.safe-exceptions; # Test suite requires running a database server. Testing is done upstream. hasql = dontCheck super.hasql; From eccf0f6e119c3521064b9c207718129ffa3f2eda Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 19 Jan 2026 00:27:01 +0000 Subject: [PATCH 2/8] haskellPackages.unliftio: fix build with `strictDeps` --- pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index e551dd77afde..b4c36a650736 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -511,6 +511,9 @@ builtins.intersectAttrs super { # Fix strictDeps build error "could not execute: hspec-discover" safe-exceptions = addTestToolDepends [ self.hspec-discover ] super.safe-exceptions; + # Fix strictDeps build error "could not execute: hspec-discover" + unliftio = addTestToolDepends [ self.hspec-discover ] super.unliftio; + # Test suite requires running a database server. Testing is done upstream. hasql = dontCheck super.hasql; hasql-dynamic-statements = dontCheck super.hasql-dynamic-statements; From 9e808795cf3acb595dc9e3872d46b69b981e2741 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 19 Jan 2026 00:58:41 +0000 Subject: [PATCH 3/8] haskellPackages.yaml: fix strictDeps build --- pkgs/development/haskell-modules/configuration-nix.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index b4c36a650736..443cbf53efb7 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1027,6 +1027,7 @@ builtins.intersectAttrs super { (disableCabalFlag "no-exe") enableSeparateBinOutput (addBuildDepend self.optparse-applicative) + (addTestToolDepend self.hspec-discover) ]; # Compile manpages (which are in RST and are compiled with Sphinx). From fad607c3a22761432b5a480d14dd7aa5bcc33fee Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 19 Jan 2026 01:16:14 +0000 Subject: [PATCH 4/8] haskellPackages.http-types: fix strictDeps build --- pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 443cbf53efb7..a042d7572f93 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -508,6 +508,9 @@ builtins.intersectAttrs super { lz4-frame-conduit = addTestToolDepends [ pkgs.lz4 ] super.lz4-frame-conduit; + # Fix strictDeps build error "could not execute: hspec-discover" + http-types = addTestToolDepends [ self.hspec-discover ] super.http-types; + # Fix strictDeps build error "could not execute: hspec-discover" safe-exceptions = addTestToolDepends [ self.hspec-discover ] super.safe-exceptions; From 5caff24080d3b9058fa1cacfbe9a9753c0368ba1 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 19 Jan 2026 01:28:40 +0000 Subject: [PATCH 5/8] haskellPackages.word8: fix strictDeps build --- pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a042d7572f93..8a9616d36aa2 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -517,6 +517,9 @@ builtins.intersectAttrs super { # Fix strictDeps build error "could not execute: hspec-discover" unliftio = addTestToolDepends [ self.hspec-discover ] super.unliftio; + # Fix strictDeps build error "could not execute: hspec-discover" + word8 = addTestToolDepends [ self.hspec-discover ] super.word8; + # Test suite requires running a database server. Testing is done upstream. hasql = dontCheck super.hasql; hasql-dynamic-statements = dontCheck super.hasql-dynamic-statements; From 9f5633cdfaf0fbf424cebd098c531b49da32057d Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 19 Jan 2026 01:29:46 +0000 Subject: [PATCH 6/8] haskellPackages.http-date: fix strictDeps build --- pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 8a9616d36aa2..2b9e6d45ec0a 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -508,6 +508,9 @@ builtins.intersectAttrs super { lz4-frame-conduit = addTestToolDepends [ pkgs.lz4 ] super.lz4-frame-conduit; + # Fix strictDeps build error "could not execute: hspec-discover" + http-date = addTestToolDepends [ self.hspec-discover ] super.http-date; + # Fix strictDeps build error "could not execute: hspec-discover" http-types = addTestToolDepends [ self.hspec-discover ] super.http-types; From 3f7b76484080a64df5ac4496245586a6c254028a Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 19 Jan 2026 01:32:31 +0000 Subject: [PATCH 7/8] haskellPackages.hspec-wai: fix strictDeps build --- pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 2b9e6d45ec0a..ef6162d88b64 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -508,6 +508,9 @@ builtins.intersectAttrs super { lz4-frame-conduit = addTestToolDepends [ pkgs.lz4 ] super.lz4-frame-conduit; + # Fix strictDeps build error "could not execute: hspec-discover" + hspec-wai = addTestToolDepends [ self.hspec-discover ] super.hspec-wai; + # Fix strictDeps build error "could not execute: hspec-discover" http-date = addTestToolDepends [ self.hspec-discover ] super.http-date; From 95e985376797add56da7d868b8de7a8406579b5e Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 20 Jan 2026 20:49:19 +0000 Subject: [PATCH 8/8] haskellPackages: clarify the nature of `hspec-discover` toolDepends Co-authored-by: sternenseemann --- .../haskell-modules/configuration-nix.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index ef6162d88b64..07a0d1117f19 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -508,22 +508,22 @@ builtins.intersectAttrs super { lz4-frame-conduit = addTestToolDepends [ pkgs.lz4 ] super.lz4-frame-conduit; - # Fix strictDeps build error "could not execute: hspec-discover" + # Package does not declare tool dependency hspec-discover hspec-wai = addTestToolDepends [ self.hspec-discover ] super.hspec-wai; - # Fix strictDeps build error "could not execute: hspec-discover" + # Package does not declare tool dependency hspec-discover http-date = addTestToolDepends [ self.hspec-discover ] super.http-date; - # Fix strictDeps build error "could not execute: hspec-discover" + # Package does not declare tool dependency hspec-discover http-types = addTestToolDepends [ self.hspec-discover ] super.http-types; - # Fix strictDeps build error "could not execute: hspec-discover" + # Package does not declare tool dependency hspec-discover safe-exceptions = addTestToolDepends [ self.hspec-discover ] super.safe-exceptions; - # Fix strictDeps build error "could not execute: hspec-discover" + # Package does not declare tool dependency hspec-discover unliftio = addTestToolDepends [ self.hspec-discover ] super.unliftio; - # Fix strictDeps build error "could not execute: hspec-discover" + # Package does not declare tool dependency hspec-discover word8 = addTestToolDepends [ self.hspec-discover ] super.word8; # Test suite requires running a database server. Testing is done upstream. @@ -1039,6 +1039,7 @@ builtins.intersectAttrs super { (disableCabalFlag "no-exe") enableSeparateBinOutput (addBuildDepend self.optparse-applicative) + # Package does not declare tool dependency hspec-discover (addTestToolDepend self.hspec-discover) ];