nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix

Browse Source 
svn path=/nixpkgs/trunk/; revision=23763
This commit is contained in:
Andres Löh 2010-09-13 16:01:33 +00:00
parent 2202d32006
commit 772abcfaaa
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/haskell/pandoc/default.nix
View File

@ -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";
};

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

@ -453,8 +453,6 @@ rec {
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;
};