@@ -151,12 +151,12 @@ generatePackageSet config hackage nixpkgs = do
151 putStrLn "self: {"
151 putStrLn "self: {"
152 putStrLn ""
152 putStrLn ""
153 pkgs <- flip parMapM (Map.toAscList db) $ \(name, vs) -> do
153 pkgs <- flip parMapM (Map.toAscList db) $ \(name, vs) -> do
154− defs <- forM (Set.toAscList vs) $ \version -> do
154+ defs <- forM (Set.toAscList vs) $ \pkgversion -> do
155− srcSpec <- liftIO $ sourceFromHackage Nothing (name ++ "-" ++ display version)
155+ srcSpec <- liftIO $ sourceFromHackage Nothing (name ++ "-" ++ display pkgversion)
156 let Just cabalFileHash = lookup "x-cabal-file-hash" (customFieldsPD (packageDescription descr))
156 let Just cabalFileHash = lookup "x-cabal-file-hash" (customFieldsPD (packageDescription descr))
158 -- TODO: Include list of broken dependencies in the generated output.
158 -- TODO: Include list of broken dependencies in the generated output.
159− descr = hackage Map.! name Map.! version
159+ descr = hackage Map.! name Map.! pkgversion
160 (missingDeps, _, drv') = cabal2nix resolver descr
160 (missingDeps, _, drv') = cabal2nix resolver descr
161 drv = drv' { src = srcSpec, editedCabalFile = if revision drv == 0 then "" else cabalFileHash
161 drv = drv' { src = srcSpec, editedCabalFile = if revision drv == 0 then "" else cabalFileHash
162 , metaSection = (metaSection drv') { broken = not (Set.null missing) -- Missing Haskell dependencies!
162 , metaSection = (metaSection drv') { broken = not (Set.null missing) -- Missing Haskell dependencies!
@@ -190,8 +190,8 @@ generatePackageSet config hackage nixpkgs = do
190 overrides :: Doc
190 overrides :: Doc
191 overrides = systemOverrides
191 overrides = systemOverrides
193− attr | Just v <- Map.lookup name generatedDefaultPackageSet, v == version = name
193+ attr | Just v <- Map.lookup name generatedDefaultPackageSet, v == pkgversion = name
194− | otherwise = name ++ '_' : [ if c == '.' then '_' else c | c <- display version ]
194+ | otherwise = name ++ '_' : [ if c == '.' then '_' else c | c <- display pkgversion ]
196 return $ nest 2 $ hang (string attr <+> equals <+> text "callPackage") 2 (parens (pPrint drv)) <+> (braces overrides <> semi)
196 return $ nest 2 $ hang (string attr <+> equals <+> text "callPackage") 2 (parens (pPrint drv)) <+> (braces overrides <> semi)
197 return (intercalate "\n\n" (map render defs))
197 return (intercalate "\n\n" (map render defs))