From c13b7dc9375dca7bffff9f92c900c45c3aa443e7 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Thu, 4 Jul 2019 09:15:17 -0400 Subject: fixup! minor refactor --- lib/KeyRing/Types.hs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/KeyRing/Types.hs b/lib/KeyRing/Types.hs index 22937a7..0797dab 100644 --- a/lib/KeyRing/Types.hs +++ b/lib/KeyRing/Types.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DeriveAnyClass #-} {-# LANGUAGE DeriveFunctor #-} {-# LANGUAGE PatternSynonyms #-} module KeyRing.Types where @@ -30,7 +29,12 @@ data KeyRingOperation = KeyRingOperation -- files reside. Otherwise, the evironment variable $GNUPGHOME is consulted -- and if that is not set, it falls back to $HOME/.gnupg. } - deriving (Eq,Show,Semigroup,Monoid) + deriving (Eq,Show) +instance Semigroup KeyRingOperation where + KeyRingOperation f p t h <> KeyRingOperation f' p' t' h' = + KeyRingOperation (f <> f') (p <> p') (t <> t') (h <> h') +instance Monoid KeyRingOperation where + mempty = KeyRingOperation Map.empty [] [] Nothing data InputFile = HomeSec -- ^ A file named secring.gpg located in the home directory. -- cgit v1.2.3