Skip to content
Browse files

Don't pass Cabal as a propagated build input.

  • Loading branch information...
1 parent 90f0ae1 commit f5124419ce26bb1bb0abb68893344c2146843db6 @peti peti committed Aug 5, 2011
Showing with 6 additions and 7 deletions.
  1. +1 −1 cabal2nix.cabal
  2. +5 −6 cabal2nix.hs
View
2 cabal2nix.cabal
@@ -1,5 +1,5 @@
Name: cabal2nix
-Version: 1.1
+Version: 1.2
Copyright: (c) 2011 Peter Simons
License: BSD3
License-File: LICENSE
View
11 cabal2nix.hs
@@ -55,15 +55,14 @@ toNix (Pkg name ver sha256 url desc lic deps libs) =
++ " };\n"
++ "})\n"
where
- exprArgs = concat (intersperse "," ((if "cabal" `notElem` pkgDeps then ["cabal"] else []) ++ pkgDeps))
+ exprArgs = concat (intersperse "," ("cabal":pkgDeps))
showVer = concat (intersperse "." (map show ver))
depList = concat (intersperse " " pkgDeps)
pkgDeps :: [String]
- pkgDeps = map toNixName $
- nub $ sort $ libs ++
- [ n | dep <- deps, Dependency (PackageName n) _ <- condTreeConstraints dep
- , n `notElem` ["base","containers"]
- ]
+ pkgDeps = filter (/="cabal") $ nub $ sort $ map toNixName $
+ libs ++ [ n | dep <- deps, Dependency (PackageName n) _ <- condTreeConstraints dep
+ , n `notElem` ["base","containers"]
+ ]
showLic (GPL Nothing) = show "GPL"
showLic (GPL (Just (Version [2] []))) = "self.stdenv.lib.licenses.gpl2"
showLic (GPL (Just (Version [3] []))) = "self.stdenv.lib.licenses.gpl3"

0 comments on commit f512441

Please sign in to comment.
Something went wrong with that request. Please try again.