git.iko.soy/typeable/cabal2nix
on master help sign in
Hackage4Nix.hs: removed obsolete pkgset from Configuration
b9a23faPeter Simons
src/Hackage4Nix.hs+1−3
compare with master
unifiedsplit
@@ -31,7 +31,6 @@ data Configuration = Configuration
31 { _msgDebug :: String -> IO ()
31 { _msgDebug :: String -> IO ()
32 , _msgInfo :: String -> IO ()
32 , _msgInfo :: String -> IO ()
33 , _hackageDb :: DB.Hackage
33 , _hackageDb :: DB.Hackage
34− , _pkgset :: PkgSet
35 }
34 }
36
35
37defaultConfiguration :: Configuration
36defaultConfiguration :: Configuration
@@ -39,7 +38,6 @@ defaultConfiguration = Configuration
39 { _msgDebug = hPutStrLn stderr
38 { _msgDebug = hPutStrLn stderr
40 , _msgInfo = hPutStrLn stderr
39 , _msgInfo = hPutStrLn stderr
41 , _hackageDb = DB.empty
40 , _hackageDb = DB.empty
42− , _pkgset = Set.empty
43 }
41 }
44
42
45type Hackage4Nix a = RWST Configuration () PkgSet IO a
43type Hackage4Nix a = RWST Configuration () PkgSet IO a
@@ -126,7 +124,7 @@ updateNixPkgs paths = do
126 }
124 }
127 }
125 }
128 io $ writeFile path (show (disp (normalize (deriv''))))
126 io $ writeFile path (show (disp (normalize (deriv''))))
129− pkgset <- asks (selectLatestVersions . _pkgset)
127+ pkgset <- gets selectLatestVersions
130 updates' <- flip mapM (Set.elems pkgset) $ \pkg -> do
128 updates' <- flip mapM (Set.elems pkgset) $ \pkg -> do
131 let Pkg deriv _ _ = pkg
129 let Pkg deriv _ _ = pkg
132 updates <- discoverUpdates (pname deriv) (version deriv)
130 updates <- discoverUpdates (pname deriv) (version deriv)