[Pkg-haskell-commits] darcs: haskell-crypto: Patch still needed

[Joachim Breitner]

Fri Oct 19 21:35:21 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Patch still needed
  Ignore-this: 945230b532ea781a9228bec8a367f97b

    M ./changelog -1
    A ./patches/class-constraints.diff
    M ./patches/series +1

Fri Oct 19 21:35:21 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Patch still needed
  Ignore-this: 945230b532ea781a9228bec8a367f97b
diff -rN -u old-haskell-crypto//changelog new-haskell-crypto//changelog
--- old-haskell-crypto//changelog	2012-10-19 21:42:29.247914756 +0000
+++ new-haskell-crypto//changelog	2012-10-19 21:42:29.251759498 +0000
@@ -4,7 +4,6 @@
     against experimental
   * Bump standards version, no change
   * New upstream release
-    + Drop class-constraints.diff, applied upstream 
 
  -- Joachim Breitner <nomeata at debian.org>  Fri, 19 Oct 2012 22:29:44 +0200
 
diff -rN -u old-haskell-crypto//patches/class-constraints.diff new-haskell-crypto//patches/class-constraints.diff
--- old-haskell-crypto//patches/class-constraints.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-crypto//patches/class-constraints.diff	2012-10-19 21:42:29.272030157 +0000
@@ -0,0 +1,31 @@
+Description: ghc 7.4 class constraints
+ This patch has been emailed to upstream Caylee Hogg.
+Author: Clint Adams <clint at debian.org>
+
+--- a/Data/Digest/SHA2.hs
++++ b/Data/Digest/SHA2.hs
+@@ -106,7 +106,7 @@
+ data Hash384 = Hash384 !Word64 !Word64 !Word64 !Word64 !Word64 !Word64 deriving (Eq, Ord)
+ data Hash224 = Hash224 !Word32 !Word32 !Word32 !Word32 !Word32 !Word32 !Word32 deriving (Eq, Ord)
+ 
+-instance (Integral a) => Show (Hash8 a) where
++instance (Integral a, Show a) => Show (Hash8 a) where
+  showsPrec _ (Hash8 a b c d e f g h) =
+   (showHex a) . (' ':) .
+   (showHex b) . (' ':) .
+@@ -146,7 +146,7 @@
+      where
+       bs = bitSize (head r)
+ 
+-instance (Integral h, Bits h) => Hash (Hash8 h) where
++instance (Integral h, Bits h, Show h) => Hash (Hash8 h) where
+   toOctets (Hash8 x0 x1 x2 x3 x4 x5 x6 x7) = bitsToOctets =<< [x0, x1, x2, x3, x4, x5, x6, x7]
+ 
+ instance Hash Hash384 where
+@@ -282,4 +282,4 @@
+ 
+ -- Test with:
+ -- ghc -no-recomp -O --make Data/Digest/SHA2.hs -main-is Data.Digest.SHA2.moduleTest -o moduleTest && ./moduleTest && rm moduleTest
+-moduleTest = runTestTT test_sha2
+\ No newline at end of file
++moduleTest = runTestTT test_sha2
diff -rN -u old-haskell-crypto//patches/series new-haskell-crypto//patches/series
--- old-haskell-crypto//patches/series	2012-10-19 21:42:29.247914756 +0000
+++ new-haskell-crypto//patches/series	2012-10-19 21:42:29.259720124 +0000
@@ -1 +1,2 @@
+class-constraints.diff
 no-quickcheck.patch