JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

haskellPackages.tasty-discover: drop obsolete overrides

Browse Source 
Finally all the patches we applied have reached a hackage release.
This commit is contained in:
sternenseemann 2022-05-30 15:21:57 +02:00
parent 6540a11768
commit 7badab08b5
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -515,28 +515,8 @@ self: super: {
# else dontCheck super.doctest-discover);
doctest-discover = dontCheck super.doctest-discover;
# Depends on itself for testing
tasty-discover = overrideCabal (drv: {
# Compatibility with tasty-hspec >= 1.1.7 requires a patch and a dependency on hspec
patches = drv.patches or [] ++ [
# Intermediate patch so fix applies
(fetchpatch {
url = "https://github.com/haskell-works/tasty-discover/commit/67b022f5945abdfb71ca31fca7910abc7effe043.patch";
sha256 = "1x539qa2871fiahw9zjxyyqz86v4ib7k7fv9hdvvxcrrfw3zwl66";
})
# Actual fix
(fetchpatch {
name = "tasty-hspec-1.1.7-compat.patch";
url = "https://github.com/haskell-works/tasty-discover/commit/98d3c464f33129e38fa9c0fcdfb1847dfb0490b9.patch";
sha256 = "01a8ni3lyh1wql7aghl41nd2c9m6gcn1i77bh3pygh6r403x771p";
})
];
testHaskellDepends = drv.testHaskellDepends or [] ++ [
self.hspec
];
# https://github.com/haskell-works/tasty-discover/issues/17
jailbreak = true; # allow tasty-hspec >= 1.2
# Depends on itself for testing
preBuild = ''
export PATH="$PWD/dist/build/tasty-discover:$PATH"
'' + (drv.preBuild or "");