1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00

Merge pull request #1940 from jacobhinkle/master

haskellPackages: Add AES and pbkdf haskell packages
This commit is contained in:
Peter Simons 2014-03-14 11:45:17 +01:00
commit f43a9e9d5d
3 changed files with 32 additions and 0 deletions

View file

@ -0,0 +1,13 @@
{ cabal, cereal, monadsTf, random, transformers }:
cabal.mkDerivation (self: {
pname = "AES";
version = "0.2.8";
sha256 = "1yf0mhmj294gf1b1m11gixa1xxlbvv0yl60b59fnv5lf0s170jn3";
buildDepends = [ cereal monadsTf random transformers ];
meta = {
description = "Fast AES encryption/decryption for bytestrings";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -0,0 +1,15 @@
{ cabal, binary, byteable, bytedump, cryptohash, utf8String }:
cabal.mkDerivation (self: {
pname = "pbkdf";
version = "1.1.1.1";
sha256 = "1nbn8kan43i00g23g8aljxjpaxm9q1qhzxxdgks0mc4mr1f7bifx";
buildDepends = [ binary byteable bytedump cryptohash utf8String ];
testDepends = [ binary byteable bytedump cryptohash utf8String ];
meta = {
homepage = "https://github.com/cdornan/pbkdf";
description = "Haskell implementation of the PBKDF functions from RFC-2898";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -526,6 +526,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
adjunctions = callPackage ../development/libraries/haskell/adjunctions {};
aes = callPackage ../development/libraries/haskell/aes {};
aeson = callPackage ../development/libraries/haskell/aeson {
blazeBuilder = if (pkgs.stdenv.lib.versionOlder ghc.version "7.6") then self.blazeBuilder else null;
};
@ -1895,6 +1897,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
pathtype = callPackage ../development/libraries/haskell/pathtype {};
pbkdf = callPackage ../development/libraries/haskell/pbkdf {};
pcap = callPackage ../development/libraries/haskell/pcap {};
pcapEnumerator = callPackage ../development/libraries/haskell/pcap-enumerator {};