From 9ed244d86ce8737303f3c5dbfffc774311a96132 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 26 Apr 2012 08:01:34 +0000 Subject: [PATCH] Updated Haskell packages. - language-javascript: updated to version 0.5.4 - syb: updated to version 0.3.6.1 - yesod: updated to version 1.0.1.5 - zlib-enum: updated to version 0.2.2.1 svn path=/nixpkgs/trunk/; revision=33923 --- .../libraries/haskell/language-javascript/default.nix | 4 ++-- .../libraries/haskell/syb/{0.3.6.nix => 0.3.6.1.nix} | 4 ++-- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- .../libraries/haskell/zlib-enum/default.nix | 7 ++----- pkgs/top-level/haskell-packages.nix | 10 +++++----- 5 files changed, 13 insertions(+), 16 deletions(-) rename pkgs/development/libraries/haskell/syb/{0.3.6.nix => 0.3.6.1.nix} (79%) diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix index aad2c0e185c..3f04b3a9289 100644 --- a/pkgs/development/libraries/haskell/language-javascript/default.nix +++ b/pkgs/development/libraries/haskell/language-javascript/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "language-javascript"; - version = "0.5.3"; - sha256 = "0x0dzh7yffvf949ynpmrz5hsxcc1p87d6c30q73svgdbdym3zmka"; + version = "0.5.4"; + sha256 = "0hjx12n3pkxcdkppqalv6sl68vjlib37gby89ksay807ndslvb9q"; buildDepends = [ blazeBuilder mtl utf8Light utf8String ]; buildTools = [ happy ]; meta = { diff --git a/pkgs/development/libraries/haskell/syb/0.3.6.nix b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix similarity index 79% rename from pkgs/development/libraries/haskell/syb/0.3.6.nix rename to pkgs/development/libraries/haskell/syb/0.3.6.1.nix index 6d9393f60c2..7638ab3332f 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.6.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "syb"; - version = "0.3.6"; - sha256 = "1khb5h4gw1f9l9zhb7x1y9rf2qpypbvm9kmpf0b6xgggd2800s25"; + version = "0.3.6.1"; + sha256 = "1xyz6ahyvairzb5n1mrmryzrxrkd4m8ywxa6r6x5nqm2xa7zqv34"; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; description = "Scrap Your Boilerplate"; diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 8ceeb03fd94..b8ffdba7c6e 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.0.1.3"; - sha256 = "0pbfvaza4q8znnxpkh9fb1fys09byws9n34lv0rs70nrbdq5yp5r"; + version = "1.0.1.5"; + sha256 = "1va0pq5gn10anh333fqv8a99gngjip5w5lwl4i5q7lbparz93iji"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/zlib-enum/default.nix b/pkgs/development/libraries/haskell/zlib-enum/default.nix index 43e6bdef260..d4ec47410fc 100644 --- a/pkgs/development/libraries/haskell/zlib-enum/default.nix +++ b/pkgs/development/libraries/haskell/zlib-enum/default.nix @@ -2,14 +2,11 @@ cabal.mkDerivation (self: { pname = "zlib-enum"; - version = "0.2.2"; - sha256 = "1fmlvjj1krigj5aqipq5pf0mqnybr7zz50mgqr30kznfg48ry29y"; + version = "0.2.2.1"; + sha256 = "02ava6h40bqfmby33683nxasfw5fmrgfvbx6kqgz1gqz5921gjx9"; isLibrary = true; isExecutable = true; buildDepends = [ enumerator transformers zlibBindings ]; - patchPhase = '' - sed -i -e "s|transformers *== 0\.2\.\*|transformers|" zlib-enum.cabal - ''; meta = { homepage = "http://github.com/maltem/zlib-enum"; description = "Enumerator interface for zlib compression"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 03b86feb154..4134447eaaa 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -149,7 +149,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexCompat = self.regexCompat_0_95_1; # 7.4.1 ok regexPosix = self.regexPosix_0_95_1; # 7.4.1 ok stm = self.stm_2_3; # 7.4.1 ok - syb = self.syb_0_3_6; # 7.4.1 ok + syb = self.syb_0_3_6_1; # 7.4.1 ok xhtml = self.xhtml_3000_2_0_5; # 7.4.1 ok zlib = self.zlib_0_5_3_3; # 7.4.1 ok HTTP = self.HTTP_4000_2_3; # 7.4.1 ok @@ -1259,11 +1259,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stringCombinators = callPackage ../development/libraries/haskell/string-combinators {}; syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {}; - syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; + syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {}; - syb_0_3_6 = callPackage ../development/libraries/haskell/syb/0.3.6.nix {}; - syb = null; # by default, we assume that syb ships with GHC, which is - # true for the older GHC versions + syb_0_3_6_1 = callPackage ../development/libraries/haskell/syb/0.3.6.1.nix {}; + syb = null; # by default, we assume that syb ships with GHC, which is + # true for the older GHC versions sybWithClass = callPackage ../development/libraries/haskell/syb/syb-with-class.nix {};