From 006d1f0b7f36c25a91006fce24cbe76416fcee86 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Sat, 13 Jul 2019 15:22:45 -0400 Subject: no cpp needed, since my love is unconditional --- testkiki/testkiki.hs | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'testkiki/testkiki.hs') diff --git a/testkiki/testkiki.hs b/testkiki/testkiki.hs index 10487cf..9fffe7f 100644 --- a/testkiki/testkiki.hs +++ b/testkiki/testkiki.hs @@ -1,11 +1,7 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE DoAndIfThenElse #-} -{-# LANGUAGE CPP #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TupleSections #-} -#if !MIN_VERSION_base(4,7,0) -import qualified System.Posix.Env -#endif import System.Environment --import System.Posix.Env.ByteString (getEnv) import System.Posix.Files @@ -24,30 +20,16 @@ import qualified Data.ByteString.Char8 as B import Data.Time.Clock import Data.Time.Clock.POSIX import Data.IORef -#if !defined(VERSION_cryptonite) -import Crypto.Hash.SHA1 (hash) -#else import qualified Crypto.Hash import Crypto.Hash.Algorithms import Data.ByteArray (convert) -#endif import System.IO.Unsafe (unsafePerformIO) import ProcessUtils import Data.Bool import Data.Char import KeyRing hiding (try) -#if defined(VERSION_cryptonite) hash x = convert (Crypto.Hash.hash x :: Crypto.Hash.Digest SHA1) :: B.ByteString -#endif - -#if !MIN_VERSION_base(4,7,0) -setEnv k v = System.Posix.Env.setEnv k v True -unsetEnv = System.Posix.Env.unsetEnv -bool :: a -> a -> Bool -> a -bool f _ False = f -bool _ t True = t -#endif data TestKikiSettings = TKS { gnupghome :: FilePath -- cgit v1.2.3