Author: andres
Date: Mon Sep 13 16:01:33 2010
New Revision: 23763
URL: https://svn.nixos.org/websvn/nix/?rev=23763&sc=1
Log:
bugfix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix Mon Sep
13 15:41:38 2010 (r23762)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix Mon Sep
13 16:01:33 2010 (r23763)
@@ -1,13 +1,13 @@
{cabal, mtl, network, parsec, utf8String, xhtml, zipArchive, HTTP, xml,
- texmath, random}:
+ texmath, random ? null}:
cabal.mkDerivation (self : {
pname = "pandoc";
version = "1.6";
sha256 = "9b825233293edf1ea414b0e7ea821d6a914711dc2c60546566ab5a97512b079b";
propagatedBuildInputs = [
- mtl network parsec utf8String xhtml zipArchive HTTP xml texmath random
- ];
+ mtl network parsec utf8String xhtml zipArchive HTTP xml texmath
+ ] ++ (if random != null then [random] else []);
meta = {
description = "Conversion between markup formats";
};
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 13 15:41:38
2010 (r23762)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 13 16:01:33
2010 (r23763)
@@ -453,8 +453,6 @@
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
