Author: simons
Date: Thu Apr 26 08:01:34 2012
New Revision: 33923
URL: https://nixos.org/websvn/nix/?rev=33923&sc=1

Log:
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

Added:
   nixpkgs/trunk/pkgs/development/libraries/haskell/syb/0.3.6.1.nix
      - copied, changed from r33922, 
nixpkgs/trunk/pkgs/development/libraries/haskell/syb/0.3.6.nix
Deleted:
   nixpkgs/trunk/pkgs/development/libraries/haskell/syb/0.3.6.nix
Modified:
   
nixpkgs/trunk/pkgs/development/libraries/haskell/language-javascript/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/zlib-enum/default.nix
   nixpkgs/trunk/pkgs/top-level/haskell-packages.nix

Modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/language-javascript/default.nix
==============================================================================
--- 
nixpkgs/trunk/pkgs/development/libraries/haskell/language-javascript/default.nix
    Wed Apr 25 21:31:09 2012        (r33922)
+++ 
nixpkgs/trunk/pkgs/development/libraries/haskell/language-javascript/default.nix
    Thu Apr 26 08:01:34 2012        (r33923)
@@ -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 = {

Copied and modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/syb/0.3.6.1.nix (from r33922, 
nixpkgs/trunk/pkgs/development/libraries/haskell/syb/0.3.6.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/syb/0.3.6.nix      Wed Apr 
25 21:31:09 2012        (r33922, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/syb/0.3.6.1.nix    Thu Apr 
26 08:01:34 2012        (r33923)
@@ -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";

Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix  Wed Apr 
25 21:31:09 2012        (r33922)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod/default.nix  Thu Apr 
26 08:01:34 2012        (r33923)
@@ -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 = [

Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/zlib-enum/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/zlib-enum/default.nix      
Wed Apr 25 21:31:09 2012        (r33922)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/zlib-enum/default.nix      
Thu Apr 26 08:01:34 2012        (r33923)
@@ -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";

Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Wed Apr 25 21:31:09 
2012        (r33922)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Thu Apr 26 08:01:34 
2012        (r33923)
@@ -149,7 +149,7 @@
     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 @@
   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 {};
 
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to