Author: andres
Date: Mon Sep 13 12:07:14 2010
New Revision: 23746
URL: https://svn.nixos.org/websvn/nix/?rev=23746&sc=1
Log:
Addressing problem with conflicting versions of Haskell's time library.
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yst/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/yst/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yst/default.nix Mon Sep
13 11:54:30 2010 (r23745)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yst/default.nix Mon Sep
13 12:07:14 2010 (r23746)
@@ -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 : {
pname = "yst";
version = "0.2.3.2";
sha256 = "b857e70db67d708e2edb61a1d6bc4eaff3abd2bc252b3605f66bf1760da4da4b";
propagatedBuildInputs = [
- HStringTemplate csv pandoc parsec split utf8String xhtml HsSyck
+ HStringTemplate csv pandoc parsec split utf8String xhtml HsSyck time
];
meta = {
description =
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 13 11:54:30
2010 (r23745)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 13 12:07:14
2010 (r23746)
@@ -179,6 +179,7 @@
regexBase = regexBase_0_93_2;
network = network_2_2_1_7;
time = time_1_2_0_3;
+ pandoc = pandoc_newtime;
};
hamlet = callPackage ../development/libraries/haskell/hamlet {};
@@ -408,6 +409,11 @@
pandoc = callPackage ../development/libraries/haskell/pandoc {
HTTP = HTTP_4000_0_9;
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;
};
@@ -447,6 +453,8 @@
RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {};
+ random = callPackage ../development/libraries/haskell/random {};
+
random_newtime = callPackage ../development/libraries/haskell/random {
time = time_1_2_0_3;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
