Author: simons Date: Mon Mar 5 23:32:24 2012 New Revision: 32808 URL: https://nixos.org/websvn/nix/?rev=32808&sc=1
Log: haskell-Crypto: fix build on GHC 7.4.1 http://anonscm.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-crypto;a=filediff;h=20120213034652-b2814-0019a3f92e453e9be86166d6c1f1bc0dad6e4d12.gz;f=patches/class-constraints.diff Added: nixpkgs/trunk/pkgs/development/libraries/haskell/Crypto/class-constraints.diff Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/Crypto/default.nix Added: nixpkgs/trunk/pkgs/development/libraries/haskell/Crypto/class-constraints.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/development/libraries/haskell/Crypto/class-constraints.diff Mon Mar 5 23:32:24 2012 (r32808) @@ -0,0 +1,27 @@ +--- 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 Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/Crypto/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/libraries/haskell/Crypto/default.nix Mon Mar 5 21:23:22 2012 (r32807) +++ nixpkgs/trunk/pkgs/development/libraries/haskell/Crypto/default.nix Mon Mar 5 23:32:24 2012 (r32808) @@ -7,6 +7,7 @@ isLibrary = true; isExecutable = true; buildDepends = [ HUnit QuickCheck random ]; + patches = [ ./class-constraints.diff ]; meta = { description = "Collects together existing Haskell cryptographic functions into a package"; license = "unknown"; _______________________________________________ nix-commits mailing list [email protected] http://lists.science.uu.nl/mailman/listinfo/nix-commits
