@@ -2,8 +2,11 @@ module Cabal2Nix.Package where
22
33import Data.List
44import Data.Maybe
5+import Distribution.Compiler
56import Distribution.Package
67import Distribution.PackageDescription
8+import Distribution.PackageDescription.Configuration
9+import Distribution.System
710import Distribution.Version
811import Text.PrettyPrint
912
@@ -16,7 +19,7 @@ type PkgSHA256 = String
1619type PkgURL = String
1720type PkgDescription = String
1821type PkgLicense = License
19−type PkgDependencies = [CondTree ConfVar [Dependency] ()]
22+type PkgDependencies = [Dependency] -- [CondTree ConfVar [Dependency] ()]
2023type PkgExtraLibs = [String]
2124
2225data Pkg = Pkg PkgName
@@ -64,12 +67,9 @@ toNix (Pkg name ver sha256 url desc lic deps libs) = render doc
6467 onlyIf p d = if not (null p) then d else empty
6568 showVer = hcat (punctuate (text ".") (map int ver))
6669 pkgDeps :: [String]
67− pkgDeps = map libNixName libs ++
70+ pkgDeps = (nub $ sort $ map libNixName libs) ++
6871 (nub $ sort $ map toNixName $
69− [ n | dep <- deps,
70− Dependency (PackageName n) _ <- condTreeConstraints dep,
71− n `notElem` corePackages
72− ])
72+ filter (`notElem` corePackages) $ map unDep deps)
7373
7474-- | List of packages shipped with ghc and therefore at the moment not in
7575-- nixpkgs. This should probably be configurable at first. Later, it might
@@ -102,8 +102,8 @@ corePackages = [
102102cabal2nix :: GenericPackageDescription -> PkgSHA256 -> Pkg
103103cabal2nix cabal sha256 =
104104 Pkg pkgname pkgver sha256 url desc lic
105− (map simplify libDeps ++ map simplify exeDeps)
106− (libs ++ libs')
105+ (buildDepends tpkg)
106+ libs
107107 where
108108 pkg = packageDescription cabal
109109 PackageName pkgname = pkgName (package pkg)
@@ -112,10 +112,23 @@ cabal2nix cabal sha256 =
112112 url = homepage pkg
113113 desc = synopsis pkg
114114 -- globalDeps = buildDepends pkg
115− libDeps = maybeToList (condLibrary cabal)
116− exeDeps = [ tree | (_,tree) <- condExecutables cabal ]
117− libs = concat [ extraLibs (libBuildInfo (condTreeData x)) | x <- libDeps ]
118− libs' = concat [ extraLibs (buildInfo (condTreeData x)) | x <- exeDeps ]
115+ -- Potentially dangerous: determine a default flattening of the
116+ -- package description. Better approach: export the conditional
117+ -- structure and reflect it in the generated file.
118+ Right (tpkg, _) = finalizePackageDescription [] (const True)
119+ (Platform I386 Linux) -- shouldn't be hardcoded
120+ (CompilerId GHC (Version [7,0,4] [])) -- dito
121+ [] cabal
122+ libDeps = map libBuildInfo $ maybeToList (library tpkg)
123+ exeDeps = map buildInfo $ executables tpkg
124+ libsExtra = concatMap extraLibs (libDeps ++ exeDeps)
125+ libsPkgC = map unDep $ concatMap pkgconfigDepends (libDeps ++ exeDeps)
126+ -- add pkgconfig as an extra dependency if there are any pkgconfig deps
127+ libs = libsExtra ++ (if null libsPkgC then []
128+ else ("pkgconfig" : libsPkgC))
129+
130+unDep :: Dependency -> String
131+unDep (Dependency (PackageName x) _) = x
119132
120133simplify :: CondTree ConfVar [Dependency] a -> CondTree ConfVar [Dependency] ()
121134simplify (CondNode _ deps nodes) = CondNode () deps (map simp nodes)