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

Addressing problem with conflicting versions of Haskell's time library.

Browse Source 
svn path=/nixpkgs/trunk/; revision=23746
This commit is contained in:
Andres Löh 2010-09-13 12:07:14 +00:00
parent 58722fa393
commit c7f570b473
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/haskell/yst/default.nix
View File

@ -1,11 +1,11 @@
{cabal, HStringTemplate, csv, pandoc, parsec, split, utf8String, xhtml, HsSyck}: {cabal, HStringTemplate, csv, pandoc, parsec, split, utf8String, xhtml, HsSyck, time}:
cabal.mkDerivation (self : { cabal.mkDerivation (self : {
pname = "yst"; pname = "yst";
version = "0.2.3.2"; version = "0.2.3.2";
sha256 = "b857e70db67d708e2edb61a1d6bc4eaff3abd2bc252b3605f66bf1760da4da4b"; sha256 = "b857e70db67d708e2edb61a1d6bc4eaff3abd2bc252b3605f66bf1760da4da4b";
propagatedBuildInputs = [ propagatedBuildInputs = [
HStringTemplate csv pandoc parsec split utf8String xhtml HsSyck HStringTemplate csv pandoc parsec split utf8String xhtml HsSyck time
]; ];
meta = { meta = {
description = description =

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

@ -179,6 +179,7 @@ rec {
regexBase = regexBase_0_93_2; regexBase = regexBase_0_93_2;
network = network_2_2_1_7; network = network_2_2_1_7;
time = time_1_2_0_3; time = time_1_2_0_3;
pandoc = pandoc_newtime;
}; };
hamlet = callPackage ../development/libraries/haskell/hamlet {}; hamlet = callPackage ../development/libraries/haskell/hamlet {};
@ -408,6 +409,11 @@ rec {
pandoc = callPackage ../development/libraries/haskell/pandoc { pandoc = callPackage ../development/libraries/haskell/pandoc {
HTTP = HTTP_4000_0_9; HTTP = HTTP_4000_0_9;
network = network_2_2_1_7; network = network_2_2_1_7;
};
pandoc_newtime = callPackage ../development/libraries/haskell/pandoc {
HTTP = HTTP_4000_0_9;
network = network_2_2_1_7;
random = random_newtime; random = random_newtime;
}; };
@ -447,6 +453,8 @@ rec {
RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {}; RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {};
random = callPackage ../development/libraries/haskell/random {};
random_newtime = callPackage ../development/libraries/haskell/random { random_newtime = callPackage ../development/libraries/haskell/random {
time = time_1_2_0_3; time = time_1_2_0_3;
}; };