git.iko.soy/typeable/cabal2nix
on master help sign in
cosmetic
eb3ae9bPeter Simons
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+9−8
compare with master
unifiedsplit
@@ -35,22 +35,23 @@ fixGtkBuilds drv = drv & dependencies . pkgconfig %~ Set.filter (not . collidesW
35hooks :: [(Dependency, Derivation -> Derivation)]
35hooks :: [(Dependency, Derivation -> Derivation)]
36hooks =
36hooks =
37 [ ("Agda", set (executableDepends . tool . contains (pkg "emacs")) True . set phaseOverrides agdaPostInstall)
37 [ ("Agda", set (executableDepends . tool . contains (pkg "emacs")) True . set phaseOverrides agdaPostInstall)
38− , ("dns", set testTarget "spec") -- don't execute tests that try to access the network
39 , ("bindings-GLFW", over (libraryDepends . system) (Set.union (Set.fromList [bind "pkgs.xlibs.libXext", bind "pkgs.xlibs.libXfixes"])))
38 , ("bindings-GLFW", over (libraryDepends . system) (Set.union (Set.fromList [bind "pkgs.xlibs.libXext", bind "pkgs.xlibs.libXfixes"])))
40 , ("cabal-install", set phaseOverrides cabalInstallPostInstall)
39 , ("cabal-install", set phaseOverrides cabalInstallPostInstall)
41 , ("darcs", set phaseOverrides darcsInstallPostInstall)
40 , ("darcs", set phaseOverrides darcsInstallPostInstall)
41+ , ("dns", set testTarget "spec") -- don't execute tests that try to access the network
42 , ("eventstore", over (metaSection . platforms) (Set.filter (\(Platform arch _) -> arch == X86_64)))
42 , ("eventstore", over (metaSection . platforms) (Set.filter (\(Platform arch _) -> arch == X86_64)))
43− , ("git-annex", gitAnnexHook)
44− , ("haddock", set phaseOverrides "preCheck = \"unset GHC_PACKAGE_PATH\";")
45− , ("HFuse", set phaseOverrides hfusePreConfigure)
46− , ("hmatrix", set phaseOverrides "preConfigure = \"sed -i hmatrix.cabal -e 's@/usr/@/dont/hardcode/paths/@'\";")
47 , ("gf", set phaseOverrides gfPhaseOverrides . set doCheck False)
43 , ("gf", set phaseOverrides gfPhaseOverrides . set doCheck False)
44+ , ("git-annex", gitAnnexHook)
48 , ("github-backup", set (executableDepends . tool . contains (pkg "git")) True)
45 , ("github-backup", set (executableDepends . tool . contains (pkg "git")) True)
49 , ("GlomeVec", set (libraryDepends . pkgconfig . contains (bind "self.llvmPackages.llvm")) True)
46 , ("GlomeVec", set (libraryDepends . pkgconfig . contains (bind "self.llvmPackages.llvm")) True)
50 , ("gtk3", gtk3Hook)
47 , ("gtk3", gtk3Hook)
48+ , ("haddock", set phaseOverrides "preCheck = \"unset GHC_PACKAGE_PATH\";")
49+ , ("HFuse", set phaseOverrides hfusePreConfigure)
50+ , ("hmatrix", set phaseOverrides "preConfigure = \"sed -i hmatrix.cabal -e 's@/usr/@/dont/hardcode/paths/@'\";")
51− , ("libconfig", over (libraryDepends . system) (Set.insert (pkg "libconfig") . Set.delete (binding # ("config", path # ["null"]))))
51+ , ("hslua", over (libraryDepends . pkgconfig) (Set.insert (pkg "lua5_1") . Set.delete (pkg "lua")))
52 , ("imagemagick", set (libraryDepends . pkgconfig . contains (pkg "imagemagick")) True) -- https://github.com/NixOS/cabal2nix/issues/136
52 , ("imagemagick", set (libraryDepends . pkgconfig . contains (pkg "imagemagick")) True) -- https://github.com/NixOS/cabal2nix/issues/136
53 , ("jsaddle", set (dependencies . haskell . contains (bind "self.ghcjs-base")) False)
53 , ("jsaddle", set (dependencies . haskell . contains (bind "self.ghcjs-base")) False)
54+ , ("libconfig", over (libraryDepends . system) (Set.insert (pkg "libconfig") . Set.delete (binding # ("config", path # ["null"]))))
54 , ("liquid-fixpoint", set (executableDepends . system . contains (pkg "ocaml")) True . set (testDepends . system . contains (pkg "z3")) True)
55 , ("liquid-fixpoint", set (executableDepends . system . contains (pkg "ocaml")) True . set (testDepends . system . contains (pkg "z3")) True)
55 , ("liquidhaskell", set (testDepends . system . contains (pkg "z3")) True)
56 , ("liquidhaskell", set (testDepends . system . contains (pkg "z3")) True)
56 , ("mysql", set (libraryDepends . system . contains (pkg "mysql")) True)
57 , ("mysql", set (libraryDepends . system . contains (pkg "mysql")) True)
@@ -60,10 +61,10 @@ hooks =
60 , ("target", set (testDepends . system . contains (pkg "z3")) True)
61 , ("target", set (testDepends . system . contains (pkg "z3")) True)
61 , ("terminfo", set (libraryDepends . system . contains (pkg "ncurses")) True)
62 , ("terminfo", set (libraryDepends . system . contains (pkg "ncurses")) True)
62 , ("thyme", set (libraryDepends . tool . contains (bind "self.cpphs")) True) -- required on Darwin
63 , ("thyme", set (libraryDepends . tool . contains (bind "self.cpphs")) True) -- required on Darwin
63− , ("xmonad", set phaseOverrides xmonadPostInstall)
64− , ("wxc", wxcHook)
65 , ("wxcore", set (libraryDepends . pkgconfig . contains (pkg "wxGTK")) True)
64 , ("wxcore", set (libraryDepends . pkgconfig . contains (pkg "wxGTK")) True)
65+ , ("wxc", wxcHook)
66 , ("X11", over (libraryDepends . system) (Set.union (Set.fromList $ map bind ["pkgs.xlibs.libXinerama","pkgs.xlibs.libXext","pkgs.xlibs.libXrender"])))
66 , ("X11", over (libraryDepends . system) (Set.union (Set.fromList $ map bind ["pkgs.xlibs.libXinerama","pkgs.xlibs.libXext","pkgs.xlibs.libXrender"])))
67+ , ("xmonad", set phaseOverrides xmonadPostInstall)
67 ]
68 ]
68
69
69pkg :: Identifier -> Binding
70pkg :: Identifier -> Binding
hackage2nix/src/Main.hs+1−1
@@ -201,7 +201,7 @@ main = do
201 hPutStrLn h ("self: super: assert super.ghc.name == " ++ show (display compiler) ++ "; {")
201 hPutStrLn h ("self: super: assert super.ghc.name == " ++ show (display compiler) ++ "; {")
202 hPutStrLn h ""
202 hPutStrLn h ""
203 hPutStrLn h " # core libraries provided by the compiler"
203 hPutStrLn h " # core libraries provided by the compiler"
204− forM_ (Map.keys corePackages') $ \n -> do
204+ forM_ (Map.keys corePackages') $ \n ->
205 unless (n == "ghc") (hPutStrLn h (" " ++ n ++ " = null;"))
205 unless (n == "ghc") (hPutStrLn h (" " ++ n ++ " = null;"))
206 hPutStrLn h ""
206 hPutStrLn h ""
207 hPutStrLn h (" # " ++ show (pPrint snapshot) ++ " packages")
207 hPutStrLn h (" # " ++ show (pPrint snapshot) ++ " packages")