diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 9c914177ed61..c453d9762d11 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -208,6 +208,13 @@
removed due to it being an outdated version.
+
+
+ The mailpile email webclient
+ (services.mailpile) has been removed due to
+ its reliance on python2.
+
+
The MoinMoin wiki engine
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 396a09692a7e..88ceb902bb60 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -71,6 +71,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- `services.kubernetes.addons.dashboard` was removed due to it being an outdated version.
+- The `mailpile` email webclient (`services.mailpile`) has been removed due to its reliance on python2.
+
- The MoinMoin wiki engine (`services.moinmoin`) has been removed, because Python 2 is being retired from nixpkgs.
- The `wafHook` hook now honors `NIX_BUILD_CORES` when `enableParallelBuilding` is not set explicitly. Packages can restore the old behaviour by setting `enableParallelBuilding=false`.
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 61e7a6a8fc3d..cad3ad018574 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -182,7 +182,7 @@ in
yandexdisk = 143;
mxisd = 144; # was once collectd
#consul = 145;# dynamically allocated as of 2021-09-03
- mailpile = 146;
+ #mailpile = 146; # removed 2022-01-12
redmine = 147;
#seeks = 148; # removed 2020-06-21
prosody = 149;
@@ -502,7 +502,7 @@ in
#yandexdisk = 143; # unused
mxisd = 144; # was once collectd
#consul = 145; # unused
- mailpile = 146;
+ #mailpile = 146; # removed 2022-01-12
redmine = 147;
#seeks = 148; # removed 2020-06-21
prosody = 149;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index c46f60105fe6..697ed4fad723 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -791,7 +791,6 @@
./services/networking/lldpd.nix
./services/networking/logmein-hamachi.nix
./services/networking/lxd-image-server.nix
- ./services/networking/mailpile.nix
./services/networking/magic-wormhole-mailbox-server.nix
./services/networking/matterbridge.nix
./services/networking/mjpg-streamer.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index f1fb1a610767..b9a2f47f3f5a 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -51,6 +51,7 @@ with lib;
(mkRemovedOptionModule [ "services" "fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed")
(mkRemovedOptionModule [ "services" "frab" ] "The frab module has been removed")
(mkRemovedOptionModule [ "services" "kippo" ] "The corresponding package was removed from nixpkgs.")
+ (mkRemovedOptionModule [ "services" "mailpile" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "mathics" ] "The Mathics module has been removed")
(mkRemovedOptionModule [ "services" "meguca" ] "Use meguca has been removed from nixpkgs")
diff --git a/nixos/modules/services/networking/mailpile.nix b/nixos/modules/services/networking/mailpile.nix
deleted file mode 100644
index 4673a2580b60..000000000000
--- a/nixos/modules/services/networking/mailpile.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
- cfg = config.services.mailpile;
-
- hostname = cfg.hostname;
- port = cfg.port;
-
-in
-
-{
-
- ###### interface
-
- options = {
-
- services.mailpile = {
- enable = mkEnableOption "Mailpile the mail client";
-
- hostname = mkOption {
- type = types.str;
- default = "localhost";
- description = "Listen to this hostname or ip.";
- };
- port = mkOption {
- type = types.port;
- default = 33411;
- description = "Listen on this port.";
- };
- };
-
- };
-
-
- ###### implementation
-
- config = mkIf config.services.mailpile.enable {
-
- users.users.mailpile =
- { uid = config.ids.uids.mailpile;
- description = "Mailpile user";
- createHome = true;
- home = "/var/lib/mailpile";
- };
-
- users.groups.mailpile =
- { gid = config.ids.gids.mailpile;
- };
-
- systemd.services.mailpile =
- {
- description = "Mailpile server.";
- after = [ "network.target" ];
- wantedBy = [ "multi-user.target" ];
- serviceConfig = {
- User = "mailpile";
- ExecStart = "${pkgs.mailpile}/bin/mailpile --www ${hostname}:${port} --wait";
- # mixed - first send SIGINT to main process,
- # then after 2min send SIGKILL to whole group if neccessary
- KillMode = "mixed";
- KillSignal = "SIGINT"; # like Ctrl+C - safe mailpile shutdown
- TimeoutSec = 120; # wait 2min untill SIGKILL
- };
- environment.MAILPILE_HOME = "/var/lib/mailpile/.local/share/Mailpile";
- };
-
- environment.systemPackages = [ pkgs.mailpile ];
-
- };
-
-}
diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix
deleted file mode 100644
index 3b6bb01bb150..000000000000
--- a/pkgs/applications/graphics/displaycal/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ python2
-, lib
-, fetchurl
-, pkg-config
-, libXext
-, libXxf86vm
-, libX11
-, libXrandr
-, libXinerama
-, libXScrnSaver
-, argyllcms
- }:
-
-let
- inherit (python2.pkgs) buildPythonApplication wxPython numpy dbus-python;
-in buildPythonApplication rec {
- pname = "displaycal";
- version = "3.8.9.3";
-
- enableParallelBuilding = true;
-
- src = fetchurl {
- url = "mirror://sourceforge/project/dispcalgui/release/${version}/DisplayCAL-${version}.tar.gz";
- sha256 = "1sivi4q7sqsrc95qg5gh37bsm2761md4mpl89hflzwk6kyyxyd3w";
- };
-
- propagatedBuildInputs = [
- libXext
- libXxf86vm
- libX11
- libXrandr
- libXinerama
- libXScrnSaver
- argyllcms
- wxPython
- numpy
- dbus-python
- ];
-
- nativeBuildInputs = [
- pkg-config
- ];
-
- preConfigure = ''
- mkdir dist
- cp {misc,dist}/net.displaycal.DisplayCAL.appdata.xml
- touch dist/copyright
- mkdir -p $out
- ln -s $out/share/DisplayCAL $out/Resources
- '';
-
- # no idea why it looks there - symlink .json lang (everything)
- postInstall = ''
- for x in $out/share/DisplayCAL/*; do
- ln -s $x $out/lib/python2.7/site-packages/DisplayCAL
- done
-
- for prog in "$out/bin/"*; do
- wrapProgram "$prog" \
- --prefix PYTHONPATH : "$PYTHONPATH" \
- --prefix PATH : ${argyllcms}/bin
- done
- '';
-
- meta = {
- description = "Display Calibration and Characterization powered by Argyll CMS";
- homepage = "https://displaycal.net/";
- license = lib.licenses.gpl3;
- maintainers = [lib.maintainers.marcweber];
- platforms = lib.platforms.linux;
- };
-}
diff --git a/pkgs/applications/misc/curabydagoma/default.nix b/pkgs/applications/misc/curabydagoma/default.nix
deleted file mode 100644
index a8d041de1079..000000000000
--- a/pkgs/applications/misc/curabydagoma/default.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{ stdenv, runtimeShell, lib, fetchurl, python2Packages, unzip }:
-
-# This package uses a precompiled "binary" distribution of CuraByDagoma,
-# distributed by the editor.
-#
-# To update the package, follow the links on https://dist.dagoma.fr/:
-# * Cura By Dagoma
-# * Linux
-# * 64 bits
-# * Genric archive
-#
-# I made the arbitrary choice to compile this package only for x86_64.
-# I guess people owning a 3D printer generally don't use i686.
-# If, however, someone needs it, we certainly can find a solution.
-
-let
- pythonPackages = python2Packages;
-in stdenv.mkDerivation rec {
- pname = "curabydagoma";
- # Version is the date, UNIX format
- version = "1520506579";
- # Hash of the user's choice: os, arch, package type...
- hash = "58228cce5bbdcf764b7116850956f1e5";
-
- src = fetchurl {
- url = "https://dist.dagoma.fr/get/zip/CuraByDagoma/${version}/${hash}";
- sha256 = "16wfipdyjkf6dq8awjzs4zgkmqk6230277mf3iz8swday9hns8pq";
- };
- unpackCmd = "unzip $curSrc && tar zxf CuraByDagoma_amd64.tar.gz";
- nativeBuildInputs = [ unzip ];
- buildInputs = [ pythonPackages.python pythonPackages.pyopengl pythonPackages.wxPython pythonPackages.pyserial pythonPackages.numpy ];
-
- # Compile all pyc files because the included pyc files may be older than the
- # py files. However, Python doesn't realize that because the packages
- # have all dates set to epoch.
- buildPhase = ''
- python -m compileall -f curabydago
- '';
-
- # * Simply copy the stuff there
- # * Create an executable with the correct path etc
- # * Create a .desktop file to have a launcher in the desktop environments
- installPhase = ''
- mkdir $out
- cp -r * $out/
-
- mkdir $out/bin
- cat > $out/bin/curabydago < $out/share/applications/curabydago.desktop <