nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-16 06:48:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sensei-fix-specs' into haskell-updates

Browse Source 
This is from https://github.com/NixOS/nixpkgs/pull/266911
This commit is contained in:
Dennis Gosnell 2023-11-13 11:09:30 +09:00
commit 0126d4c46f
No known key found for this signature in database
GPG Key ID: 462E0C03D11422F4
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -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;