From 907b921c6106ccb71122b13f18cafa276fd0b977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Wed, 25 Aug 2010 13:08:32 +0000
Subject: [PATCH] Applied (with edits) the patch provided by James Cook to add
the Haskell fingertree library. Thanks for the contribution.
svn path=/nixpkgs/trunk/; revision=23424
---
.../libraries/haskell/fingertree/default.nix | 13 +++++++++++++
pkgs/top-level/haskell-packages.nix | 4 ++++
2 files changed, 17 insertions(+)
create mode 100644 pkgs/development/libraries/haskell/fingertree/default.nix
diff --git a/pkgs/development/libraries/haskell/fingertree/default.nix b/pkgs/development/libraries/haskell/fingertree/default.nix
new file mode 100644
index 000000000000..4babd837fa31
--- /dev/null
+++ b/pkgs/development/libraries/haskell/fingertree/default.nix
@@ -0,0 +1,13 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+ pname = "fingertree";
+ version = "0.0.1.0";
+ sha256 = "e80bf256506290c8f4fb44222920ae7d8405fd22e453c7a08dba49297d49328b";
+ meta = {
+ description = "Generic finger-tree structure, with example instances";
+ license = "BSD";
+ maintainers = [self.stdenv.lib.maintainers.andres];
+ };
+})
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0c00beb352e0..11547e6286d5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -198,6 +198,10 @@ rec {
inherit cabal mtl;
};
+ fingertree = import ../development/libraries/haskell/fingertree {
+ inherit cabal;
+ };
+
gdiff = import ../development/libraries/haskell/gdiff {
inherit cabal;
};