Author: simons
Date: Thu May 10 10:28:49 2012
New Revision: 34042
URL: https://nixos.org/websvn/nix/?rev=34042&sc=1
Log:
Updated Haskell packages.
- DSH: updated to version 0.7.8.1
- alex: updated to versino 3.0.2
- certificate: updated to version 1.2.2
- language-c: updated to version 0.4.2
- xhtml: updated to version 3000.2.1
Also, downgraded GHC 7.4.1 environment to use mtl 2.0 and transformers 2.0 to
avoid lots of build errors, i.e. with monad-par.
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix
- copied, changed from r34036,
nixpkgs/trunk/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix
nixpkgs/trunk/pkgs/development/tools/parsing/alex/3.0.2.nix
- copied, changed from r34036,
nixpkgs/trunk/pkgs/development/tools/parsing/alex/3.0.1.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix
nixpkgs/trunk/pkgs/development/tools/parsing/alex/3.0.1.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/DSH/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/certificate/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/DSH/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/DSH/default.nix Wed May
9 23:13:46 2012 (r34041)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/DSH/default.nix Thu May
10 10:28:49 2012 (r34042)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "DSH";
- version = "0.7.8";
- sha256 = "1mlym2hs7sr78lih8c0yi5y5h14vxy3zpl3gfnidh9wiw5cai9lg";
+ version = "0.7.8.1";
+ sha256 = "1yz8rh3hkqc465slfzi7jqhjd1xrmcghjxl7zprxw082p2qvj8g5";
buildDepends = [
convertible csv FerryCore HaXml HDBC json mtl Pathfinder syb text
xhtml
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/certificate/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/certificate/default.nix
Wed May 9 23:13:46 2012 (r34041)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/certificate/default.nix
Thu May 10 10:28:49 2012 (r34042)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "certificate";
- version = "1.2.1";
- sha256 = "0lhw38jqkiw7dwckwcqwmsi9br1insb5dp8wajcpgas6xn6cy2qy";
+ version = "1.2.2";
+ sha256 = "0qwx0y534fa5p2wzxd5q2bvcsvmmvmy45rwzj01g6zyjzmx2rnsb";
isLibrary = true;
isExecutable = true;
buildDepends = [ asn1Data cryptoPubkeyTypes mtl pem time ];
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/default.nix
Wed May 9 23:13:46 2012 (r34041)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/default.nix
Thu May 10 10:28:49 2012 (r34042)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "language-c";
- version = "0.3.2.1";
- sha256 = "1qk86p88p2jk1cbgl8p5g19ip3nh6z22ddj5jac58r5ny076iimx";
+ version = "0.4.2";
+ sha256 = "07pf4v4n7kvr5inkhs24b7g55pmkk4k5ihi6s5dbc200l01wz133";
buildDepends = [ filepath syb ];
buildTools = [ alex happy ];
meta = {
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix (from
r34036, nixpkgs/trunk/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix
Wed May 9 21:49:39 2012 (r34036, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix Thu May
10 10:28:49 2012 (r34042)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "xhtml";
- version = "3000.2.0.5";
- sha256 = "1gqq910pncqppb2dscxnfxvm1ly4qpb5mwmady2i4irar3gngh9v";
+ version = "3000.2.1";
+ sha256 = "17qzc6kyiilhi8s25k68fbpyplihb1qxkpc6l93bvjrcchilsf22";
meta = {
homepage = "https://github.com/haskell/xhtml";;
description = "An XHTML combinator library";
Copied and modified:
nixpkgs/trunk/pkgs/development/tools/parsing/alex/3.0.2.nix (from r34036,
nixpkgs/trunk/pkgs/development/tools/parsing/alex/3.0.1.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/tools/parsing/alex/3.0.1.nix Wed May 9
21:49:39 2012 (r34036, copy source)
+++ nixpkgs/trunk/pkgs/development/tools/parsing/alex/3.0.2.nix Thu May 10
10:28:49 2012 (r34042)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "alex";
- version = "3.0.1";
- sha256 = "1w7s9kzgr4kfh6cyhb4qkvxwy9gcw3xa1d2k5dy575k3wk73awkj";
+ version = "3.0.2";
+ sha256 = "0r1i10i9svnd0ayd229d8hgndgc6q8ghabw6zzghwviw5hs36zlr";
isLibrary = false;
isExecutable = true;
buildDepends = [ QuickCheck ];
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed May 9 23:13:46
2012 (r34041)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Thu May 10 10:28:49
2012 (r34042)
@@ -153,15 +153,15 @@
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_1; # 7.4.1 ok
- xhtml = self.xhtml_3000_2_0_5; # 7.4.1 ok
+ xhtml = self.xhtml_3000_2_1; # 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
text = self.text_0_11_2_0; # 7.4.1 ok
- transformers = self.transformers_0_3_0_0; # 7.4.1 ok
- mtl = self.mtl_2_1_1; # 7.4.1 ok
+ transformers = self.transformers_0_2_2_0; # 7.4.1 ok
+ mtl = self.mtl_2_0_1_0; # 7.4.1 ok
random = self.random_1_0_1_1; # 7.4.1 ok
cabalInstall = self.cabalInstall_0_14_0; # 7.4.1 ok
- alex = self.alex_3_0_1; # 7.4.1 ok
+ alex = self.alex_3_0_2; # 7.4.1 ok
happy = self.happy_1_18_9; # 7.4.1 ok
haddock = self.haddock_2_10_0; # 7.4.1 ok
};
@@ -1522,8 +1522,8 @@
xhtml_3000_2_0_1 = callPackage
../development/libraries/haskell/xhtml/3000.2.0.1.nix {};
xhtml_3000_2_0_4 = callPackage
../development/libraries/haskell/xhtml/3000.2.0.4.nix {};
- xhtml_3000_2_0_5 = callPackage
../development/libraries/haskell/xhtml/3000.2.0.5.nix {};
- xhtml = self.xhtml_3000_2_0_5;
+ xhtml_3000_2_1 = callPackage
../development/libraries/haskell/xhtml/3000.2.1.nix {};
+ xhtml = self.xhtml_3000_2_1;
xml = callPackage ../development/libraries/haskell/xml {};
@@ -1605,8 +1605,8 @@
alex_2_3_2 = callPackage ../development/tools/parsing/alex/2.3.2.nix {};
alex_2_3_3 = callPackage ../development/tools/parsing/alex/2.3.3.nix {};
alex_2_3_5 = callPackage ../development/tools/parsing/alex/2.3.5.nix {};
- alex_3_0_1 = callPackage ../development/tools/parsing/alex/3.0.1.nix {};
- alex = self.alex_3_0_1;
+ alex_3_0_2 = callPackage ../development/tools/parsing/alex/3.0.2.nix {};
+ alex = self.alex_3_0_2;
alexMeta = callPackage ../development/tools/haskell/alex-meta {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
