Author: simons
Date: Sun Jul 31 15:33:55 2011
New Revision: 28021
URL: https://svn.nixos.org/websvn/nix/?rev=28021&sc=1
Log:
Keep polyparse 1.4 around because haskell-graphviz depends on the older version.
I've asked upstream to update their cabal file, but until then we'll
need both versions. :-(
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/polyparse/1.4.nix
- copied, changed from r28013,
nixpkgs/trunk/pkgs/development/libraries/haskell/polyparse/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/polyparse/1.7.nix
- copied, changed from r28013,
nixpkgs/trunk/pkgs/development/libraries/haskell/polyparse/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/polyparse/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/polyparse/1.4.nix (from
r28013, nixpkgs/trunk/pkgs/development/libraries/haskell/polyparse/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/polyparse/default.nix
Sat Jul 30 21:43:47 2011 (r28013, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/polyparse/1.4.nix Sun Jul
31 15:33:55 2011 (r28021)
@@ -1,10 +1,9 @@
-{cabal, text}:
+{cabal}:
cabal.mkDerivation (self : {
pname = "polyparse";
- version = "1.7";
- sha256 = "de8ed0ce54f1f81bb0783dd97b7b22eca28df4a238684a26b37c5af2d17a364b";
- propagatedBuildInputs = [text];
+ version = "1.4";
+ sha256 = "6e599fb0771e8ce2e1d3a3bbe5eddc2d77b2b4bbb54602f01005dc55dc039d44";
meta = {
description = "A variety of alternative parser combinator libraries";
};
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/polyparse/1.7.nix (from
r28013, nixpkgs/trunk/pkgs/development/libraries/haskell/polyparse/default.nix)
==============================================================================
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Jul 31 14:52:42
2011 (r28020)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Jul 31 15:33:55
2011 (r28021)
@@ -541,7 +541,9 @@
Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {};
- graphviz = callPackage ../development/libraries/haskell/graphviz {};
+ graphviz = callPackage ../development/libraries/haskell/graphviz {
+ polyparse = self.polyparse14;
+ };
hakyll = callPackage ../development/libraries/haskell/hakyll {};
@@ -804,7 +806,9 @@
persistentTemplate = callPackage
../development/libraries/haskell/persistent-template {};
- polyparse = callPackage ../development/libraries/haskell/polyparse {};
+ polyparse14 = callPackage ../development/libraries/haskell/polyparse/1.4.nix
{};
+ polyparse17 = callPackage ../development/libraries/haskell/polyparse/1.7.nix
{};
+ polyparse = self.polyparse17;
pool = callPackage ../development/libraries/haskell/pool {};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
