diff options
author | Dennis Gosnell <cdep.illabout@gmail.com> | 2023-11-13 11:09:30 +0900 |
---|---|---|
committer | Dennis Gosnell <cdep.illabout@gmail.com> | 2023-11-13 11:09:30 +0900 |
commit | 0126d4c46f08064e7f3e5949c77bcc4d8377dae3 (patch) | |
tree | 92e349d5d45434d50abf84646f98e2e6bbb2a750 | |
parent | a182f66c4d277c03a1064f44657ecbbcb66e537b (diff) | |
parent | d1235fcaecc88dfb68d29bb7818df9bdc84a56bd (diff) | |
download | nixlib-0126d4c46f08064e7f3e5949c77bcc4d8377dae3.tar nixlib-0126d4c46f08064e7f3e5949c77bcc4d8377dae3.tar.gz nixlib-0126d4c46f08064e7f3e5949c77bcc4d8377dae3.tar.bz2 nixlib-0126d4c46f08064e7f3e5949c77bcc4d8377dae3.tar.lz nixlib-0126d4c46f08064e7f3e5949c77bcc4d8377dae3.tar.xz nixlib-0126d4c46f08064e7f3e5949c77bcc4d8377dae3.tar.zst nixlib-0126d4c46f08064e7f3e5949c77bcc4d8377dae3.zip |
Merge branch 'sensei-fix-specs' into haskell-updates
This is from https://github.com/NixOS/nixpkgs/pull/266911
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0768f0f182b4..e9b8cbf5e135 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1046,13 +1046,19 @@ self: super: { # test suite requires git and does a bunch of git operations restless-git = dontCheck super.restless-git; - # requires git at test-time *and* runtime, but we'll just rely on users to - # bring their own git at runtime. Additionally, sensei passes `-package - # hspec-meta` to GHC in the tests, but doesn't depend on it itself. - sensei = overrideCabal (drv: { + # patch out a flaky test that depends on output from hspec >= v2.11.7. + # https://github.com/hspec/sensei/issues/125 + sensei = appendPatch (fetchpatch { + url = "https://github.com/hspec/sensei/commit/5c11026fa48e13ea1c351ab882765eb0966f2e97.patch"; + hash = "sha256-eUCDvypj2bxTRnHLzrcembLMKHg5c3W3quNfclBDsso="; + }) (overrideCabal (drv: { + # sensei passes `-package hspec-meta` to GHC in the tests, but doesn't + # depend on it itself. testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta ]; + # requires git at test-time *and* runtime, but we'll just rely on users to + # bring their own git at runtime. testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ]; - }) super.sensei; + }) super.sensei); # Depends on broken fluid. fluid-idl-http-client = markBroken super.fluid-idl-http-client; |