git.iko.soy/typeable/cabal2nix
on master help sign in
hackage2nix.hs: fine-tune output generation
commit9b8ee4a309f82086f71cbfc9d3723e8de5492aaa authorPeter Simons <simons@cryp.to> dateSun 7 Dec 2014, 23:07 (12 years ago) parent1fe7aa9
1 file changed+4−2
src/hackage2nix.hs+4−2
src/hackage2nix.hs+4−2
@@ -71,14 +71,16 @@ main = execParser mainOptions >>= runCompiler buildPackageSet
7171 )
7272
7373nixAttr :: String -> Version -> String
74−nixAttr name ver = toNixName name ++ "_" ++ [ if c == '.' then '_' else c | c <- display ver ]
74+nixAttr name ver = toNixName name -- ++ "_" ++ [ if c == '.' then '_' else c | c <- display ver ]
7575
7676buildPackageSet :: Compile ()
7777buildPackageSet = do
7878 db <- asks _hackage
7979 pkgs <- liftIO $ runParIO $ parMapM generatePackage (Map.toList db)
8080 forM_ pkgs $ \(name, version, nixExpr) ->
81− liftIO $ print $ hang (text (nixAttr name version) <+> equals) 2 (disp nixExpr) <> semi
81+ liftIO $ print $ hang (text (nixAttr name version) <+> equals <+> text "definePackage") 2 (parens (disp nixExpr))
82+ <> text " (self: super: {})"
83+ <> semi
8284
8385generatePackage :: (String, Map Version GenericPackageDescription) -> ParIO (String,Version,Derivation)
8486generatePackage (name, versions) = do