gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/polipo, polipo: drop (#408271)

Browse Source
This commit is contained in:
K900
2025-05-18 10:45:38 +03:00
committed by GitHub
parent d0afebfe3e 27734eb99a
commit 67fa2bd433
7 changed files with 7 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/doc/manual/release-notes/rl-2511.section.md
+1 -1
View File
@@ -16,7 +16,7 @@
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- Create the first release note entry in this section!
- The `services.polipo` module has been removed as `polipo` is unmaintained and archived upstream.
## Other Notable Changes {#sec-release-25.11-notable-changes}
nixos/modules/misc/ids.nix
+2 -2
View File
@@ -167,7 +167,7 @@ in
nsd = 126;
gitolite = 127;
znc = 128;
polipo = 129;
# polipo = 129; removed 2025-05-18
mopidy = 130;
#docker = 131; # unused
gdm = 132;
@@ -507,7 +507,7 @@ in
nsd = 126;
gitolite = 127;
znc = 128;
polipo = 129;
# polipo = 129; removed 2025-05-18
mopidy = 130;
docker = 131;
gdm = 132;
nixos/modules/module-list.nix
-1
View File
@@ -1268,7 +1268,6 @@
./services/networking/picosnitch.nix
./services/networking/pixiecore.nix
./services/networking/pleroma.nix
./services/networking/polipo.nix
./services/networking/powerdns.nix
./services/networking/pppd.nix
./services/networking/pptpd.nix
nixos/modules/rename.nix
+3
View File
@@ -193,6 +193,9 @@ in
(mkRemovedOptionModule [ "services" "pantheon" "files" ] ''
This module was removed, please add pkgs.pantheon.elementary-files to environment.systemPackages directly.
'')
(mkRemovedOptionModule [ "services" "polipo" ] ''
The polipo project is unmaintained and archived upstream.
'')
(mkRemovedOptionModule [ "services" "prey" ] ''
prey-bash-client is deprecated upstream
'')
nixos/modules/services/networking/polipo.nix
-124
View File
@@ -1,124 +0,0 @@
{
config,
lib,
pkgs,
...
}:
with lib;
let
cfg = config.services.polipo;
polipoConfig = pkgs.writeText "polipo.conf" ''
proxyAddress = ${cfg.proxyAddress}
proxyPort = ${toString cfg.proxyPort}
allowedClients = ${concatStringsSep ", " cfg.allowedClients}
${optionalString (cfg.parentProxy != "") "parentProxy = ${cfg.parentProxy}"}
${optionalString (cfg.socksParentProxy != "") "socksParentProxy = ${cfg.socksParentProxy}"}
${config.services.polipo.extraConfig}
'';
in
{
options = {
services.polipo = {
enable = mkEnableOption "polipo caching web proxy";
proxyAddress = mkOption {
type = types.str;
default = "127.0.0.1";
description = "IP address on which Polipo will listen.";
};
proxyPort = mkOption {
type = types.port;
default = 8123;
description = "TCP port on which Polipo will listen.";
};
allowedClients = mkOption {
type = types.listOf types.str;
default = [
"127.0.0.1"
"::1"
];
example = [
"127.0.0.1"
"::1"
"134.157.168.0/24"
"2001:660:116::/48"
];
description = ''
List of IP addresses or network addresses that may connect to Polipo.
'';
};
parentProxy = mkOption {
type = types.str;
default = "";
example = "localhost:8124";
description = ''
Hostname and port number of an HTTP parent proxy;
it should have the form ‘host:port’.
'';
};
socksParentProxy = mkOption {
type = types.str;
default = "";
example = "localhost:9050";
description = ''
Hostname and port number of an SOCKS parent proxy;
it should have the form ‘host:port’.
'';
};
extraConfig = mkOption {
type = types.lines;
default = "";
description = ''
Polio configuration. Contents will be added
verbatim to the configuration file.
'';
};
};
};
config = mkIf cfg.enable {
users.users.polipo = {
uid = config.ids.uids.polipo;
description = "Polipo caching proxy user";
home = "/var/cache/polipo";
createHome = true;
};
users.groups.polipo = {
gid = config.ids.gids.polipo;
members = [ "polipo" ];
};
systemd.services.polipo = {
description = "caching web proxy";
after = [
"network.target"
"nss-lookup.target"
];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = "${pkgs.polipo}/bin/polipo -c ${polipoConfig}";
User = "polipo";
};
};
};
}
pkgs/by-name/po/polipo/package.nix
-33
View File
@@ -1,33 +0,0 @@
{
lib,
stdenv,
fetchurl,
texinfo,
}:
stdenv.mkDerivation rec {
pname = "polipo";
version = "1.1.1";
src = fetchurl {
url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/${pname}-${version}.tar.gz";
sha256 = "05g09sg9qkkhnc2mxldm1w1xkxzs2ylybkjzs28w8ydbjc3pand2";
};
buildInputs = [ texinfo ];
makeFlags = [
"PREFIX=$(out)"
"LOCAL_ROOT=$(out)/share/polipo/www"
];
meta = with lib; {
homepage = "http://www.pps.jussieu.fr/~jch/software/polipo/";
description = "Small and fast caching web proxy";
license = licenses.mit;
maintainers = with maintainers; [ ehmry ];
platforms = platforms.all;
knownVulnerabilities = [
"Unmaintained upstream: https://github.com/jech/polipo/commit/4d42ca1b5849"
];
};
}
pkgs/top-level/aliases.nix
+1
View File
@@ -1544,6 +1544,7 @@ mapAliases {
PlistCpp = plistcpp; # Added 2024-01-05
pocket-updater-utility = pupdate; # Added 2024-01-25
polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18
poppler_utils = poppler-utils; # Added 2025-02-27
powerline-rs = throw "'powerline-rs' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
premake3 = throw "'premake3' has been removed since it is unmaintained. Consider using 'premake' instead"; # Added 2025-05-10