From 133af7750ed5d422f9da5f5048ef7b267d267491 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 20 Mar 2016 15:38:30 -0500
Subject: [PATCH] squids: Remove unsupported versions of squid.

---
 pkgs/servers/squid/default.nix  | 24 ++++++++++++
 pkgs/servers/squid/squids.nix   | 67 ---------------------------------
 pkgs/top-level/all-packages.nix |  5 +--
 3 files changed, 26 insertions(+), 70 deletions(-)
 create mode 100644 pkgs/servers/squid/default.nix
 delete mode 100644 pkgs/servers/squid/squids.nix

diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix
new file mode 100644
index 000000000000..2831423d1237
--- /dev/null
+++ b/pkgs/servers/squid/default.nix
@@ -0,0 +1,24 @@
+{ fetchurl, stdenv, perl, lib, openldap, pam, db, cyrus_sasl, libcap,
+expat, libxml2, libtool, openssl}:
+stdenv.mkDerivation rec {
+  name = "squid-3.5.15";
+  src = fetchurl {
+    url = "http://www.squid-cache.org/Versions/v3/3.5/${name}.tar.bz2";
+    sha256 = "1cgy6ffyarqd35plqmqi3mrsp0941c6n55pr3zavp07ksj46wgzm";
+  };
+  buildInputs = [perl openldap pam db cyrus_sasl libcap expat libxml2
+    libtool openssl];
+  configureFlags = [
+    "--enable-ipv6"
+    "--disable-strict-error-checking"
+    "--disable-arch-native"
+    "--with-openssl"
+    "--enable-ssl-crtd"
+  ];
+
+  meta = {
+    description = "a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more";
+    homepage = "http://www.squid-cache.org";
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix
deleted file mode 100644
index 948621de35bd..000000000000
--- a/pkgs/servers/squid/squids.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-args @ { fetchurl, stdenv, perl, lib, composableDerivation
-, openldap, pam, db, cyrus_sasl, kerberos, libcap, expat, libxml2, libtool
-, openssl, ... }: with args;
-let edf = composableDerivation.edf; in
-rec {
-  squid30 = composableDerivation.composableDerivation {} {
-    name = "squid-3.0-stable26";
-
-    buildInputs = [perl];
-
-    src = args.fetchurl {
-      url = http://www.squid-cache.org/Versions/v3/3.0/squid-3.0.STABLE26.tar.bz2;
-      sha256 = "3e54ae3ad09870203862f0856c7d0cca16a85f62d5012085009003ee3d5467b4";
-    };
-
-    configureFlags = ["--enable-ipv6" "--disable-strict-error-checking" "--disable-arch-native"];
-
-    meta = {
-      description = "http-proxy";
-      homepage = "http://www.squid-cache.org";
-      license = stdenv.lib.licenses.gpl2;
-    };
-
-  };
-
-  squid31 = squid30.merge {
-    name = "squid-3.1.23";
-    src = args.fetchurl {
-      url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.23.tar.bz2;
-      sha256 = "13g4y0gg48xnlzrvpymb08gh25xi50y383faapkxws7i7v94305s";
-    };
-  };
-
-  squid32 = squid30.merge rec {
-    name = "squid-3.2.13";
-    src = args.fetchurl {
-      url = "http://www.squid-cache.org/Versions/v3/3.2/${name}.tar.bz2";
-      sha256 = "0dafqv00dr3nyrm9k47d6r7gv2r3f9hjd1ykl3kkvjca11r4n54j";
-    };
-    buildInputs = [openldap pam db cyrus_sasl libcap expat libxml2
-      libtool openssl];
-  };
-
-  squid34 = squid30.merge rec {
-    name = "squid-3.4.11";
-    src = args.fetchurl {
-      url = "http://www.squid-cache.org/Versions/v3/3.4/${name}.tar.bz2";
-      sha256 = "0p9dbsz541cpcc88albwpgq15jgpczv12j9b9g5xw6d3i977qm1h";
-    };
-    buildInputs = [openldap pam db cyrus_sasl libcap expat libxml2
-      libtool openssl];
-    configureFlags = ["--enable-ssl" "--enable-ssl-crtd"];
-  };
-
-  squid35 = squid30.merge rec {
-    name = "squid-3.5.15";
-    src = args.fetchurl {
-      url = "http://www.squid-cache.org/Versions/v3/3.5/${name}.tar.bz2";
-      sha256 = "1cgy6ffyarqd35plqmqi3mrsp0941c6n55pr3zavp07ksj46wgzm";
-    };
-    buildInputs = [openldap pam db cyrus_sasl libcap expat libxml2
-      libtool openssl];
-    configureFlags = ["--with-openssl" "--enable-ssl-crtd"];
-  };
-
-  latest = squid35;
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9729e2945d31..89d7c6f4a27f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9984,8 +9984,7 @@ let
 
   spawn_fcgi = callPackage ../servers/http/spawn-fcgi { };
 
-  squids = recurseIntoAttrs (callPackages ../servers/squid/squids.nix {});
-  squid = squids.squid31; # has ipv6 support
+  squid = callPackage ../servers/squid { };
 
   sslh = callPackage ../servers/sslh { };
 
@@ -15837,7 +15836,7 @@ let
   };
 
   scotch = callPackage ../applications/science/math/scotch { };
-  
+
   msieve = callPackage ../applications/science/math/msieve { };
 
   weka = callPackage ../applications/science/math/weka { };