cabal2nix 1.1 → 1.2

raw patch · 2 files changed

+6/−7 lines, 2 files

Files

cabal2nix.cabal +1/−1
cabal2nix.hs +5/−6

cabal2nix.cabal view

@@ -1,5 +1,5 @@ Name:                   cabal2nix-Version:                1.1+Version:                1.2 Copyright:              (c) 2011 Peter Simons License:                BSD3 License-File:           LICENSE

cabal2nix.hs view

@@ -55,15 +55,14 @@     ++ "  };\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"