Enable experimental, fix code
authorJoachim Breitner <mail@joachim-breitner.de>
Sat, 22 Dec 2012 09:35:12 +0000 (09:35 +0000)
committerJoachim Breitner <mail@joachim-breitner.de>
Sat, 22 Dec 2012 09:35:12 +0000 (09:35 +0000)
Main.hs
PlatformOutput.hs
makestatic.sh
runhpvt.sh

diff --git a/Main.hs b/Main.hs
index c7c8c9c..67a9a49 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -33,6 +33,9 @@ main = do
        debian_wheezy <- D.readFile "Sources.wheezy" "wheezy" hackage
        putStrLn $ "Read " ++ show (M.size debian_wheezy) ++ " packages from Debian (Wheezy)"
 
+       debian_experimental <- D.readFile "Sources.experimental" "experimental" hackage
+       putStrLn $ "Read " ++ show (M.size debian_experimental) ++ " packages from Debian (Wheezy)"
+
         platform_2010_1_0_0 <- flattenPackageDescription <$> readPackageDescription normal "haskell-platform-2010.1.0.0.cabal"
         platform_2012_2_0_0 <- flattenPackageDescription <$> readPackageDescription normal "haskell-platform-2012.2.0.0.cabal"
         platform_darcs <- flattenPackageDescription <$> readPackageDescription normal "haskell-platform-darcs.cabal"
@@ -55,7 +58,8 @@ main = do
                     ("Wheezy", debian_wheezy)
                 ])
                 , (platform_darcs, [
-                    ("Unstable", debian_unstable)
+                    ("Unstable", debian_unstable),
+                    ("Experimental", debian_experimental)
                 ])
             ]
 
index 82f17a0..11c0569 100644 (file)
@@ -50,8 +50,8 @@ mkTable hackage datas = table << (
   where buildDependsMap pd = M.fromList (map fromDep deps)
           where fromDep (Dependency pkg (ThisVersion ver)) = (fromCabal pkg,ver)
                 fromDep d = error $ "Unexpected dependency format " ++ display d
-                deps = buildDepends pd ++ buildTools bi
-                bi = libBuildInfo (fromJust (library pd))
+                deps = buildDepends pd ++ tools
+                tools = maybe [] (buildTools . libBuildInfo) (library pd)
         maps = map (\(p,dists) -> (buildDependsMap p,dists)) datas
         pkgs = S.unions (map (M.keysSet . fst) maps)
         
index 99076b9..1bd56de 100644 (file)
@@ -1 +1 @@
-ghc -O2 -optl-static -optl-ffi -optl-pthread --make Main.hs  -o hpvt
+ghc -O2 -optl-static -optl-pthread --make Main.hs  -o hpvt
index 302fedc..e96d93c 100644 (file)
@@ -7,6 +7,7 @@ wget -q http://hackage.haskell.org/packages/archive/00-index.tar.gz -O 00-index.
 wget -q http://ftp.debian.org/debian/dists/unstable/main/source/Sources.bz2 -O - | bunzip2 > Sources.unstable
 wget -q http://ftp.debian.org/debian/dists/squeeze/main/source/Sources.bz2 -O - | bunzip2 > Sources.squeeze
 wget -q http://ftp.debian.org/debian/dists/wheezy/main/source/Sources.bz2 -O - | bunzip2 > Sources.wheezy
+wget -q http://ftp.debian.org/debian/dists/experimental/main/source/Sources.bz2 -O - | bunzip2 > Sources.experimental
 #wget -q http://code.galois.com/darcs/haskell-platform/haskell-platform.cabal -O - > haskell-platform-darcs.cabal
 #wget -q http://code.haskell.org/haskell-platform/haskell-platform.cabal -O - > haskell-platform-darcs.cabal
 wget --no-check-certificate -q https://raw.github.com/haskell/haskell-platform/pre-release/haskell-platform.cabal -O haskell-platform-darcs.cabal