Author: simons
Date: Tue Aug 16 23:32:16 2011
New Revision: 28637
URL: https://svn.nixos.org/websvn/nix/?rev=28637&sc=1
Log:
Fixed build of haskell-CouchDB. This change obsoletes the requirement
for json 0.3.6, which has subsequently been removed from the database.
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/json/default.nix
- copied, changed from r28636,
nixpkgs/trunk/pkgs/development/libraries/haskell/json/0.4.4.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/json/0.3.6.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/json/0.4.4.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/json/default.nix (from r28636,
nixpkgs/trunk/pkgs/development/libraries/haskell/json/0.4.4.nix)
==============================================================================
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Tue Aug 16 23:24:12
2011 (r28636)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Tue Aug 16 23:32:16
2011 (r28637)
@@ -788,9 +788,7 @@
WebBits = self.WebBits_1_0;
};
- json_0_3_6 = callPackage ../development/libraries/haskell/json/0.3.6.nix {};
- json_0_4_4 = callPackage ../development/libraries/haskell/json/0.4.4.nix {};
- json = self.json_0_4_4;
+ json = callPackage ../development/libraries/haskell/json/default.nix {};
jsonEnumerator = callPackage ../development/libraries/haskell/jsonEnumerator
{};
@@ -1251,10 +1249,7 @@
webRoutesQuasi = callPackage
../development/libraries/haskell/web-routes-quasi {};
- CouchDB = callPackage ../development/libraries/haskell/CouchDB {
- HTTP = self.HTTP_3001_1_5;
- json = self.json_0_3_6;
- };
+ CouchDB = callPackage ../development/libraries/haskell/CouchDB {};
wlPprintText = callPackage ../development/libraries/haskell/wl-pprint-text
{};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
