@@ -55,15 +55,14 @@ toNix (Pkg name ver sha256 url desc lic deps libs) =
5555 ++ " };\n"
5656 ++ "})\n"
5757 where
58− exprArgs = concat (intersperse "," ((if "cabal" `notElem` pkgDeps then ["cabal"] else []) ++ pkgDeps))
58+ exprArgs = concat (intersperse "," ("cabal":pkgDeps))
5959 showVer = concat (intersperse "." (map show ver))
6060 depList = concat (intersperse " " pkgDeps)
6161 pkgDeps :: [String]
62− pkgDeps = map toNixName $
63− nub $ sort $ libs ++
64− [ n | dep <- deps, Dependency (PackageName n) _ <- condTreeConstraints dep
65− , n `notElem` ["base","containers"]
66− ]
62+ pkgDeps = filter (/="cabal") $ nub $ sort $ map toNixName $
63+ libs ++ [ n | dep <- deps, Dependency (PackageName n) _ <- condTreeConstraints dep
64+ , n `notElem` ["base","containers"]
65+ ]
6766 showLic (GPL Nothing) = show "GPL"
6867 showLic (GPL (Just (Version [2] []))) = "self.stdenv.lib.licenses.gpl2"
6968 showLic (GPL (Just (Version [3] []))) = "self.stdenv.lib.licenses.gpl3"