diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index e29e972ab39f..37346948b289 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -279,6 +279,11 @@
The module has been removed from nixpkgs due to lack of maintainer.
+
+
+ Squid 3 has been removed and the derivation now refers to Squid 4.
+
+
diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix
deleted file mode 100644
index 69a46533ba5d..000000000000
--- a/pkgs/servers/squid/4.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap
-, expat, libxml2, openssl }:
-
-stdenv.mkDerivation rec {
- name = "squid-4.8";
-
- src = fetchurl {
- url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz";
- sha256 = "0432m0ix046rkja7r7qpydgsm2kf1w393xym15nx6h9kv4jb7kbq";
- };
-
- buildInputs = [
- perl openldap db cyrus_sasl expat libxml2 openssl
- ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ];
-
- prePatch = ''
- substituteInPlace configure --replace "/usr/local/include/libxml2" "${libxml2.dev}/include/libxml2"
- '';
-
- configureFlags = [
- "--enable-ipv6"
- "--disable-strict-error-checking"
- "--disable-arch-native"
- "--with-openssl"
- "--enable-ssl-crtd"
- "--enable-storeio=ufs,aufs,diskd,rock"
- "--enable-removal-policies=lru,heap"
- "--enable-delay-pools"
- "--enable-x-accelerator-vary"
- ] ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "--enable-linux-netfilter";
-
- meta = with stdenv.lib; {
- description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more";
- homepage = http://www.squid-cache.org;
- license = licenses.gpl2;
- platforms = platforms.linux;
- maintainers = with maintainers; [ fpletz raskin ];
- };
-}
diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix
index fde29dc7e80c..69a46533ba5d 100644
--- a/pkgs/servers/squid/default.nix
+++ b/pkgs/servers/squid/default.nix
@@ -1,26 +1,22 @@
{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap
-, expat, libxml2, openssl, fetchpatch }:
+, expat, libxml2, openssl }:
stdenv.mkDerivation rec {
- name = "squid-3.5.28";
+ name = "squid-4.8";
src = fetchurl {
- url = "http://www.squid-cache.org/Versions/v3/3.5/${name}.tar.xz";
- sha256 = "1n4f55g56b11qz4fazrnvgzx5wp6b6637c4qkbd1lrjwwqibchgx";
+ url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz";
+ sha256 = "0432m0ix046rkja7r7qpydgsm2kf1w393xym15nx6h9kv4jb7kbq";
};
- patches = [
- (fetchpatch {
- name = "3.5-CVE-2019-13345.patch";
- url = "https://github.com/squid-cache/squid/commit/5730c2b5cb56e7639dc423dd62651c8736a54e35.patch";
- sha256 = "0955432g9a00vwxzcrwpjzx6vywspx1cxhr7bknr7jzbzam5sxi3";
- })
- ];
-
buildInputs = [
perl openldap db cyrus_sasl expat libxml2 openssl
] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ];
+ prePatch = ''
+ substituteInPlace configure --replace "/usr/local/include/libxml2" "${libxml2.dev}/include/libxml2"
+ '';
+
configureFlags = [
"--enable-ipv6"
"--disable-strict-error-checking"
@@ -38,6 +34,6 @@ stdenv.mkDerivation rec {
homepage = http://www.squid-cache.org;
license = licenses.gpl2;
platforms = platforms.linux;
- maintainers = with maintainers; [ fpletz ];
+ maintainers = with maintainers; [ fpletz raskin ];
};
}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f3dbd2efd55b..eddeb007c006 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -331,6 +331,7 @@ mapAliases ({
spice_protocol = spice-protocol; # added 2018-02-25
sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22
sqliteInteractive = sqlite-interactive; # added 2014-12-06
+ squid4 = squid; # added 2019-08-22
sshfsFuse = sshfs-fuse; # added 2016-09
suil-qt5 = suil; # added 2018-05-01
surf-webkit2 = surf; # added 2017-04-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f1283d419af..c401db75c3ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15154,7 +15154,6 @@ in
spawn_fcgi = callPackage ../servers/http/spawn-fcgi { };
squid = callPackage ../servers/squid { };
- squid4 = callPackage ../servers/squid/4.nix { };
sslh = callPackage ../servers/sslh { };