From 8dd2352dd057f351d868c870011959fe11c7c5da Mon Sep 17 00:00:00 2001
From: Daniel Beecham <daniel@lunix.se>
Date: Sat, 10 Jan 2015 14:11:22 +0100
Subject: [PATCH 1/2] Added haskell-web-routes-happstack

---
 .../haskell/web-routes-happstack/default.nix      | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/web-routes-happstack/default.nix

diff --git a/pkgs/development/libraries/haskell/web-routes-happstack/default.nix b/pkgs/development/libraries/haskell/web-routes-happstack/default.nix
new file mode 100644
index 00000000000..299357e2073
--- /dev/null
+++ b/pkgs/development/libraries/haskell/web-routes-happstack/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, happstackServer, text, webRoutes }:
+
+cabal.mkDerivation (self: {
+  pname = "web-routes-happstack";
+  version = "0.23.9";
+  sha256 = "0vsjm979z21858wk9z1b855jqmr4apm35b5ff8x6nynq6kiflrzw";
+  buildDepends = [ happstackServer text webRoutes ];
+  meta = {
+    description = "Adds support for using web-routes with Happstack";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1a3519e85ae..6fb5aaa9b3d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2875,6 +2875,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   webRoutesBoomerang = callPackage ../development/libraries/haskell/web-routes-boomerang {};
 
+  webRoutesHappstack = callPackage ../development/libraries/haskell/web-routes-happstack {};
+
   websockets = callPackage ../development/libraries/haskell/websockets {};
 
   websocketsSnap = callPackage ../development/libraries/haskell/websockets-snap {};

From b9a7380060213b759c9e7ea5561ba51e431e74c3 Mon Sep 17 00:00:00 2001
From: Daniel Beecham <daniel@lunix.se>
Date: Sat, 10 Jan 2015 18:43:20 +0100
Subject: [PATCH 2/2] haskell-base-prelude: version bump

---
 pkgs/development/libraries/haskell/base-prelude/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/base-prelude/default.nix b/pkgs/development/libraries/haskell/base-prelude/default.nix
index 5cf966f35bd..a44cdbfa6c1 100644
--- a/pkgs/development/libraries/haskell/base-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/base-prelude/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "base-prelude";
-  version = "0.1.7";
-  sha256 = "0xzgwj5sqx7y57biby77d6vrsghcmq85ha3frn8k4xq7wqqk4aqp";
+  version = "0.1.11";
+  sha256 = "0g6p1d3r6jbqcd8flxfbasb40ga7k90bc0q07drwhlaiadjnx1an";
   meta = {
     homepage = "https://github.com/nikita-volkov/base-prelude";
     description = "The most complete prelude formed from only the \"base\" package";