dff50aa · typeable/cabal2nix

src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs+1−1

@@ -28,7 +28,7 @@ configureCabalFlags (PackageIdentifier name version)

28 , enable "s3"

29 , enable "tahoe"

30 , enable "tdfa"

31− , enable "testsuite"

31+ , ("testsuite", version `withinRange` "< 6.20170925")

32 , enable "torrentparser"

33 , enable "webapp"

34 , enable "webapp-secure"

src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+1

@@ -61,6 +61,7 @@ hooks =

61 , ("gi-pangocairo", giCairoPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36

62 , ("gi-pango", giCairoPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36

63 , ("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 , ("github-backup", set (executableDepends . tool . contains (pkg "git")) True)

65 , ("github-backup", set (executableDepends . tool . contains (pkg "git")) True)

65 , ("git", set doCheck False) -- https://github.com/vincenthz/hit/issues/33

66 , ("git", set doCheck False) -- https://github.com/vincenthz/hit/issues/33

66 , ("gi-webkit", webkitgtk24xHook) -- https://github.com/haskell-gi/haskell-gi/issues/36

67 , ("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

69instance IsString Version where

70 fromString = text2isString "Version"

71

72+instance IsString VersionRange where

73+ fromString = text2isString "VersionRange"

74+

72instance IsString PackageIdentifier where

75instance IsString PackageIdentifier where

73 fromString = text2isString "PackageIdentifier"

76 fromString = text2isString "PackageIdentifier"

74

77