Merge branch 'master' into unhammer/master

Author: nikita-volkov

cabal.project

@@ -1,3 +1,5 @@
 packages: .
 allow-newer:
-  , foldl:text
+  , *:base
+  , *:ghc-bignum
+  , *:template-haskell

library/StmContainers/Bimap.hs

@@ -30,7 +30,6 @@ import StmContainers.Prelude hiding (delete, empty, foldM, insert, lookup, null,
 -- of the right-hand type and vice versa.
 data Bimap leftKey rightKey
   = Bimap !(A.Map leftKey rightKey) !(A.Map rightKey leftKey)
-  deriving (Typeable)
 
 -- |
 -- Construct a new bimap.

library/StmContainers/Multimap.hs

@@ -30,7 +30,6 @@ import qualified StmContainers.Set as B
 -- Basically it's just a wrapper API around @'A.Map' key ('B.Set' value)@.
 newtype Multimap key value
   = Multimap (A.Map key (B.Set value))
-  deriving (Typeable)
 
 -- |
 -- Construct a new multimap.

library/StmContainers/Set.hs

@@ -23,7 +23,6 @@ import qualified StmHamt.SizedHamt as A
 -- A hash set, based on an STM-specialized hash array mapped trie.
 newtype Set item
   = Set (A.SizedHamt item)
-  deriving (Typeable)
 
 -- |
 -- Construct a new set.

stm-containers.cabal

@@ -24,7 +24,7 @@ license-file: LICENSE
 
 source-repository head
   type: git
-  location: git://github.com/nikita-volkov/stm-containers.git
+  location: https://github.com/nikita-volkov/stm-containers
 
 library
   hs-source-dirs: library