cabal2arch 0.3.2 → 0.3.3

raw patch · 2 files changed

+29/−3 lines, 2 files

Files

• Main.hs +28/−2
• cabal2arch.cabal +1/−1

@@ -186,6 +186,7 @@     ,Dependency "base"             (ThisVersion (Version  [3,0,1,0] []))     ,Dependency "bytestring"       (ThisVersion (Version  [0,9,0,1] []))     ,Dependency "cgi"              (ThisVersion (Version  [3001,1,5,1] []))+    ,Dependency "ghc"              (AnyVersion)     ,Dependency "containers"       (ThisVersion (Version  [0,1,0,1] []))     ,Dependency "directory"        (ThisVersion (Version  [1,0,0,0] []))     ,Dependency "fgl"              (ThisVersion (Version  [5,4,1,1] []))@@ -284,7 +285,7 @@                     Just l  -> extraLibs (libBuildInfo l)      canonicalise k = case M.lookup k translationTable of-        Nothing -> trace "WARNING: this library depends on a C library we do not know the pacman name for. Check the C library names in the generated PKGBUILD File" $ k+        Nothing -> trace "WARNING: this library depends on a C library we do not know the pacman name for. Check the C library names in the generated PKGBUILD File" $ map toLower k         Just s  -> s      -- known pacman packages for C libraries we use:@@ -292,9 +293,33 @@         [("curses",     "ncurses")         ,("bz2",        "bzip2")         ,("z",          "zlib")+        ,("Imlib2",     "imlib2")+        ,("cblas",      "blas")+        ,("curl",       "curl")+        ,("xenctl",     "xen")+        ,("odbc",       "unixodbc")+        ,("crack",      "cracklib")+        ,("pq",         "postgresql")+        ,("glib",       "glib2")+        ,("ldap",       "libldap")+        ,("SDL",        "sdl")+        ,("pcap",        "libpcap")+        ,("m",          "")         ] +  -- TODO careful translation table for haskell libraries too,+  --+      -- xmonad, ghc, haxml +shouldNotBeLibraries :: [String]+shouldNotBeLibraries =+    ["xmonad"+    ,"hscolour"+    ,"distract"+    ,"Hedi"+    ,"conjure"+    ,"cpphs"+    ]  ------------------------------------------------------------------------ -- Parsing and pretty printing:@@ -419,7 +444,8 @@     vers     = pkgVersion (package cabal)      hasLibrary = isJust (library cabal)-    isLibrary  = isJust (library cabal) && null (executables cabal)+    isLibrary  = isJust (library cabal) -- && null (executables cabal)+                    && map toLower name `notElem` shouldNotBeLibraries      anyClibraries | null libs = ArchList []                   | otherwise = ArchList libs

@@ -1,5 +1,5 @@ name:               cabal2arch-version:            0.3.2+version:            0.3.3 homepage:           http://code.haskell.org/~dons/code/cabal2arch synopsis:           Create Arch Linux packages from Cabal packages description:        Create Arch Linux packages from Cabal packages