Use PackageImports to work around cryptohash-sha1

fpco · Jan 2, 2017 · 91ee923 · 91ee923
1 parent 0d37ecd
commit 91ee923
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,9 @@
+0.2.0.3
+=======
+
+Add a `PackageImport` to avoid conflicting module names for `Crypto.Hash.SHA1`
+introduced by the `cryptohash-sha1` package.
+
 0.2.0.0
 =======
 

diff --git a/System/Executable/Hash/Internal.hs b/System/Executable/Hash/Internal.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE PackageImports #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE OverloadedStrings #-}
 
@@ -6,7 +7,7 @@
 module System.Executable.Hash.Internal where
 
 import           Control.Exception (SomeException, handle)
-import           Crypto.Hash.SHA1 (hash)
+import "cryptohash" Crypto.Hash.SHA1 (hash)
 import qualified Data.ByteString as BS
 import           Data.FileEmbed (dummySpaceWith, injectWith)
 import           Language.Haskell.TH (Q, Exp)

diff --git a/executable-hash.cabal b/executable-hash.cabal
@@ -1,5 +1,5 @@
 name:                executable-hash
-version:             0.2.0.2
+version:             0.2.0.3
 synopsis:            Provides the SHA1 hash of the program executable
 description:         See README.md
 homepage:            https://github.com/fpco/executable-hash