diff options
author | WORLDofPEACE <worldofpeace@protonmail.ch> | 2020-09-02 02:25:43 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-02 02:25:43 -0400 |
commit | 765d0371a85b99a7e20a2c7c6a1f7cb7107d0bc3 (patch) | |
tree | 61db8977d5a95dc8d0c5bf18fb08e2835ba235ef | |
parent | b268e89ff7430bb0d52bcc10ab68b9c774854d75 (diff) | |
parent | 3b92996c0bbf2e6451747f41598a29b4ce11b8c0 (diff) |
Merge pull request #96879 from romildo/rm.deepin.doc
deepin: register removal in release notes, aliases and module list
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2009.xml | 13 | ||||
-rw-r--r-- | nixos/modules/rename.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 2 |
3 files changed, 16 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index cd1afb3c1c9ea..e2e7f637f222a 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -1031,6 +1031,19 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0"; documentation</link> for more information. </para> </listitem> + <listitem> + <para> + The <literal>deepin</literal> package set has been removed from + nixpkgs. It was a work in progress to package the + <link xlink:href="https://www.deepin.org/en/dde/">Deepin Desktop Environment (DDE)</link>, + including libraries, tools and applications, and it was still + missing a service to lauch the desktop environment. It has shown + to no longer be a feasible goal due to reasons discussed in + <link xlink:href="https://github.com/NixOS/nixpkgs/issues/94870">issue #94870</link>. + The package <literal>netease-cloud-music</literal> has also been + removed, as it depends on libraries from deepin. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 1fe00e9142bae..fad0b40a9dbc3 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -19,6 +19,7 @@ with lib; # Completely removed modules (mkRemovedOptionModule [ "fonts" "fontconfig" "penultimate" ] "The corresponding package has removed from nixpkgs.") (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.") (mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "") (mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "") (mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.") diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5bede5bfc9fff..d36f73e2f8676 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -104,6 +104,7 @@ mapAliases ({ deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23 deadpixi-sam = deadpixi-sam-unstable; debian_devscripts = debian-devscripts; # added 2016-03-23 + deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31 desktop_file_utils = desktop-file-utils; # added 2018-02-25 devicemapper = lvm2; # added 2018-04-25 digikam5 = digikam; # added 2017-02-18 @@ -327,6 +328,7 @@ mapAliases ({ nagiosPluginsOfficial = monitoring-plugins; ncat = nmap; # added 2016-01-26 netcat-openbsd = libressl.nc; # added 2018-04-25 + netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # added 2020-08-31 networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 |