diff --git a/.gitignore b/.gitignore
index 60c22d78..2b2f3487 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@ cabal.config
 *.hp
 Setup
 .stack-work
+shell.nix
+default.nix
diff --git a/README.md b/README.md
index 6b1e4a81..6bd5aa45 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ stack test     # Run all the tests
 
 Or `nix`:
 ```shell
-./scripts/update-nix-files.sh   # Get up-to-date shell.nix files
+./scripts/generate-nix-files.sh   # Get up-to-date shell.nix files
 ```
 
 Though we aren't sticklers for style, the `.stylish-haskell.yaml` and `HLint.hs`
diff --git a/scripts/update-nix-files.sh b/scripts/generate-nix-files.sh
similarity index 89%
rename from scripts/update-nix-files.sh
rename to scripts/generate-nix-files.sh
index 33ecea25..e72d772a 100755
--- a/scripts/update-nix-files.sh
+++ b/scripts/generate-nix-files.sh
@@ -1,9 +1,9 @@
 #!/bin/bash -
 #===============================================================================
 #
-#          FILE: update-nix-files.sh
+#          FILE: generate-nix-files.sh
 #
-#         USAGE: ./update-nix-files.sh
+#         USAGE: ./generate-nix-files.sh
 #
 #   DESCRIPTION: Update nix files at top-level and add all packages
 #
@@ -38,8 +38,10 @@ write-package-shell-nix () {
 
 update-nix-files () {
     for s in ${SOURCES[@]} ; do
-        cd "$s" && cabal2nix . > default.nix
+        pushd "$s" > /dev/null
+        cabal2nix . > default.nix
         write-package-shell-nix $s
+        popd > /dev/null
     done
 }
 
diff --git a/scripts/shell.nix b/scripts/shell.nix
deleted file mode 100644
index 615506cc..00000000
--- a/scripts/shell.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# Get a Nix shell with all the packages installed
-# Also a good way of running the tests for all packages
-with (import <nixpkgs> {}).pkgs;
-let modifiedHaskellPackages = haskellngPackages.override {
-      overrides = with haskell-ng.lib ; self: super: {
-        servant = appendConfigureFlag ( self.callPackage ../servant {} )
-            "--ghc-options=-Werror";
-        servant-server   = appendConfigureFlag (self.callPackage
-                ../servant-server {}) "--ghc-options=-Werror";
-        servant-client   = appendConfigureFlag (self.callPackage
-            ../servant-client {}) "--ghc-options=-Werror";
-        servant-js   = appendConfigureFlag (self.callPackage
-            ../servant-js {}) "--ghc-options=-Werror";
-        servant-docs     = appendConfigureFlag (self.callPackage ../servant-docs
-            {}) "--ghc-options=-Werror";
-      };
-    };
-in modifiedHaskellPackages.ghcWithPackages ( p : with p ; [
-    servant servant-server servant-client servant-js servant-docs
-])
diff --git a/servant-blaze/default.nix b/servant-blaze/default.nix
deleted file mode 100644
index 3c8d2ea4..00000000
--- a/servant-blaze/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ mkDerivation, base, blaze-html, http-media, servant, stdenv }:
-mkDerivation {
-  pname = "servant-blaze";
-  version = "0.5";
-  src = ./.;
-  buildDepends = [ base blaze-html http-media servant ];
-  homepage = "http://haskell-servant.github.io/";
-  description = "Blaze-html support for servant";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/servant-blaze/shell.nix b/servant-blaze/shell.nix
deleted file mode 100644
index 44a0f570..00000000
--- a/servant-blaze/shell.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-let
-  pkgs = import <nixpkgs> {};
-
-  haskellPackages = pkgs.haskellPackages.override {
-    overrides = self: super: {
-      servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror");
-      servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror");
-      servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror");
-      servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror");
-      servant-server = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-server {}) "--ghc-options=-Werror");
-      servant-examples = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-examples {}) "--ghc-options=-Werror");
-      servant-lucid = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-lucid {}) "--ghc-options=-Werror");
-      servant-mock = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-mock {}) "--ghc-options=-Werror");
-      servant-blaze = pkgs.haskell.lib.appendConfigureFlag (self.callPackage ./. {}) "--ghc-options=-Werror";
-    };
-  };
-
-in haskellPackages.servant-blaze.env
diff --git a/servant-client/default.nix b/servant-client/default.nix
deleted file mode 100644
index 2a66c120..00000000
--- a/servant-client/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
-, either, exceptions, hspec, http-client, http-client-tls
-, http-media, http-types, HUnit, network, network-uri, QuickCheck
-, safe, servant, servant-server, stdenv, string-conversions, text
-, transformers, wai, warp
-}:
-mkDerivation {
-  pname = "servant-client";
-  version = "0.5";
-  src = ./.;
-  buildDepends = [
-    aeson attoparsec base bytestring either exceptions http-client
-    http-client-tls http-media http-types network-uri safe servant
-    string-conversions text transformers
-  ];
-  testDepends = [
-    aeson base bytestring deepseq either hspec http-client http-media
-    http-types HUnit network QuickCheck servant servant-server text wai
-    warp
-  ];
-  homepage = "http://haskell-servant.github.io/";
-  description = "automatical derivation of querying functions for servant webservices";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/servant-client/shell.nix b/servant-client/shell.nix
deleted file mode 100644
index 6862ab21..00000000
--- a/servant-client/shell.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-let
-  pkgs = import <nixpkgs> {};
-
-  haskellPackages = pkgs.haskellPackages.override {
-    overrides = self: super: {
-      servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror");
-      servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror");
-      servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror");
-      servant-server = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-server {}) "--ghc-options=-Werror");
-      servant-examples = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-examples {}) "--ghc-options=-Werror");
-      servant-blaze = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-blaze {}) "--ghc-options=-Werror");
-      servant-lucid = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-lucid {}) "--ghc-options=-Werror");
-      servant-mock = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-mock {}) "--ghc-options=-Werror");
-      servant-client = pkgs.haskell.lib.appendConfigureFlag (self.callPackage ./. {}) "--ghc-options=-Werror";
-    };
-  };
-
-in haskellPackages.servant-client.env
diff --git a/servant-docs/default.nix b/servant-docs/default.nix
deleted file mode 100644
index 9f762739..00000000
--- a/servant-docs/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, aeson, base, bytestring, bytestring-conversion
-, case-insensitive, hashable, hspec, http-media, http-types, lens
-, servant, stdenv, string-conversions, text, unordered-containers
-}:
-mkDerivation {
-  pname = "servant-docs";
-  version = "0.5";
-  src = ./.;
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson base bytestring bytestring-conversion case-insensitive
-    hashable http-media http-types lens servant string-conversions text
-    unordered-containers
-  ];
-  testDepends = [ aeson base hspec lens servant string-conversions ];
-  homepage = "http://haskell-servant.github.io/";
-  description = "generate API docs for your servant webservice";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/servant-docs/shell.nix b/servant-docs/shell.nix
deleted file mode 100644
index 0bf6f8ca..00000000
--- a/servant-docs/shell.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-let
-  pkgs = import <nixpkgs> {};
-
-  haskellPackages = pkgs.haskellPackages.override {
-    overrides = self: super: {
-      servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror");
-      servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror");
-      servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror");
-      servant-server = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-server {}) "--ghc-options=-Werror");
-      servant-examples = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-examples {}) "--ghc-options=-Werror");
-      servant-blaze = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-blaze {}) "--ghc-options=-Werror");
-      servant-lucid = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-lucid {}) "--ghc-options=-Werror");
-      servant-mock = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-mock {}) "--ghc-options=-Werror");
-      servant-docs = pkgs.haskell.lib.appendConfigureFlag (self.callPackage ./. {}) "--ghc-options=-Werror";
-    };
-  };
-
-in haskellPackages.servant-docs.env
diff --git a/servant-examples/default.nix b/servant-examples/default.nix
deleted file mode 100644
index 284279d9..00000000
--- a/servant-examples/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, aeson, base, bytestring, directory, either
-, engine-io, engine-io-wai, http-types, js-jquery, lucid, mtl
-, random, servant, servant-client, servant-docs, servant-js
-, servant-lucid, servant-server, socket-io, stdenv, stm, text, time
-, transformers, wai, wai-extra, warp
-}:
-mkDerivation {
-  pname = "servant-examples";
-  version = "0.5";
-  src = ./.;
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    aeson base bytestring directory either engine-io engine-io-wai
-    http-types js-jquery lucid mtl random servant servant-client
-    servant-docs servant-js servant-lucid servant-server socket-io stm
-    text time transformers wai wai-extra warp
-  ];
-  homepage = "http://haskell-servant.github.io/";
-  description = "Example programs for servant";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/servant-examples/shell.nix b/servant-examples/shell.nix
deleted file mode 100644
index 0fae2886..00000000
--- a/servant-examples/shell.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-let
-  pkgs = import <nixpkgs> {};
-
-  haskellPackages = pkgs.haskellPackages.override {
-    overrides = self: super: {
-      servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror");
-      servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror");
-      servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror");
-      servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror");
-      servant-server = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-server {}) "--ghc-options=-Werror");
-      servant-blaze = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-blaze {}) "--ghc-options=-Werror");
-      servant-lucid = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-lucid {}) "--ghc-options=-Werror");
-      servant-mock = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-mock {}) "--ghc-options=-Werror");
-      servant-examples = pkgs.haskell.lib.appendConfigureFlag (self.callPackage ./. {}) "--ghc-options=-Werror";
-    };
-  };
-
-in haskellPackages.servant-examples.env
diff --git a/servant-js/default.nix b/servant-js/default.nix
deleted file mode 100644
index 09bb777b..00000000
--- a/servant-js/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, aeson, base, charset, filepath, hspec
-, hspec-expectations, language-ecmascript, lens, servant
-, servant-server, stdenv, stm, text, transformers, warp
-}:
-mkDerivation {
-  pname = "servant-js";
-  version = "0.5";
-  src = ./.;
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson base charset filepath lens servant servant-server stm text
-    transformers warp
-  ];
-  testDepends = [
-    base hspec hspec-expectations language-ecmascript lens servant
-  ];
-  homepage = "http://haskell-servant.github.io/";
-  description = "Automatically derive javascript functions to query servant webservices";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/servant-js/shell.nix b/servant-js/shell.nix
deleted file mode 100644
index 9f4c888a..00000000
--- a/servant-js/shell.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-let
-  pkgs = import <nixpkgs> {};
-
-  haskellPackages = pkgs.haskellPackages.override {
-    overrides = self: super: {
-      servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror");
-      servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror");
-      servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror");
-      servant-server = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-server {}) "--ghc-options=-Werror");
-      servant-examples = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-examples {}) "--ghc-options=-Werror");
-      servant-blaze = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-blaze {}) "--ghc-options=-Werror");
-      servant-lucid = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-lucid {}) "--ghc-options=-Werror");
-      servant-mock = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-mock {}) "--ghc-options=-Werror");
-      servant-js = pkgs.haskell.lib.appendConfigureFlag (self.callPackage ./. {}) "--ghc-options=-Werror";
-    };
-  };
-
-in haskellPackages.servant-js.env
diff --git a/servant-lucid/default.nix b/servant-lucid/default.nix
deleted file mode 100644
index e033c71c..00000000
--- a/servant-lucid/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ mkDerivation, base, http-media, lucid, servant, stdenv }:
-mkDerivation {
-  pname = "servant-lucid";
-  version = "0.5";
-  src = ./.;
-  buildDepends = [ base http-media lucid servant ];
-  homepage = "http://haskell-servant.github.io/";
-  description = "Servant support for lucid";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/servant-lucid/shell.nix b/servant-lucid/shell.nix
deleted file mode 100644
index 656531cd..00000000
--- a/servant-lucid/shell.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-let
-  pkgs = import <nixpkgs> {};
-
-  haskellPackages = pkgs.haskellPackages.override {
-    overrides = self: super: {
-      servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror");
-      servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror");
-      servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror");
-      servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror");
-      servant-server = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-server {}) "--ghc-options=-Werror");
-      servant-examples = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-examples {}) "--ghc-options=-Werror");
-      servant-blaze = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-blaze {}) "--ghc-options=-Werror");
-      servant-mock = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-mock {}) "--ghc-options=-Werror");
-      servant-lucid = pkgs.haskell.lib.appendConfigureFlag (self.callPackage ./. {}) "--ghc-options=-Werror";
-    };
-  };
-
-in haskellPackages.servant-lucid.env
diff --git a/servant-mock/default.nix b/servant-mock/default.nix
deleted file mode 100644
index 670e066e..00000000
--- a/servant-mock/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ mkDerivation, aeson, base, bytestring, http-types, QuickCheck
-, servant, servant-server, stdenv, transformers, wai, warp
-}:
-mkDerivation {
-  pname = "servant-mock";
-  version = "0.5";
-  src = ./.;
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson base bytestring http-types QuickCheck servant servant-server
-    transformers wai warp
-  ];
-  homepage = "http://github.com/haskell-servant/servant";
-  description = "Derive a mock server for free from your servant API types";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/servant-mock/shell.nix b/servant-mock/shell.nix
deleted file mode 100644
index cd9721d7..00000000
--- a/servant-mock/shell.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-let
-  pkgs = import <nixpkgs> {};
-
-  haskellPackages = pkgs.haskellPackages.override {
-    overrides = self: super: {
-      servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror");
-      servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror");
-      servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror");
-      servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror");
-      servant-server = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-server {}) "--ghc-options=-Werror");
-      servant-examples = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-examples {}) "--ghc-options=-Werror");
-      servant-blaze = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-blaze {}) "--ghc-options=-Werror");
-      servant-lucid = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-lucid {}) "--ghc-options=-Werror");
-      servant-mock = pkgs.haskell.lib.appendConfigureFlag (self.callPackage ./. {}) "--ghc-options=-Werror";
-    };
-  };
-
-in haskellPackages.servant-mock.env
diff --git a/servant-server/default.nix b/servant-server/default.nix
deleted file mode 100644
index 2254caab..00000000
--- a/servant-server/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ mkDerivation, aeson, attoparsec, base, bytestring
-, bytestring-conversion, containers, directory, doctest, either
-, exceptions, filemanip, filepath, hspec, hspec-wai, http-types
-, mmorph, mtl, network, network-uri, parsec, QuickCheck, safe
-, servant, split, stdenv, string-conversions, system-filepath
-, temporary, text, transformers, wai, wai-app-static, wai-extra
-, warp
-}:
-mkDerivation {
-  pname = "servant-server";
-  version = "0.5";
-  src = ./.;
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson attoparsec base bytestring containers either filepath
-    http-types mmorph mtl network network-uri safe servant split
-    string-conversions system-filepath text transformers wai
-    wai-app-static warp
-  ];
-  testDepends = [
-    aeson base bytestring bytestring-conversion directory doctest
-    either exceptions filemanip filepath hspec hspec-wai http-types mtl
-    network parsec QuickCheck servant string-conversions temporary text
-    transformers wai wai-extra warp
-  ];
-  homepage = "http://haskell-servant.github.io/";
-  description = "A family of combinators for defining webservices APIs and serving them";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/servant-server/shell.nix b/servant-server/shell.nix
deleted file mode 100644
index 8fb19d5a..00000000
--- a/servant-server/shell.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-let
-  pkgs = import <nixpkgs> {};
-
-  haskellPackages = pkgs.haskellPackages.override {
-    overrides = self: super: {
-      servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror");
-      servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror");
-      servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror");
-      servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror");
-      servant-examples = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-examples {}) "--ghc-options=-Werror");
-      servant-blaze = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-blaze {}) "--ghc-options=-Werror");
-      servant-lucid = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-lucid {}) "--ghc-options=-Werror");
-      servant-mock = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-mock {}) "--ghc-options=-Werror");
-      servant-server = pkgs.haskell.lib.appendConfigureFlag (self.callPackage ./. {}) "--ghc-options=-Werror";
-    };
-  };
-
-in haskellPackages.servant-server.env
diff --git a/servant/default.nix b/servant/default.nix
deleted file mode 100644
index e69de29b..00000000
diff --git a/servant/shell.nix b/servant/shell.nix
deleted file mode 100644
index 82d3938f..00000000
--- a/servant/shell.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-let
-  pkgs = import <nixpkgs> {};
-
-  haskellPackages = pkgs.haskellPackages.override {
-    overrides = self: super: {
-      servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror");
-      servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror");
-      servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror");
-      servant-server = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-server {}) "--ghc-options=-Werror");
-      servant-examples = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-examples {}) "--ghc-options=-Werror");
-      servant-blaze = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-blaze {}) "--ghc-options=-Werror");
-      servant-lucid = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-lucid {}) "--ghc-options=-Werror");
-      servant-mock = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-mock {}) "--ghc-options=-Werror");
-      servant = pkgs.haskell.lib.appendConfigureFlag (self.callPackage ./. {}) "--ghc-options=-Werror";
-    };
-  };
-
-in haskellPackages.servant.env