git.iko.soy/typeable/cabal2nix
on master help sign in
Don't disable the text-icu test suite on Darwin. It's failure indicates
3cf0fa5Peter Simons
src/Cabal2Nix/PostProcess.hs−4
compare with master
unifiedsplit
@@ -95,7 +95,6 @@ postProcess deriv@(MkDerivation {..})
95 = deriv { doCheck = True, phaseOverrides = sybDoCheck }
95 = deriv { doCheck = True, phaseOverrides = sybDoCheck }
96 | pname == "tar" = deriv { runHaddock = True, phaseOverrides = tarNoHaddock }
96 | pname == "tar" = deriv { runHaddock = True, phaseOverrides = tarNoHaddock }
97 | pname == "terminfo" = deriv { extraLibs = "ncurses":extraLibs }
97 | pname == "terminfo" = deriv { extraLibs = "ncurses":extraLibs }
98− | pname == "text-icu" = deriv { doCheck = True, phaseOverrides = textIcuDoCheckHook }
99 | pname == "threadscope" = deriv { configureFlags = "--ghc-options=-rtsopts":configureFlags }
98 | pname == "threadscope" = deriv { configureFlags = "--ghc-options=-rtsopts":configureFlags }
100 | pname == "thyme" = deriv { buildTools = "cpphs":buildTools }
99 | pname == "thyme" = deriv { buildTools = "cpphs":buildTools }
101 | pname == "transformers" && version >= Version [0,4,1] []
100 | pname == "transformers" && version >= Version [0,4,1] []
@@ -257,9 +256,6 @@ cabal2nixDoCheckHook = "doCheck = self.stdenv.lib.versionOlder \"7.6\" self.ghc.
257cookieDoCheckHook :: String
256cookieDoCheckHook :: String
258cookieDoCheckHook = "doCheck = self.stdenv.lib.versionOlder \"7.8\" self.ghc.version;"
257cookieDoCheckHook = "doCheck = self.stdenv.lib.versionOlder \"7.8\" self.ghc.version;"
259
258
260−textIcuDoCheckHook :: String
261−textIcuDoCheckHook = "doCheck = !self.stdenv.isDarwin;"
262−
263eitherNoHaddock :: String
259eitherNoHaddock :: String
264eitherNoHaddock = "noHaddock = self.stdenv.lib.versionOlder self.ghc.version \"7.6\";"
260eitherNoHaddock = "noHaddock = self.stdenv.lib.versionOlder self.ghc.version \"7.6\";"
265
261