diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index 83bc8a227b74..0d11acb7ce87 100644 --- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HsOpenSSL"; - version = "0.10.2"; - sha256 = "0bji31lb9n08ybzs23251q6afr32fjvzcjm7qs3fvy3r7bc3gqbf"; + version = "0.10.3"; + sha256 = "1f876xbx0a8xrs4ainmb79nisr6pflslzk26vk4psxgn9a159cvk"; buildDepends = [ network time ]; extraLibraries = [ openssl ]; meta = { diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix index 3f9b37535952..173ddc314952 100644 --- a/pkgs/development/libraries/haskell/RSA/default.nix +++ b/pkgs/development/libraries/haskell/RSA/default.nix @@ -1,12 +1,12 @@ -{ cabal, binary, cryptoApi, monadcryptorandom, pureMD5, SHA }: +{ cabal, binary, pureMD5, random, SHA }: cabal.mkDerivation (self: { pname = "RSA"; - version = "1.2.0.0"; - sha256 = "0x4wa0yq4k43ccdakqcmy0mxvdlvrkfg6kc1j2hv7hh8b4vjisms"; + version = "1.0.6.3"; + sha256 = "0lk3nsh6nvacv1xzrg2pxxhd5gglmy40dkb8a47c9r9px0q6yjpj"; isLibrary = true; isExecutable = true; - buildDepends = [ binary cryptoApi monadcryptorandom pureMD5 SHA ]; + buildDepends = [ binary pureMD5 random SHA ]; meta = { description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1."; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix index 5d7f6d9edf5a..9a258f7e88de 100644 --- a/pkgs/development/libraries/haskell/language-javascript/default.nix +++ b/pkgs/development/libraries/haskell/language-javascript/default.nix @@ -2,10 +2,8 @@ cabal.mkDerivation (self: { pname = "language-javascript"; - version = "0.5.0"; - sha256 = "0fx087z8sa360bsbd22g7jsnzz0dzvm6pfr59d4vamfwc0zg2yg9"; - isLibrary = true; - isExecutable = true; + version = "0.5.1"; + sha256 = "12nb951xcsg1qxrg347f4sxmdzi78vxwkjhx0fib6pkbcz9yqf5q"; buildDepends = [ blazeBuilder mtl utf8Light utf8String ]; buildTools = [ happy ]; meta = { diff --git a/pkgs/development/libraries/haskell/pem/default.nix b/pkgs/development/libraries/haskell/pem/default.nix new file mode 100644 index 000000000000..35d8a49c2c83 --- /dev/null +++ b/pkgs/development/libraries/haskell/pem/default.nix @@ -0,0 +1,15 @@ +{ cabal, attoparsec, base64Bytestring, cereal, mtl }: + +cabal.mkDerivation (self: { + pname = "pem"; + version = "0.1.0"; + sha256 = "0qhkmxfhzpzg3ycdzr4b7zzf84vmhbqv2irh95ymmdbr0cc5hhn9"; + buildDepends = [ attoparsec base64Bytestring cereal mtl ]; + meta = { + homepage = "http://github.com/vincenthz/hs-pem"; + description = "Privacy Enhanced Mail (PEM) format reader and writer"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c12a48733d90..f55a5f0714e4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -968,7 +968,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); mathFunctions = callPackage ../development/libraries/haskell/math-functions {}; - maude = callPackage ../development/libraries/haskell/maude {}; + maude = callPackage ../development/libraries/haskell/maude { + parsec = self.parsec3; + }; MaybeT = callPackage ../development/libraries/haskell/MaybeT {}; @@ -1102,6 +1104,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pcreLight = callPackage ../development/libraries/haskell/pcre-light {}; + pem = callPackage ../development/libraries/haskell/pem {}; + permutation = callPackage ../development/libraries/haskell/permutation {}; persistent = callPackage ../development/libraries/haskell/persistent {};