diff options
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/haskell/Crypto/class-constraints.diff | 27 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/Crypto/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/base64-bytestring/0.1.1.0.nix | 17 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/base64-bytestring/default.nix (renamed from pkgs/development/libraries/haskell/base64-bytestring/0.1.0.3.nix) | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/clientsession/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/xss-sanitize/default.nix | 6 |
6 files changed, 35 insertions, 24 deletions
diff --git a/pkgs/development/libraries/haskell/Crypto/class-constraints.diff b/pkgs/development/libraries/haskell/Crypto/class-constraints.diff new file mode 100644 index 0000000000000..77035322678ad --- /dev/null +++ b/pkgs/development/libraries/haskell/Crypto/class-constraints.diff @@ -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 diff --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix index 0adb00ccc8624..01bc1a1a01265 100644 --- a/pkgs/development/libraries/haskell/Crypto/default.nix +++ b/pkgs/development/libraries/haskell/Crypto/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { 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"; diff --git a/pkgs/development/libraries/haskell/base64-bytestring/0.1.1.0.nix b/pkgs/development/libraries/haskell/base64-bytestring/0.1.1.0.nix deleted file mode 100644 index 304889991f054..0000000000000 --- a/pkgs/development/libraries/haskell/base64-bytestring/0.1.1.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "base64-bytestring"; - version = "0.1.1.0"; - sha256 = "0vdmwajxg6w924pcsls45bz4bn29xgl3sgvdp2g1jb8f7qb58r7i"; - meta = { - homepage = "https://github.com/bos/base64-bytestring"; - description = "Fast base64 encoding and deconding for ByteStrings"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/base64-bytestring/0.1.0.3.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix index f974a72347fd3..3690c8cff76ba 100644 --- a/pkgs/development/libraries/haskell/base64-bytestring/0.1.0.3.nix +++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base64-bytestring"; - version = "0.1.0.3"; - sha256 = "0d4j8b1d8z9qr1y446bfkj764xgilk8gw2frj0wn0717y8knvmx3"; + version = "0.1.1.1"; + sha256 = "0j0jns0yf7dv2bx91hayc8hx0pdab7rhkjllmkl8019kf8rx3gwd"; meta = { homepage = "https://github.com/bos/base64-bytestring"; description = "Fast base64 encoding and deconding for ByteStrings"; diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index d4a770d34b74e..e89be643ea495 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.7.4.1"; - sha256 = "1fnrngbx86zcvh0ybv7ans132d216ayxdzlgw0x4qh0sw9r3w2ip"; + version = "0.7.4.2"; + sha256 = "0b1afz9frky3kp2crrkmk8cvj77fnyyxrfv1ky0p0cb0lllvdhwp"; buildDepends = [ base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy skein tagged diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix index 745480ecf0c6f..aa74f72ba3e72 100644 --- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix +++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "xss-sanitize"; - version = "0.3.1"; - sha256 = "0s8nqqx5f5b07xxlda4gh0w6vmlkhbqbz36cf6glhbhhyw27jkx5"; + version = "0.3.1.1"; + sha256 = "1nv28nk1fdxym1vv50wgkyfkinpr3bd7cn6vwi41x5iqy9vgjjpl"; buildDepends = [ attoparsec cssText network tagsoup text utf8String ]; meta = { - homepage = "http://github.com/gregwebs/haskell-xss-sanitize"; + homepage = "http://github.com/yesodweb/haskell-xss-sanitize"; description = "sanitize untrusted HTML to prevent XSS attacks"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; |