git.iko.soy/typeable/cabal2nix
on master help sign in
git-annex: re-enable test suite build again
commit07d88143cda21a721b27f101f2f997fba25170d0 authorPeter Simons <simons@cryp.to> dateWed 20 Dec 2017, 08:56 (9 years ago) parent48a154e
2 files changed+2−2
compare with master
unifiedsplit
src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs+1−1 src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+1−1
src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs+1−1
@@ -29,7 +29,7 @@ configureCabalFlags (PackageIdentifier name version)
2929 , enable "s3"
3030 , enable "tahoe"
3131 , enable "tdfa"
32− , ("testsuite", version `withinRange` "< 6.20170925")
32+ , ("testsuite", version `withinRange` "< 6.20170925 || >= 6.20171214")
3333 , enable "torrentparser"
3434 , enable "webapp"
3535 , enable "webapp-secure"
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+1−1
@@ -61,7 +61,7 @@ hooks =
6161 , ("gi-pangocairo", giCairoPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
6262 , ("gi-pango", giCairoPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
6363 , ("git-annex", gitAnnexHook)
64− , ("git-annex >= 6.20170925", set doCheck False) -- new version of git-annex require their test suite to be run inside of a git checkout
64+ , ("git-annex >= 6.20170925 && < 6.20171214", set doCheck False) -- some versions of git-annex require their test suite to be run inside of a git checkout
6565 , ("github-backup", set (executableDepends . tool . contains (pkg "git")) True)
6666 , ("git", set doCheck False) -- https://github.com/vincenthz/hit/issues/33
6767 , ("gi-webkit", webkitgtk24xHook) -- https://github.com/haskell-gi/haskell-gi/issues/36