Author: andres
Date: Tue Feb 15 10:36:52 2011
New Revision: 25974
URL: https://svn.nixos.org/websvn/nix/?rev=25974&sc=1
Log:
Restored HaXml-1.13.3 to keep happstack and gitit working.
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/HaXml/1.13.3.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/HaXml/1.13.3.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/HaXml/1.13.3.nix Tue Feb
15 10:36:52 2011 (r25974)
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+ pname = "HaXml";
+ version = "1.13.3";
+ sha256 = "08d9wy0rg9m66dd10x0zvkl74l25vxdakz7xp3j88s2gd31jp1v0";
+ meta = {
+ description = "Haskell utilities for parsing, filtering, transforming and
generating XML documents.";
+ };
+})
+
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Tue Feb 15 09:47:36
2011 (r25973)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Tue Feb 15 10:36:52
2011 (r25974)
@@ -252,13 +252,15 @@
HAppSState = callPackage
../development/libraries/haskell/HAppS/HAppS-State.nix {};
- /* cannot yet get this to work with 6.12.1 */
- happstackData = callPackage
../development/libraries/haskell/happstack/happstack-data.nix {};
+ happstackData = callPackage
../development/libraries/haskell/happstack/happstack-data.nix {
+ HaXml = HaXml_1_13_3;
+ };
happstackUtil = callPackage
../development/libraries/haskell/happstack/happstack-util.nix {};
happstackServer = callPackage
../development/libraries/haskell/happstack/happstack-server.nix {
network = network_2_2_1_7;
+ HaXml = HaXml_1_13_3;
};
hashedStorage = callPackage ../development/libraries/haskell/hashed-storage
{};
@@ -349,12 +351,17 @@
HTTP_3001 = callPackage ../development/libraries/haskell/HTTP/3001.nix {};
- haxr = callPackage ../development/libraries/haskell/haxr {};
+ haxr = callPackage ../development/libraries/haskell/haxr {
+ HTTP = HTTP_4000_0_9;
+ HaXml = HaXml_1_13_3;
+ };
haxr_th = callPackage ../development/libraries/haskell/haxr-th {};
HaXml = callPackage ../development/libraries/haskell/HaXml {};
+ HaXml_1_13_3 = callPackage ../development/libraries/haskell/HaXml/1.13.3.nix
{};
+
HDBC = callPackage ../development/libraries/haskell/HDBC/HDBC.nix {};
HDBCPostgresql = callPackage
../development/libraries/haskell/HDBC/HDBC-postgresql.nix {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
