From a94124bf20025d420e03f92d2f4ca95c7014fd75 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 11 Aug 2011 10:45:02 +0000
Subject: [PATCH] haskell-repa: updated to version 2.1.1.5

svn path=/nixpkgs/trunk/; revision=28487
---
 .../libraries/haskell/repa-examples/default.nix  | 16 ++++++++++------
 .../libraries/haskell/repa/default.nix           |  4 ++--
 pkgs/top-level/haskell-packages.nix              |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix
index af522270e961..9d52fdc87e33 100644
--- a/pkgs/development/libraries/haskell/repa-examples/default.nix
+++ b/pkgs/development/libraries/haskell/repa-examples/default.nix
@@ -1,16 +1,20 @@
-{cabal, repa, repaAlgorithms, repaIO, vector, llvm} :
+{ cabal, repa, repaAlgorithms, repaIo, vector, llvm }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "repa-examples";
   version = "2.1.0.2";
   sha256 = "056y2x8kada4d6a89sni2469c736z3d9ldp188n3i58h4kjqqfq7";
-  extraBuildInputs = [ llvm ];
-  propagatedBuildInputs = [ repa repaAlgorithms repaIO vector ];
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ repa repaAlgorithms repaIo vector llvm ];
   meta = {
     homepage = "http://repa.ouroborus.net";
     description = "Examples using the Repa array library.";
     license = self.stdenv.lib.licenses.bsd3;
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-
diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix
index 415231260e78..7c089dfa0722 100644
--- a/pkgs/development/libraries/haskell/repa/default.nix
+++ b/pkgs/development/libraries/haskell/repa/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "repa";
-  version = "2.1.1.2";
-  sha256 = "0lvhcq46abby69i6sgcqrxljykayp1sr3rmy2nlg5cccxlj94sqi";
+  version = "2.1.1.5";
+  sha256 = "14lq6nsifxsap98c1hpxsyv4g973vyzjn2s94b3vfzkbq8vd7695";
   buildDepends = [ QuickCheck vector ];
   meta = {
     homepage = "http://repa.ouroborus.net";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index cc32849edf0f..1a897b0e0ba1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1024,7 +1024,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   repaExamples = callPackage ../development/libraries/haskell/repa-examples {};
 
-  repaIO = callPackage ../development/libraries/haskell/repa-io {};
+  repaIo = callPackage ../development/libraries/haskell/repa-io {};
 
   RSA = callPackage ../development/libraries/haskell/RSA {};