git.iko.soy/typeable/cabal2nix
on master help sign in
git-annex: disable support for the test suite

Ever since version 6.20170925, git-annex needs a checked-out copy of its git repository to run its test suite. This means that we'd have to switch to fetchgit in order to run the suite, so we'll just disable it for the time being.

commitdff50aaee4b4472be5ecfbacba5b975e134c940a authorPeter Simons <simons@cryp.to> dateSat 30 Sep 2017, 09:45 (9 years ago) parent3c87c13
3 files changed+5−1
compare with master
unifiedsplit
src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs+1−1 src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+1 src/Distribution/Nixpkgs/Haskell/OrphanInstances.hs+3
src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs+1−1
@@ -28,7 +28,7 @@ configureCabalFlags (PackageIdentifier name version)
2828 , enable "s3"
2929 , enable "tahoe"
3030 , enable "tdfa"
31− , enable "testsuite"
31+ , ("testsuite", version `withinRange` "< 6.20170925")
3232 , enable "torrentparser"
3333 , enable "webapp"
3434 , enable "webapp-secure"
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+1
@@ -61,6 +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
6465 , ("github-backup", set (executableDepends . tool . contains (pkg "git")) True)
6566 , ("git", set doCheck False) -- https://github.com/vincenthz/hit/issues/33
6667 , ("gi-webkit", webkitgtk24xHook) -- https://github.com/haskell-gi/haskell-gi/issues/36
src/Distribution/Nixpkgs/Haskell/OrphanInstances.hs+3
@@ -69,6 +69,9 @@ instance NFData AbiTag
6969instance IsString Version where
7070 fromString = text2isString "Version"
7171
72+instance IsString VersionRange where
73+ fromString = text2isString "VersionRange"
74+
7275instance IsString PackageIdentifier where
7376 fromString = text2isString "PackageIdentifier"
7477