cabal2arch 0.5.2 → 0.5.3

raw patch · 2 files changed

+23/−10 lines, 2 files

Files

• Main.hs +22/−9
• cabal2arch.cabal +1/−1

@@ -87,7 +87,7 @@            ["-h"]     -> help            _          -> return ()    email     <- do-       r <- getEnvMaybe "ARCH_HASKELL" +       r <- getEnvMaybe "ARCH_HASKELL"        case r of             Nothing -> do hPutStrLn stderr "Warning: ARCH_HASKELL environment variable not set. Set this to the maintainer contact you wish to use. \n E.g. 'Arch Haskell Team <arch-haskell@haskell.org>'"                           return []@@ -104,7 +104,7 @@         (Nothing :: Maybe (PackageIndex PackageIdentifier))         buildOS -- linux/x86_64         X86_64-        (CompilerId GHC (Version [6,8,2] []))+        (CompilerId GHC (Version [6,10,3] []))          -- now constrain it to solve in the context of a modern ghc only         corePackages@@ -215,7 +215,8 @@     ,Dependency (PackageName "dph-prim-seq"   )    (ThisVersion (Version [ 0,3 ] [] ))     ,Dependency (PackageName "dph-seq"        )    (ThisVersion (Version [ 0,3 ] [] )) -    ,Dependency (PackageName "editline")         (AnyVersion)+-- removed:+--    ,Dependency (PackageName "editline")         (AnyVersion)     ,Dependency (PackageName "filepath")         (ThisVersion (Version  [1,1,0,1] []))     ,Dependency (PackageName "ghc")              (AnyVersion)     ,Dependency (PackageName "ghc-prim")         (AnyVersion)@@ -369,22 +370,30 @@          ,("pthread",     "")         ,("m",          "")+        ,("db_cxx",          "")+         ,("icui18n",          "icu")         ,("icuuc",          "icu")         ,("icudata",          "icu")          ,("netsnmp",        "net-snmp")         ,("asound",        "alsa-lib")+        ,("ffi",        "libffi")+        ,("ogg",        "libogg")+        ,("theora",        "libtheora")         ]         -- atlas  shouldNotBeLibraries :: [String] shouldNotBeLibraries =     ["xmonad"+    ,"l-seed"+    ,"hspresent"     ,"haskell-platform"     ,"xmonad-contrib"     ,"lambdabot"     ,"piet"+    ,"hsffig"     ,"yi"     ,"haddock"     ,"hscolour"@@ -396,6 +405,7 @@     ,"clevercss"     ,"cpphs"     ,"backdropper"+    ,"darcs-beta"     ,"gtk2hs"     ,"darcs"     ,"greencard"@@ -421,6 +431,7 @@     ,"cairo"     ,"glib"     ,"gtk"+    ,"gconf"     ,"gtkglext"     ,"gtksourceview2"     ,"mozembed"@@ -430,9 +441,9 @@ ------------------------------------------------------------------------ -- Parsing and pretty printing: --- +-- -- | Translate an abstract PkgBuild file into a document structure--- +-- pkg2doc :: String -> PkgBuild -> Doc pkg2doc email pkg = vcat  [ text "# Contributor:"@@ -498,7 +509,9 @@      -- All Hackage packages depend on GHC at build time     -- All Haskell libraries are prefixed with "haskell-"-    , arch_makedepends = my_makedepends+    , arch_makedepends = if not hasLibrary+            then my_makedepends+            else ArchList [] -- makedepends should not duplicate depends      , arch_depends =         (if not (isLibrary)@@ -609,9 +622,9 @@     , "shift"     , "$op $*" ] --- +-- -- | A data type to represent PKGBUILD files--- +-- data PkgBuild =   PkgBuild     { arch_pkgname :: String@@ -871,7 +884,7 @@ ------------------------------------------------------------------------  ----- Strict process reading +-- Strict process reading -- myReadProcess :: FilePath                              -- ^ command to run             -> [String]                              -- ^ any arguments

@@ -1,5 +1,5 @@ name:               cabal2arch-version:            0.5.2+version:            0.5.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