Updated Haskell packages.

- clientsession: updated to version 0.7.5
 - gloss: updated to version 1.7.4.1
 - haskeline: enable terminfo support and patch to support mtl >= 2.1
 - HaskellForMaths: updated to version 0.4.5
 - HsOpenSSL: updated to version 0.10.3.1
 - language-javascript: updated to version 0.5.3
 - mtl: added version 2.1.1
 - network: updated to version 2.3.0.13
 - repa-algorithms: updated to version 3.1.3.1
 - repa-examples: updated to version 3.1.3.1
 - repa-io: updated to version 3.1.3.1
 - repa: updated to version 3.1.3.2
 - resourcet: updated to version 0.3.2.1
 - RSA: updated to version 1.2.1.0
 - yesod-auth: updated to version 1.0.2
 - yesod-form: updated to version 1.0.0.3
 - yesod: updated to version 1.0.1.3
 - zlib-enum: updated to version 0.2.2

svn path=/nixpkgs/trunk/; revision=33913
This commit is contained in:
Peter Simons 2012-04-25 10:12:44 +00:00
parent cdc3fa0462
commit 3117cc72fb
20 changed files with 62 additions and 52 deletions

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "HaskellForMaths"; pname = "HaskellForMaths";
version = "0.4.4"; version = "0.4.5";
sha256 = "1qijaich0jwlii5wdmv0rnr6skbyacxg09nzh0i7dhk86vimz6q8"; sha256 = "03j83gvxjjqjwl047j0acsf9j5vs3zpzbap036sw4slq31nza2p9";
buildDepends = [ random ]; buildDepends = [ random ];
meta = { meta = {
homepage = "http://haskellformaths.blogspot.com/"; homepage = "http://haskellformaths.blogspot.com/";

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "HsOpenSSL"; pname = "HsOpenSSL";
version = "0.10.3"; version = "0.10.3.1";
sha256 = "1f876xbx0a8xrs4ainmb79nisr6pflslzk26vk4psxgn9a159cvk"; sha256 = "0dilmaibx18mfg4c8g96c1svhynhkrq4i5zzv3wg0a550g3xc0py";
buildDepends = [ network time ]; buildDepends = [ network time ];
extraLibraries = [ openssl ]; extraLibraries = [ openssl ];
meta = { meta = {

View File

@ -1,12 +1,16 @@
{ cabal, binary, cryptoApi, monadcryptorandom, pureMD5, SHA }: { cabal, binary, cryptoApi, cryptoPubkeyTypes, monadcryptorandom
, pureMD5, SHA
}:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "RSA"; pname = "RSA";
version = "1.2.0.0"; version = "1.2.1.0";
sha256 = "0x4wa0yq4k43ccdakqcmy0mxvdlvrkfg6kc1j2hv7hh8b4vjisms"; sha256 = "14x53xjy4rqdgin6kyrm2b16hb0k599gfiwiwrsyri9mx3f3s1ca";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
buildDepends = [ binary cryptoApi monadcryptorandom pureMD5 SHA ]; buildDepends = [
binary cryptoApi cryptoPubkeyTypes monadcryptorandom pureMD5 SHA
];
meta = { meta = {
description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1."; description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
license = self.stdenv.lib.licenses.bsd3; license = self.stdenv.lib.licenses.bsd3;

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "clientsession"; pname = "clientsession";
version = "0.7.4.3"; version = "0.7.5";
sha256 = "16bnglk2mhjdlcsbp4f470yjpb6dgdf49l9lf9ygfr6g3l6hll9f"; sha256 = "1q2zlq06s0d476ywvb1fkxw34aagcaiqw7jrrmr3lj89q3ylhivr";
buildDepends = [ buildDepends = [
base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy
skein tagged skein tagged

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "gloss"; pname = "gloss";
version = "1.7.3.1"; version = "1.7.4.1";
sha256 = "0vylil8jsj7mb14dijrx2ylmsgs1ma3rh2nmiaakr5cmpp4xshf0"; sha256 = "01mxazdgmz3k8y4s2k2mj11g1m788dykx60i7bqbdwzbzc65hcfw";
buildDepends = [ bmp GLUT OpenGL ]; buildDepends = [ bmp GLUT OpenGL ];
meta = { meta = {
homepage = "http://gloss.ouroborus.net"; homepage = "http://gloss.ouroborus.net";

View File

@ -8,6 +8,10 @@ cabal.mkDerivation (self: {
buildDepends = [ buildDepends = [
extensibleExceptions filepath mtl terminfo utf8String extensibleExceptions filepath mtl terminfo utf8String
]; ];
configureFlags = "-fterminfo";
patchPhase = ''
sed -i -e "s|mtl >= 1.1 && < 2.1|mtl|" haskeline.cabal
'';
meta = { meta = {
homepage = "http://trac.haskell.org/haskeline"; homepage = "http://trac.haskell.org/haskeline";
description = "A command-line interface for user input, written in Haskell"; description = "A command-line interface for user input, written in Haskell";

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "language-javascript"; pname = "language-javascript";
version = "0.5.2"; version = "0.5.3";
sha256 = "0q9xy72z7i2ivqzbjzn9nl5y0x07d2y3a737yw26a4zhbmhwg236"; sha256 = "0x0dzh7yffvf949ynpmrz5hsxcc1p87d6c30q73svgdbdym3zmka";
buildDepends = [ blazeBuilder mtl utf8Light utf8String ]; buildDepends = [ blazeBuilder mtl utf8Light utf8String ];
buildTools = [ happy ]; buildTools = [ happy ];
meta = { meta = {

View File

@ -0,0 +1,14 @@
{ cabal, transformers }:
cabal.mkDerivation (self: {
pname = "mtl";
version = "2.1.1";
sha256 = "143s0c5hygwnd72x14jwinpnd92gx4y9blhmv6086rxijqbq6l4j";
buildDepends = [ transformers ];
meta = {
description = "Monad classes, using functional dependencies";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "network"; pname = "network";
version = "2.3.0.11"; version = "2.3.0.13";
sha256 = "1ghm8rw0m3x71pnndbmzm9j99yh8bmmrlhz4ykslsk2my7ihmxdk"; sha256 = "0xw53czvcw8k49aqxmchc1rcd6pyxp4icwgp64625fnm3l4yjiq7";
buildDepends = [ parsec ]; buildDepends = [ parsec ];
meta = { meta = {
homepage = "http://github.com/haskell/network"; homepage = "http://github.com/haskell/network";

View File

@ -1,15 +0,0 @@
{ cabal, parsec }:
cabal.mkDerivation (self: {
pname = "network";
version = "2.3.0.7";
sha256 = "1rlzdacgaq8nv0bwczsrkw47rw4aamf9y4ynm3xjw0r3w1xcg9yv";
buildDepends = [ parsec ];
meta = {
homepage = "http://github.com/haskell/network";
description = "Low-level networking interface";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "repa-algorithms"; pname = "repa-algorithms";
version = "3.1.0.1"; version = "3.1.3.1";
sha256 = "17479hp6x02vdwbn201gvxrqsc6smp5q1ip61qbfsvirjih8f3pz"; sha256 = "04d0r68k7dhk5ka9hzqf6wy9yyhjwc0rndp1ir1vllc6w6f8k4wl";
buildDepends = [ repa vector ]; buildDepends = [ repa vector ];
extraLibraries = [ llvm ]; extraLibraries = [ llvm ];
meta = { meta = {

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "repa-examples"; pname = "repa-examples";
version = "3.1.0.1"; version = "3.1.3.1";
sha256 = "1zyhq7qd7j0a0rx7j395j6330kybfi0g3whsf25clrg4znd1iwjc"; sha256 = "15fg356a8sa48vmgn5fxgbj3s48hixsl1x4a8ds0mvvv8m0zlra8";
isLibrary = false; isLibrary = false;
isExecutable = true; isExecutable = true;
buildDepends = [ random repa repaAlgorithms repaIo vector ]; buildDepends = [ random repa repaAlgorithms repaIo vector ];

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "repa-io"; pname = "repa-io";
version = "3.1.0.1"; version = "3.1.3.1";
sha256 = "1il0zsba9qz0560c56f9hn6wks5kk1bvh8bpng46w70c12gxh81w"; sha256 = "1ah5zqg3699p98820gs39xh1xipqdknlgkwxrdqsblnm33y1bqnb";
buildDepends = [ binary bmp repa vector ]; buildDepends = [ binary bmp repa vector ];
meta = { meta = {
homepage = "http://repa.ouroborus.net"; homepage = "http://repa.ouroborus.net";

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "repa"; pname = "repa";
version = "3.1.2.1"; version = "3.1.3.2";
sha256 = "15g2l8f5d02jy63ljyvjdd2ymdml072bjylsxvn4xmr0jzmi689x"; sha256 = "0xz5813q0km8kv50gs6vzp3lgl64xayi9l4zksha4gjb5lq5yn2y";
buildDepends = [ QuickCheck vector ]; buildDepends = [ QuickCheck vector ];
meta = { meta = {
homepage = "http://repa.ouroborus.net"; homepage = "http://repa.ouroborus.net";

View File

@ -3,8 +3,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "resourcet"; pname = "resourcet";
version = "0.3.2"; version = "0.3.2.1";
sha256 = "0vaygw17cfx2y2lv32lmr7x0vch58dh19jmh8j7mcj11qy5v0nz8"; sha256 = "1gqcqbj9f13b9myrg7nhydrbbqnn80k69s65qsk3rc8wsqyk8i6g";
buildDepends = [ buildDepends = [
liftedBase monadControl transformers transformersBase liftedBase monadControl transformers transformersBase
]; ];

View File

@ -7,8 +7,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "yesod-auth"; pname = "yesod-auth";
version = "1.0.1"; version = "1.0.2";
sha256 = "0rbpf2fldpd46dbcd77zryb91gh3q86k5xdb07clsy384qx7ynq6"; sha256 = "1rbp62phyzlxm458xgqxg3qg5fvivmhcgzd8pprqy9ya0v58wwlr";
buildDepends = [ buildDepends = [
aeson authenticate blazeHtml hamlet httpConduit liftedBase mimeMail aeson authenticate blazeHtml hamlet httpConduit liftedBase mimeMail
persistent persistentTemplate pureMD5 pwstoreFast random SHA persistent persistentTemplate pureMD5 pwstoreFast random SHA

View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "yesod-form"; pname = "yesod-form";
version = "1.0.0.2"; version = "1.0.0.3";
sha256 = "1jvp0hw9kprwcwdxx1i2aazycf03i1vf8q5vjmdpynhgzyrpkrx1"; sha256 = "0xqgvmpxv9lrpl06qh3pqn53f5pa02k8v5c4z6brzb8s44ppw1pq";
buildDepends = [ buildDepends = [
blazeBuilder blazeHtml dataDefault emailValidate hamlet network blazeBuilder blazeHtml dataDefault emailValidate hamlet network
persistent shakespeareCss shakespeareJs text time transformers wai persistent shakespeareCss shakespeareJs text time transformers wai

View File

@ -7,8 +7,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "yesod"; pname = "yesod";
version = "1.0.1.1"; version = "1.0.1.3";
sha256 = "17dg6n37hdyizw3g5jqsg08ax31ilm4nlsvvsiaf6ywr7q0wrylz"; sha256 = "0pbfvaza4q8znnxpkh9fb1fys09byws9n34lv0rs70nrbdq5yp5r";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [

View File

@ -7,6 +7,9 @@ cabal.mkDerivation (self: {
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
buildDepends = [ enumerator transformers zlibBindings ]; buildDepends = [ enumerator transformers zlibBindings ];
patchPhase = ''
sed -i -e "s|transformers *== 0\.2\.\*|transformers|" zlib-enum.cabal
'';
meta = { meta = {
homepage = "http://github.com/maltem/zlib-enum"; homepage = "http://github.com/maltem/zlib-enum";
description = "Enumerator interface for zlib compression"; description = "Enumerator interface for zlib compression";

View File

@ -140,7 +140,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 ok haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 ok
html = self.html_1_0_1_2; # 7.4.1 ok html = self.html_1_0_1_2; # 7.4.1 ok
HUnit = self.HUnit_1_2_4_2; # 7.4.1 ok HUnit = self.HUnit_1_2_4_2; # 7.4.1 ok
network = self.network_2_3_0_11; # 7.4.1 ok network = self.network_2_3_0_13; # 7.4.1 ok
OpenGL = self.OpenGL_2_5_0_0; # 7.4.1 ok OpenGL = self.OpenGL_2_5_0_0; # 7.4.1 ok
parallel = self.parallel_3_2_0_2; # 7.4.1 ok parallel = self.parallel_3_2_0_2; # 7.4.1 ok
parsec = self.parsec_3_1_2; # 7.4.1 ok parsec = self.parsec_3_1_2; # 7.4.1 ok
@ -1018,11 +1018,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {}; mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {};
mtl_1_1_1_1 = callPackage ../development/libraries/haskell/mtl/1.1.1.1.nix {}; mtl_1_1_1_1 = callPackage ../development/libraries/haskell/mtl/1.1.1.1.nix {};
mtl_2_0_1_0 = callPackage ../development/libraries/haskell/mtl/2.0.1.0.nix {}; mtl_2_0_1_0 = callPackage ../development/libraries/haskell/mtl/2.0.1.0.nix {};
mtl_2_1 = callPackage ../development/libraries/haskell/mtl/2.1.nix { mtl_2_1_1 = callPackage ../development/libraries/haskell/mtl/2.1.1.nix {
transformers = self.transformers_0_3_0_0; transformers = self.transformers_0_3_0_0;
}; };
mtl1 = self.mtl_1_1_0_2; mtl1 = self.mtl_1_1_0_2;
mtl2 = self.mtl_2_1; mtl2 = self.mtl_2_1_1;
mtl = self.mtl2; mtl = self.mtl2;
mtlparse = callPackage ../development/libraries/haskell/mtlparse {}; mtlparse = callPackage ../development/libraries/haskell/mtlparse {};
@ -1045,8 +1045,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {}; network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {};
network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {}; network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {};
network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {}; network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {};
network_2_3_0_11 = callPackage ../development/libraries/haskell/network/2.3.0.11.nix {}; network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {};
network = self.network_2_3_0_11; network = self.network_2_3_0_13;
networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; networkConduit = callPackage ../development/libraries/haskell/network-conduit {};