JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed build of haskell-CouchDB. This change obsoletes the requirement

Browse Source 
for json 0.3.6, which has subsequently been removed from the database.

svn path=/nixpkgs/trunk/; revision=28637
This commit is contained in:
Peter Simons 2011-08-16 23:32:16 +00:00
parent f167461d97
commit 1cff2d41aa
3 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/haskell/json/0.3.6.nix
View File

@ -1,17 +0,0 @@
{ cabal, parsec }:
cabal.mkDerivation (self: {
pname = "json";
version = "0.3.6";
sha256 = "05047879ed0c7a9aa168a981e238da94758281af3cb1a1f78a6427322b946fd7";
buildDepends = [ parsec ];
meta = {
description = "Support for serialising Haskell to and from JSON";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

0
pkgs/development/libraries/haskell/json/0.4.4.nix → pkgs/development/libraries/haskell/json/default.nix
View File

9
pkgs/top-level/haskell-packages.nix
View File

@ -788,9 +788,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
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 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
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 {};