From 178b500c8c0192c39c37506c3752a0e389243119 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Mar 2012 10:01:19 +0000 Subject: [PATCH] Updated Haskell packages. - Hipmunk: updated to version 5.2.0.7 - cairo: updated to version 0.12.3 - digest: updated to version 0.0.1.1 - glib: updated to version 0.12.3 - gloss: updated to version 1.6.2.1 - gtk: updated to version 0.12.3 - language-javascript: updated to version 0.4.10 - pango: updated to version 0.12.3 - zeromq-haskell: updated to version 0.8.4 svn path=/nixpkgs/trunk/; revision=32947 --- pkgs/development/libraries/haskell/Hipmunk/default.nix | 4 ++-- pkgs/development/libraries/haskell/cairo/default.nix | 4 ++-- pkgs/development/libraries/haskell/digest/default.nix | 4 ++-- pkgs/development/libraries/haskell/glib/default.nix | 4 ++-- pkgs/development/libraries/haskell/gloss/default.nix | 4 ++-- pkgs/development/libraries/haskell/gtk/default.nix | 4 ++-- .../libraries/haskell/language-javascript/default.nix | 8 ++++---- pkgs/development/libraries/haskell/pango/default.nix | 4 ++-- .../libraries/haskell/zeromq-haskell/default.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 +--- 10 files changed, 21 insertions(+), 23 deletions(-) diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix index 6877e07524d1..7cf502281fbe 100644 --- a/pkgs/development/libraries/haskell/Hipmunk/default.nix +++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Hipmunk"; - version = "5.2.0.6"; - sha256 = "16yh7v6v05nksspcfz8h054piyhmrfbpaada36562rjxcywyfnfj"; + version = "5.2.0.7"; + sha256 = "1cinxhz4qb8xcbygifx85q4zf6pmjwi90v01vqwyvwlfxmbk0j7k"; buildDepends = [ StateVar transformers ]; noHaddock = true; meta = { diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index 32d62dad8d0e..b485a27c4ad5 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cairo"; - version = "0.12.2"; - sha256 = "1sa0xfx14y4imq3bd9l0rqrmxls3l9yga249a31zfhcinnr1j9db"; + version = "0.12.3"; + sha256 = "0kgy6907vs41ws51dwqv6lwvfnvmgd1mns12cxzsifmli1jglswd"; buildDepends = [ mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ cairo libc pkgconfig zlib ]; diff --git a/pkgs/development/libraries/haskell/digest/default.nix b/pkgs/development/libraries/haskell/digest/default.nix index b313da931f92..50bce7090b36 100644 --- a/pkgs/development/libraries/haskell/digest/default.nix +++ b/pkgs/development/libraries/haskell/digest/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "digest"; - version = "0.0.1.0"; - sha256 = "1p2fk950ivdj7pvc624y0fx48rdh0ax3rw9606926n60mxi9fca0"; + version = "0.0.1.1"; + sha256 = "1m04szf9yabmm6mkjq2x7a57bjdf2i611wm2k99wdcygb5cvif3v"; extraLibraries = [ zlib ]; meta = { description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now"; diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix index c60c776e60f4..8dedf471a9f8 100644 --- a/pkgs/development/libraries/haskell/glib/default.nix +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "glib"; - version = "0.12.2"; - sha256 = "0p1d6j23yf30824q5gn7pw7s47hs4rnaqs69d2hn2pnzpc1ml3c6"; + version = "0.12.3"; + sha256 = "1hv7wnxsjzlr2bchl8ir967iv9qjzlv9lnlyvrilagzafr7nximb"; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; pkgconfigDepends = [ glib ]; diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 8d9c42c12433..46921fcba9ea 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.6.1.1"; - sha256 = "0y0npw27ic23zx7fq7dmvwbz2r62wblw9nbyai9kxgff4m2p3j4m"; + version = "1.6.2.1"; + sha256 = "0lczr3lm0i19cznkyxx6dhrlg08698mq84wjn7b0im32par1qjj5"; buildDepends = [ bmp GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index 346caa1b72ef..4bf8c3b7359f 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gtk"; - version = "0.12.2"; - sha256 = "0qjhy2adbqv03qbmh6ydga4axvj263n5srwpfrw4v5gk34fvyj9w"; + version = "0.12.3"; + sha256 = "0a5bb1qkxpkmm69b31jpqy7njnsk9bhhhp6z0h971zsxsrxpi04q"; buildDepends = [ cairo glib mtl pango ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix index b03f3b0f1da5..bb79a262b947 100644 --- a/pkgs/development/libraries/haskell/language-javascript/default.nix +++ b/pkgs/development/libraries/haskell/language-javascript/default.nix @@ -1,13 +1,13 @@ -{ cabal, alex, happy, mtl, utf8Light }: +{ cabal, happy, mtl, utf8Light }: cabal.mkDerivation (self: { pname = "language-javascript"; - version = "0.4.9"; - sha256 = "19a8c8bq4s533iyb6h3vl59dnya6d7inaqk1hbhnlil1w2d0n5b5"; + version = "0.4.10"; + sha256 = "1bk5xrhj5cpacz2bcfjz28sldizdadg05daalppxq8vs830sdx5h"; isLibrary = true; isExecutable = true; buildDepends = [ mtl utf8Light ]; - buildTools = [ alex happy ]; + buildTools = [ happy ]; meta = { homepage = "http://github.com/alanz/language-javascript"; description = "Parser for JavaScript"; diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix index 99e4d04f774e..46dedc24d434 100644 --- a/pkgs/development/libraries/haskell/pango/default.nix +++ b/pkgs/development/libraries/haskell/pango/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "pango"; - version = "0.12.2"; - sha256 = "0kf9sw2ajqlvv9n685fbif7c8x1qnz4w3y3xqql3a1rv6s3kmqba"; + version = "0.12.3"; + sha256 = "0203z59c9dsqp6mgb12h2iwjs52m2cqdxa7arwi1sccc3cz86cai"; buildDepends = [ cairo glib mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix index ef2eb97063aa..8f09178a7c2b 100644 --- a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zeromq-haskell"; - version = "0.8.3"; - sha256 = "1gp85fbgylsqkxacgdxv4ifvgvwca03gy88raphqhrnk59bmjgzd"; + version = "0.8.4"; + sha256 = "0lvjszi08r5wm5ch03153y7lir6cdgqr2gnhq45j4b0kid6gkpv3"; extraLibraries = [ zeromq ]; meta = { homepage = "http://github.com/twittner/zeromq-haskell/"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 029c8b1dbd3f..36ba517d8d46 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -936,9 +936,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {}; - languageJavascript = callPackage ../development/libraries/haskell/language-javascript { - alex = self.alex_3_0_1; - }; + languageJavascript = callPackage ../development/libraries/haskell/language-javascript {}; languageHaskellExtract = callPackage ../development/libraries/haskell/language-haskell-extract {};