diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2018-05-13 13:15:53 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-05-13 13:15:53 -0700 |
| commit | 3c850fa31cecd647a92e3e75d7ec9870e8c8b34a (patch) | |
| tree | 21a8065bafc73bdba56fe337927383a467488a8e /src/Propellor/Property/FreeBSD/Pkg.hs | |
| parent | 58884471926804f4abc4d31142e1ba01ee5d9ae3 (diff) | |
| parent | 56c77e4cc9ef0899ae0d6c0f1f8b658ccb3ba44f (diff) | |
Merge tag '5.3.6' into debian
tagging package propellor version 5.3.6
# gpg: Signature made Wed 09 May 2018 01:25:27 PM MST
# gpg: using RSA key 28A500C35207EAB72F6C0F25DB12DB0FF05F8F38
# gpg: Good signature from "Joey Hess <joeyh@joeyh.name>" [full]
# Primary key fingerprint: E85A 5F63 B31D 24C1 EBF0 D81C C910 D922 2512 E3C7
# Subkey fingerprint: 28A5 00C3 5207 EAB7 2F6C 0F25 DB12 DB0F F05F 8F38
Diffstat (limited to 'src/Propellor/Property/FreeBSD/Pkg.hs')
| -rw-r--r-- | src/Propellor/Property/FreeBSD/Pkg.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Propellor/Property/FreeBSD/Pkg.hs b/src/Propellor/Property/FreeBSD/Pkg.hs index 77bf5768..56ac55fb 100644 --- a/src/Propellor/Property/FreeBSD/Pkg.hs +++ b/src/Propellor/Property/FreeBSD/Pkg.hs @@ -9,6 +9,8 @@ module Propellor.Property.FreeBSD.Pkg where import Propellor.Base import Propellor.Types.Info +import qualified Data.Semigroup as Sem + noninteractiveEnv :: [([Char], [Char])] noninteractiveEnv = [("ASSUME_ALWAYS_YES", "yes")] @@ -37,7 +39,7 @@ pkgCmd cmd args = lines <$> readProcessEnv p a (Just noninteractiveEnv) newtype PkgUpdate = PkgUpdate String - deriving (Typeable, Monoid, Show) + deriving (Typeable, Sem.Semigroup, Monoid, Show) instance IsInfo PkgUpdate where propagateInfo _ = PropagateInfo False @@ -54,7 +56,7 @@ update = `setInfoProperty` (toInfo (PkgUpdate "")) newtype PkgUpgrade = PkgUpgrade String - deriving (Typeable, Monoid, Show) + deriving (Typeable, Sem.Semigroup, Monoid, Show) instance IsInfo PkgUpgrade where propagateInfo _ = PropagateInfo False |