From 98b9d61bc33b42699b70830fa5a77d8dfac3b30b Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Thu, 28 Jun 2018 17:05:27 +0300
Subject: sproxy2: drop overrides

Fails to build with recent nixpkgs.
---
 modules/pkgs/sproxy2/default.nix         | 14 +-------------
 modules/pkgs/sproxy2/http-client-tls.nix | 18 ------------------
 modules/pkgs/sproxy2/http-client.nix     | 27 ---------------------------
 modules/pkgs/sproxy2/http-conduit.nix    | 29 -----------------------------
 4 files changed, 1 insertion(+), 87 deletions(-)
 delete mode 100644 modules/pkgs/sproxy2/http-client-tls.nix
 delete mode 100644 modules/pkgs/sproxy2/http-client.nix
 delete mode 100644 modules/pkgs/sproxy2/http-conduit.nix

diff --git a/modules/pkgs/sproxy2/default.nix b/modules/pkgs/sproxy2/default.nix
index 1e0bdf5..cd66324 100644
--- a/modules/pkgs/sproxy2/default.nix
+++ b/modules/pkgs/sproxy2/default.nix
@@ -1,16 +1,4 @@
 { haskellPackages }:
 
-/*
-  XXX: Sproxy2 need some libraries missed in nixpkgs 16.09
-*/
-
-let myHaskellPkgs = haskellPackages.override {
-  overrides = self: super: {
-    http-client     = self.callPackage ./http-client.nix {};
-    http-client-tls = self.callPackage ./http-client-tls.nix {};
-    http-conduit    = self.callPackage ./http-conduit.nix {};
-  };
-};
-
-in myHaskellPkgs.callPackage ./main.nix { }
+haskellPackages.callPackage ./main.nix { }
 
diff --git a/modules/pkgs/sproxy2/http-client-tls.nix b/modules/pkgs/sproxy2/http-client-tls.nix
deleted file mode 100644
index b89489f..0000000
--- a/modules/pkgs/sproxy2/http-client-tls.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ mkDerivation, base, bytestring, case-insensitive, connection
-, cryptonite, data-default-class, exceptions, hspec, http-client
-, http-types, memory, network, stdenv, tls, transformers
-}:
-mkDerivation {
-  pname = "http-client-tls";
-  version = "0.3.3";
-  sha256 = "0r50h7lhrwmxcmiq5nw1rxnpda3k6mhz4jsd86m56ymai5lnf77c";
-  libraryHaskellDepends = [
-    base bytestring case-insensitive connection cryptonite
-    data-default-class exceptions http-client http-types memory network
-    tls transformers
-  ];
-  testHaskellDepends = [ base hspec http-client http-types ];
-  homepage = "https://github.com/snoyberg/http-client";
-  description = "http-client backend using the connection package and tls library";
-  license = stdenv.lib.licenses.mit;
-}
diff --git a/modules/pkgs/sproxy2/http-client.nix b/modules/pkgs/sproxy2/http-client.nix
deleted file mode 100644
index 8dbd16c..0000000
--- a/modules/pkgs/sproxy2/http-client.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, array, async, base, base64-bytestring
-, blaze-builder, bytestring, case-insensitive, containers, cookie
-, deepseq, directory, exceptions, filepath, ghc-prim, hspec
-, http-types, mime-types, monad-control, network, network-uri
-, random, stdenv, streaming-commons, text, time, transformers, zlib
-}:
-mkDerivation {
-  pname = "http-client";
-  version = "0.5.3.3";
-  sha256 = "1kk4j5bg8fkw94c8r8b4ipxmia2arfkbbnhpgamcjy7m8mgbbblg";
-  libraryHaskellDepends = [
-    array base base64-bytestring blaze-builder bytestring
-    case-insensitive containers cookie deepseq exceptions filepath
-    ghc-prim http-types mime-types network network-uri random
-    streaming-commons text time transformers
-  ];
-  testHaskellDepends = [
-    async base base64-bytestring blaze-builder bytestring
-    case-insensitive containers deepseq directory hspec http-types
-    monad-control network network-uri streaming-commons text time
-    transformers zlib
-  ];
-  doCheck = false;
-  homepage = "https://github.com/snoyberg/http-client";
-  description = "An HTTP client engine";
-  license = stdenv.lib.licenses.mit;
-}
diff --git a/modules/pkgs/sproxy2/http-conduit.nix b/modules/pkgs/sproxy2/http-conduit.nix
deleted file mode 100644
index 76d670e..0000000
--- a/modules/pkgs/sproxy2/http-conduit.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, aeson, base, blaze-builder, bytestring
-, case-insensitive, conduit, conduit-extra, connection, cookie
-, data-default-class, exceptions, hspec, http-client
-, http-client-tls, http-types, HUnit, lifted-base, monad-control
-, mtl, network, resourcet, stdenv, streaming-commons, temporary
-, text, time, transformers, utf8-string, wai, wai-conduit, warp
-, warp-tls
-}:
-mkDerivation {
-  pname = "http-conduit";
-  version = "2.2.3";
-  sha256 = "1hqdzrr7vr2ylfjj61hayy9havhj5r2mym21815vzcvnzs01xrgf";
-  libraryHaskellDepends = [
-    aeson base bytestring conduit conduit-extra exceptions http-client
-    http-client-tls http-types lifted-base monad-control mtl resourcet
-    transformers
-  ];
-  testHaskellDepends = [
-    aeson base blaze-builder bytestring case-insensitive conduit
-    conduit-extra connection cookie data-default-class hspec
-    http-client http-types HUnit lifted-base network resourcet
-    streaming-commons temporary text time transformers utf8-string wai
-    wai-conduit warp warp-tls
-  ];
-  doCheck = false;
-  homepage = "http://www.yesodweb.com/book/http-conduit";
-  description = "HTTP client package with conduit interface and HTTPS support";
-  license = stdenv.lib.licenses.bsd3;
-}
-- 
cgit v1.2.3