From 33d6fa4edc1b20cae7b32a2f07f043ee0e6a09c6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Aug 2011 23:23:29 +0000
Subject: [PATCH] Dropped the obsolete haskell-WebServer package. According to
 upstream, it is no longer maintained and has been replaced by HappStack.

svn path=/nixpkgs/trunk/; revision=28626
---
 .../haskell/WebServer-Extras/default.nix      | 27 -------------------
 .../libraries/haskell/WebServer/default.nix   | 23 ----------------
 pkgs/top-level/haskell-packages.nix           |  9 -------
 3 files changed, 59 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/WebServer-Extras/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/WebServer/default.nix

diff --git a/pkgs/development/libraries/haskell/WebServer-Extras/default.nix b/pkgs/development/libraries/haskell/WebServer-Extras/default.nix
deleted file mode 100644
index 2abbe549e53..00000000000
--- a/pkgs/development/libraries/haskell/WebServer-Extras/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ cabal, base64String, Crypto, hslogger, json, mtl, random, WebServer, fetchgit }:
-
-cabal.mkDerivation (self: {
-  pname = "WebServer-Extras";
-  version = "1.2";
-
-  src = fetchgit {
-    url = git://github.com/arjunguha/haskell-web.git;
-    rev = "931a2ec1744cd5c5139af9a3fe8195a36dc3acec" ;
-  };
-
-  buildDepends = [
-    base64String Crypto hslogger json mtl random WebServer
-  ];
-
-  sourceRoot = "git-export/Extras";
-
-  meta = {
-    description = "Web related tools and services";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/WebServer/default.nix b/pkgs/development/libraries/haskell/WebServer/default.nix
deleted file mode 100644
index 436dd52b7b2..00000000000
--- a/pkgs/development/libraries/haskell/WebServer/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ cabal, mtl, network, parsec, random, syb, fetchgit }:
-
-cabal.mkDerivation (self: {
-  pname = "WebServer";
-  version = "1.2";
-
-  src = fetchgit {
-    url = git://github.com/arjunguha/haskell-web.git;
-    rev = "931a2ec1744cd5c5139af9a3fe8195a36dc3acec" ;
-  };
-
-  buildDepends = [ mtl network parsec random syb ];
-  meta = {
-    homepage = "http://github.com/arjunguha/haskell-web";
-    description = "Web related tools and services";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index af6bb9cd181..2822819c571 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1266,15 +1266,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   webRoutesQuasi = callPackage ../development/libraries/haskell/web-routes-quasi {};
 
-  WebServer = callPackage ../development/libraries/haskell/WebServer {
-    inherit (pkgs) fetchgit;
-  };
-
-  WebServerExtras = callPackage ../development/libraries/haskell/WebServer-Extras {
-    json = self.json_0_3_6;
-    inherit (pkgs) fetchgit;
-  };
-
   CouchDB = callPackage ../development/libraries/haskell/CouchDB {
     HTTP = self.HTTP_3001_1_5;
     json = self.json_0_3_6;