@@ -9,7 +9,7 @@ import Distribution.Text ( display )
99postProcess :: Derivation -> Derivation
1010postProcess deriv@(MkDerivation {..})
1111 | pname == "aeson" && version > Version [0,7] []
12− = deriv { buildDepends = "blazeBuilder":buildDepends }
12+ = deriv { buildDepends = "blaze-builder":buildDepends }
1313 | pname == "Agda" = deriv { buildTools = "emacs":buildTools, phaseOverrides = agdaPostInstall }
1414 | pname == "alex" && version < Version [3,1] []
1515 = deriv { buildTools = "perl":buildTools }
@@ -18,19 +18,15 @@ postProcess deriv@(MkDerivation {..})
1818 | pname == "bindings-GLFW" = deriv { extraLibs = "libXext":"libXfixes":extraLibs }
1919 | pname == "bits-extras" = deriv { configureFlags = "--ghc-option=-lgcc_s":configureFlags, extraLibs = filter (/= "gcc_s") extraLibs }
2020 | pname == "Cabal" = deriv { phaseOverrides = "preCheck = \"unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP\";" }
21− | pname == "cabal2nix" = deriv { doCheck = True, phaseOverrides = cabal2nixDoCheckHook }
2221 | pname == "cabal-bounds" = deriv { buildTools = "cabalInstall":buildTools }
2322 | pname == "cabal-install" && version >= Version [0,14] []
2423 = deriv { phaseOverrides = cabalInstallPostInstall }
2524 | pname == "cairo" = deriv { extraLibs = "pkgconfig":"libc":"cairo":"zlib":extraLibs }
26− | pname == "cookie" = deriv { phaseOverrides = cookieDoCheckHook }
2725 | pname == "cuda" = deriv { phaseOverrides = cudaConfigurePhase, extraLibs = "cudatoolkit":"nvidia_x11":"stdenv.cc":extraLibs }
2826 | pname == "darcs" = deriv { phaseOverrides = darcsInstallPostInstall }
2927 | pname == "dns" = deriv { testTarget = "spec" }
30− | pname == "doctest" = deriv { runHaddock = True, phaseOverrides = doctestNoHaddock }
3128 | pname == "editline" = deriv { extraLibs = "libedit":extraLibs }
3229 | pname == "epic" = deriv { extraLibs = "gmp":"boehmgc":extraLibs, buildTools = "happy":buildTools }
33− | pname == "either" = deriv { runHaddock = True, phaseOverrides = eitherNoHaddock }
3430 | pname == "ghc-heap-view" = deriv { phaseOverrides = ghciPostInstall }
3531 | pname == "ghc-mod" = deriv { phaseOverrides = ghcModPostInstall pname version, buildTools = "emacs":"makeWrapper":buildTools }
3632 | pname == "ghc-parser" = deriv { buildTools = "cpphs":"happy":buildTools, phaseOverrides = ghcParserPatchPhase }
@@ -63,9 +59,6 @@ postProcess deriv@(MkDerivation {..})
6359 | pname == "hmatrix-special" = deriv { extraLibs = "gsl":extraLibs }
6460 | pname == "hoogle" = deriv { testTarget = "--test-option=--no-net" }
6561 | pname == "hspec" = deriv { doCheck = False }
66− | pname == "hsyslog" = deriv { phaseOverrides = hsyslogNoHaddock }
67− | pname == "HTTP" && version >= Version [4000,2,14] []
68− = deriv { runHaddock = True, phaseOverrides = httpNoHaddock }
6962 | pname == "GlomeVec" = deriv { buildTools = "llvm":buildTools }
7063 | pname == "idris" = deriv { buildTools = "happy":buildTools, extraLibs = "gmp":"boehmgc":extraLibs }
7164 | pname == "language-c-quote" = deriv { buildTools = "alex":"happy":buildTools }
@@ -78,7 +71,6 @@ postProcess deriv@(MkDerivation {..})
7871 | pname == "llvm-general" = deriv { doCheck = False }
7972 | pname == "llvm-general-pure"= deriv { doCheck = False }
8073 | pname == "MFlow" = deriv { buildTools = "cpphs":buildTools }
81− | pname == "markdown-unlit" = deriv { runHaddock = True, phaseOverrides = markdownUnlitNoHaddock }
8274 | pname == "multiarg" = deriv { buildDepends = "utf8String":buildDepends }
8375 | pname == "mime-mail" = deriv { extraFunctionArgs = ["sendmail ? \"sendmail\""], phaseOverrides = mimeMailConfigureFlags }
8476 | pname == "mysql" = deriv { buildTools = "mysqlConfig":buildTools, extraLibs = "zlib":extraLibs }
@@ -92,8 +84,6 @@ postProcess deriv@(MkDerivation {..})
9284 | pname == "persistent" = deriv { extraLibs = "sqlite3":extraLibs }
9385 | pname == "poppler" = deriv { extraLibs = "libc":extraLibs }
9486 | pname == "purescript" = deriv { testDepends = "nodejs":testDepends }
95− | pname == "QuickCheck" && version >= Version [2,7,3] []
96− = deriv { runHaddock = True, phaseOverrides = quickCheckNoHaddock }
9787 | pname == "repa-algorithms" = deriv { extraLibs = "llvm":extraLibs }
9888 | pname == "repa-examples" = deriv { extraLibs = "llvm":extraLibs }
9989 | pname == "saltine" = deriv { extraLibs = map (\x -> if x == "sodium" then "libsodium" else x) extraLibs }
@@ -101,18 +91,11 @@ postProcess deriv@(MkDerivation {..})
10191 | pname == "SDL-mixer" = deriv { extraLibs = "SDL_mixer":extraLibs }
10292 | pname == "SDL-ttf" = deriv { extraLibs = "SDL_ttf":extraLibs }
10393 | pname == "sloane" = deriv { phaseOverrides = sloanePostInstall }
104− | pname == "split" && version == Version [0,2,2] []
105− = deriv { doCheck = True, phaseOverrides = splitDoCheck }
10694 | pname == "structured-haskell-mode" = deriv { buildTools = "emacs":buildTools, phaseOverrides = structuredHaskellModePostInstall }
10795 | pname == "svgcairo" = deriv { extraLibs = "libc":extraLibs }
108− | pname == "syb" && version == Version [0,4,2] []
109− = deriv { doCheck = True, phaseOverrides = sybDoCheck }
110− | pname == "tar" = deriv { runHaddock = True, phaseOverrides = tarNoHaddock }
11196 | pname == "terminfo" = deriv { extraLibs = "ncurses":extraLibs }
11297 | pname == "threadscope" = deriv { configureFlags = "--ghc-options=-rtsopts":configureFlags }
11398 | pname == "thyme" = deriv { buildTools = "cpphs":buildTools }
114− | pname == "transformers" && version >= Version [0,4,1] []
115− = deriv { runHaddock = True, phaseOverrides = transformersNoHaddock }
11699 | pname == "tz" = deriv { extraFunctionArgs = ["pkgs_tzdata"], phaseOverrides = "preConfigure = \"export TZDIR=${pkgs_tzdata}/share/zoneinfo\";" }
117100 | pname == "vacuum" = deriv { extraLibs = "ghcPaths":extraLibs }
118101 | pname == "vector" = deriv { configureFlags = "${stdenv.lib.optionalString stdenv.isi686 \"--ghc-options=-msse2\"}":configureFlags }
@@ -125,18 +108,14 @@ postProcess deriv@(MkDerivation {..})
125108 , configureFlags = "--extra-include-dirs=${freetype}/include/freetype2":configureFlags
126109 }
127110 | pname == "xmonad" = deriv { phaseOverrides = xmonadPostInstall }
128− | pname == "yi" = deriv { runHaddock = True, phaseOverrides = yiFixHaddock }
129111 | otherwise = deriv
130112
131113cudaConfigurePhase :: String
132114cudaConfigurePhase = unlines
133− [ "# Perhaps this should be the default in cabal.nix ..."
134− , "#"
135− , "# The cudatoolkit provides both 64 and 32-bit versions of the"
115+ [ "# The cudatoolkit provides both 64 and 32-bit versions of the"
136116 , "# library. GHC's linker fails if the wrong version is found first."
137117 , "# We solve this by eliminating lib64 from the path on 32-bit"
138118 , "# platforms and putting lib64 first on 64-bit platforms."
139− , "libPaths = if stdenv.is64bit then \"lib64 lib\" else \"lib\";"
140119 , "configurePhase = ''"
141120 , " for i in Setup.hs Setup.lhs; do"
142121 , " test -f $i && ghc --make $i"
@@ -145,7 +124,7 @@ cudaConfigurePhase = unlines
145124 , " if [ -d \"$p/include\" ]; then"
146125 , " extraLibDirs=\"$extraLibDirs --extra-include-dir=$p/include\""
147126 , " fi"
148− , " for d in $libPaths; do"
127+ , " for d in ${if stdenv.is64bit then \"lib64 lib\" else \"lib\"}; do"
149128 , " if [ -d \"$p/$d\" ]; then"
150129 , " extraLibDirs=\"$extraLibDirs --extra-lib-dir=$p/$d\""
151130 , " fi"
@@ -165,10 +144,6 @@ ghcModPostInstall pname version = unlines
165144 , " cd .."
166145 , " ensureDir \"$out/share/emacs\""
167146 , " mv $pname-$version emacs/site-lisp"
168− , " wrapProgram $out/bin/ghc-mod --add-flags \\"
169− , " \"\\$(${ghc.GHCGetPackages} ${ghc.version} \\\"\\$(dirname \\$0)\\\" \\\"-g -package-db -g\\\")\""
170− , " wrapProgram $out/bin/ghc-modi --add-flags \\"
171− , " \"\\$(${ghc.GHCGetPackages} ${ghc.version} \\\"\\$(dirname \\$0)\\\" \\\"-g -package-db -g\\\")\""
172147 , "'';"
173148 ]
174149
@@ -214,9 +189,6 @@ xmonadPostInstall = unlines
214189 , "];"
215190 ]
216191
217−yiFixHaddock :: String
218−yiFixHaddock = "noHaddock = stdenv.lib.versionOlder ghc.version \"7.8\";"
219−
220192gitAnnexOverrides :: String
221193gitAnnexOverrides = unlines
222194 [ "preConfigure = \"export HOME=$TEMPDIR\";"
@@ -258,26 +230,6 @@ lhs2texPostInstall = unlines
258230ncursesPatchPhase :: String
259231ncursesPatchPhase = "patchPhase = \"find . -type f -exec sed -i -e 's|ncursesw/||' {} \\\\;\";"
260232
261−doctestNoHaddock, markdownUnlitNoHaddock :: String
262−markdownUnlitNoHaddock = "noHaddock = stdenv.lib.versionOlder ghc.version \"7.4\";"
263−doctestNoHaddock = markdownUnlitNoHaddock
264−
265−cabal2nixDoCheckHook :: String
266−cabal2nixDoCheckHook = "doCheck = stdenv.lib.versionOlder \"7.8\" ghc.version;"
267−
268−cookieDoCheckHook :: String
269−cookieDoCheckHook = "doCheck = stdenv.lib.versionOlder \"7.8\" ghc.version;"
270−
271−eitherNoHaddock :: String
272−eitherNoHaddock = "noHaddock = stdenv.lib.versionOlder ghc.version \"7.6\";"
273−
274−httpNoHaddock, quickCheckNoHaddock, tarNoHaddock, transformersNoHaddock, hsyslogNoHaddock :: String
275−httpNoHaddock = "noHaddock = stdenv.lib.versionOlder ghc.version \"6.11\";"
276−quickCheckNoHaddock = httpNoHaddock
277−tarNoHaddock = httpNoHaddock
278−transformersNoHaddock = httpNoHaddock
279−hsyslogNoHaddock = httpNoHaddock
280−
281233agdaPostInstall :: String
282234agdaPostInstall = unlines
283235 [ "postInstall = ''"
@@ -308,10 +260,6 @@ mimeMailConfigureFlags = unlines
308260 [ "configureFlags = \"--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\\\"${sendmail}\\\"\";"
309261 ]
310262
311−sybDoCheck, splitDoCheck :: String
312−sybDoCheck = "doCheck = stdenv.lib.versionOlder ghc.version \"7.9\";"
313−splitDoCheck = sybDoCheck
314−
315263haddockPreCheck :: String
316264haddockPreCheck = "preCheck = \"unset GHC_PACKAGE_PATH\";"
317265