diff options
| author | Joey Hess <joeyh@joeyh.name> | 2018-01-02 12:36:18 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-01-02 12:36:18 -0400 |
| commit | e6f4144824c4a589f6241299d5c9508ffb805db5 (patch) | |
| tree | aac5116981cbdc99fd077f925024bc7368946e94 /src | |
| parent | 7d13e0da8ed9c7dbfb3e1edfb2870e0855c82cf5 (diff) | |
| parent | df67ff0ad827c6d2db63e79f342106022716bd90 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/DotDir.hs | 2 | ||||
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Propellor/DotDir.hs b/src/Propellor/DotDir.hs index f42c0575..e9253b87 100644 --- a/src/Propellor/DotDir.hs +++ b/src/Propellor/DotDir.hs @@ -427,7 +427,7 @@ setupUpstreamMaster newref = do warnoutofdate :: Bool -> IO () warnoutofdate havebranch = do warningMessage ("** Your ~/.propellor/ is out of date..") - let also s = hPutStrLn stderr (" " ++ s) + let also s = infoMessage [" " ++ s] also ("A newer upstream version is available in " ++ distrepo) if havebranch then also ("To merge it, run: git merge " ++ upstreambranch) diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 9385493c..43ac822d 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -1040,14 +1040,14 @@ laptopSoftware = Apt.installed [ "procmeter3", "xfce4", "procmeter3", "unclutter" , "mplayer", "fbreader", "firefox", "chromium" , "libdatetime-event-sunrise-perl", "libtime-duration-perl" - , "iftop", "network-manager", "gtk-redshift", "powertop" + , "network-manager", "gtk-redshift", "powertop" , "gimp", "gthumb", "inkscape", "sozi", "xzgv", "hugin" , "mpc", "mpd", "ncmpc", "sonata", "mpdtoys" , "bsdgames", "nethack" , "xmonad", "libghc-xmonad-dev", "libghc-xmonad-contrib-dev" , "ttf-bitstream-vera" , "mairix", "offlineimap", "mutt" - , "nmap" + , "nmap", "whois", "wireshark", "tcpdump", "iftop" , "udevil", "pmount" , "arbtt", "hledger", "bc" , "apache2", "ikiwiki", "libhighlight-perl" |