diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 1d24553b08d..d12a55b82fd 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -26,6 +26,12 @@
GNOME desktop environment was upgraded to 3.36, see its release notes.
+
+
+ maxx package removed along with services.xserver.desktopManager.maxx module.
+ Please migrate to cdesktopenv and services.xserver.desktopManager.cde module.
+
+
We now distribute a GNOME ISO.
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index ea6aac9f6c9..5d3a84d7139 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -19,7 +19,7 @@ in
# E.g., if Plasma 5 is enabled, it supersedes xterm.
imports = [
./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
- ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./maxx.nix
+ ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix
./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix
];
diff --git a/nixos/modules/services/x11/desktop-managers/maxx.nix b/nixos/modules/services/x11/desktop-managers/maxx.nix
deleted file mode 100644
index 1c04104df41..00000000000
--- a/nixos/modules/services/x11/desktop-managers/maxx.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- xcfg = config.services.xserver;
- cfg = xcfg.desktopManager.maxx;
-in {
- options.services.xserver.desktopManager.maxx = {
- enable = mkEnableOption "MaXX desktop environment";
- };
-
- config = mkIf cfg.enable {
- environment.systemPackages = [ pkgs.maxx ];
-
- # there is hardcoded path in binaries
- system.activationScripts.setup-maxx = ''
- mkdir -p /opt
- ln -sfn ${pkgs.maxx}/opt/MaXX /opt
- '';
-
- services.xserver.desktopManager.session = [
- { name = "MaXX";
- start = ''
- exec ${pkgs.maxx}/opt/MaXX/etc/skel/Xsession.dt
- '';
- }];
- };
-
- meta.maintainers = [ maintainers.gnidorah ];
-}
diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix
deleted file mode 100644
index fc48514ff01..00000000000
--- a/pkgs/desktops/maxx/default.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, autoPatchelfHook, gnused
-, gcc, bash, gtk-engine-murrine, gtk_engines, librsvg
-
-, libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm
-, libXinerama, libXdamage, libICE, libXtst, libXaw, fontconfig, pango, cairo, glib, libxml2, atk, gtk2
-, gdk-pixbuf, libGL, ncurses5
-
-, dmidecode, pciutils, usbutils
-}:
-
-stdenv.mkDerivation rec {
- pname = "MaXX";
- version = "2.0.1";
- codename = "Indigo";
-
- srcs = [
- (fetchurl {
- url = "http://maxxdesktop.arcadedaydream.com/${codename}-Releases/Installers/MaXX-${codename}-${version}-x86_64.tar.gz";
- sha256 = "17hd3j8773kmvvhyf657in6zmhnw4mbvyn4r6dfip5bdaz66pj01";
- })
- ];
-
- nativeBuildInputs = [ makeWrapper autoPatchelfHook gnused ];
- buildInputs = [
- stdenv.cc.cc libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm
- libXinerama libXdamage libICE libXtst libXaw fontconfig pango cairo glib libxml2 atk gtk2
- gdk-pixbuf libGL ncurses5
- ];
-
- buildPhase = ''
- sed -i "s/\(LD_LIBRARY_PATH=.*\)$/\1:\$LD_LIBRARY_PATH/p" etc/system.desktopenv
-
- substituteInPlace bin/adminterm \
- --replace /bin/bash ${bash}/bin/bash
-
- substituteInPlace share/misc/HOME/initMaXX-Desktop-Home.sh \
- --replace "cp " "cp --no-preserve=mode "
- '';
-
- installPhase = ''
- maxx=$out/opt/MaXX
- mkdir -p "$maxx" $out/share $maxx/sbin
-
- mv -- ./* "$maxx"
- ln -s $maxx/share/icons $out/share
-
- wrapProgram $maxx/etc/skel/Xsession.dt \
- --prefix GTK_PATH : "${gtk-engine-murrine}/lib/gtk-2.0:${gtk_engines}/lib/gtk-2.0" \
- --prefix GDK_PIXBUF_MODULE_FILE : "$(echo ${librsvg.out}/lib/gdk-pixbuf-2.0/*/loaders.cache)"
-
- while IFS= read -r -d ''$'\0' i; do
- if isExecutable "$i"; then
- wrapProgram "$i" \
- --prefix PATH : ${gcc}/bin
- fi
- done < <(find "$maxx" -type f -print0)
-
- wrapProgram $maxx/bin/hinv \
- --prefix PATH : ${stdenv.lib.makeBinPath [ dmidecode pciutils usbutils ]}
- '';
-
- meta = with stdenv.lib; {
- description = "A replica of IRIX Interactive Desktop";
- homepage = "https://www.facebook.com/maxxdesktop/";
- license = {
- fullName = "The MaXX Interactive Desktop for Linux License Agreement";
- url = "http://maxxdesktop.arcadedaydream.com/Indigo-Releases/docs/license.html";
- free = false; # redistribution is only allowed to *some* hardware, etc.
- };
- maintainers = [ maintainers.gnidorah ];
- platforms = ["x86_64-linux"];
- longDescription = ''
- A clone of IRIX Interactive Desktop made in agreement with SGI.
- Provides simple and fast retro desktop environment.
- '';
- };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1da0e2df115..71d390c04e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24287,8 +24287,6 @@ in
pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { });
- maxx = callPackage ../desktops/maxx { };
-
plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { };
inherit (callPackages ../applications/misc/redshift {