diff options
| author | Peter Simons <simons@cryp.to> | 2012-05-15 11:50:48 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-05-15 11:50:48 +0000 |
| commit | 201bdca9628be3d3164a988ec47cf8ef3db26ef1 (patch) | |
| tree | 839272c2231e469d55a0c8cbbe7a08bcc9f7458a /pkgs/development/libraries/haskell/Crypto | |
| parent | ebb486baf81b809e005cb3004902884b0c7978ee (diff) | |
Updated Haskell packages.
- cryptocipher: updated to version 0.3.2 - Crypto: updated to version 4.2.5 - darcs: updated to version 2.8.1 - hamlet: updated to version 1.0.1.3 - monad-par-extras: updated to version 0.3.2 - persistent-template: updated to version 0.9.0.2 - pool-conduit: updated to version 0.1.0.2 - shakespeare-css: updated to version 1.0.1.2 - shakespeare-i18n: updated to version 1.0.0.2 - shakespeare-js: updated to version 1.0.0.2 - shakespeare-text: updated to version 1.0.0.2 - shakespeare: updated to version 1.0.0.2 - warp: updated to version 1.2.1 - wxcore: updated to version 0.90.0.1 - wxc: updated to version 0.90.0.3 - wx: updated to version 0.90.0.1 - xml-conduit: updated to version 0.7.0.3 - xss-sanitize: updated to version 0.3.2 - yesod-auth: updated to version 1.0.2.1 - yesod-core: updated to version 1.0.1.2 - yesod-default: updated to version 1.0.1.1 - yesod-form: updated to version 1.0.0.4 - yesod-json: updated to version 1.0.0.1 - yesod-persistent: updated to version 1.0.0.1 - yesod-routes: updated to version 1.0.1.2 - yesod-static: updated to version 1.0.0.2 - yesod: updated to version 1.0.1.6 svn path=/nixpkgs/trunk/; revision=34102
Diffstat (limited to 'pkgs/development/libraries/haskell/Crypto')
| -rw-r--r-- | pkgs/development/libraries/haskell/Crypto/class-constraints.diff | 27 | ||||
| -rw-r--r-- | pkgs/development/libraries/haskell/Crypto/default.nix | 5 |
2 files changed, 2 insertions, 30 deletions
diff --git a/pkgs/development/libraries/haskell/Crypto/class-constraints.diff b/pkgs/development/libraries/haskell/Crypto/class-constraints.diff deleted file mode 100644 index 77035322678ad..0000000000000 --- a/pkgs/development/libraries/haskell/Crypto/class-constraints.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- 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 --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix index 01bc1a1a01265..f6f06b9c283db 100644 --- a/pkgs/development/libraries/haskell/Crypto/default.nix +++ b/pkgs/development/libraries/haskell/Crypto/default.nix @@ -2,12 +2,11 @@ cabal.mkDerivation (self: { pname = "Crypto"; - version = "4.2.4"; - sha256 = "05wafv8flrh1893rh208azzig5k5pa022s2fg3f8lrqb23c6v63p"; + version = "4.2.5"; + sha256 = "0wv48is2jqia8hda6q65y3mhabxlw9hjzmpk3dx70rzh4w44yxb8"; 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"; |