Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b268e89ff743
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 765d0371a85b
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Sep 1, 2020

  1. Copy the full SHA
    6bab4b0 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b5c9c03 View commit details
  3. Copy the full SHA
    3b92996 View commit details

Commits on Sep 2, 2020

  1. Merge pull request #96879 from romildo/rm.deepin.doc

    deepin: register removal in release notes, aliases and module list
    worldofpeace authored Sep 2, 2020
    Copy the full SHA
    765d037 View commit details
Showing with 16 additions and 0 deletions.
  1. +13 −0 nixos/doc/manual/release-notes/rl-2009.xml
  2. +1 −0 nixos/modules/rename.nix
  3. +2 −0 pkgs/top-level/aliases.nix
13 changes: 13 additions & 0 deletions nixos/doc/manual/release-notes/rl-2009.xml
Original file line number Diff line number Diff line change
@@ -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>
1 change: 1 addition & 0 deletions nixos/modules/rename.nix
Original file line number Diff line number Diff line change
@@ -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.")
2 changes: 2 additions & 0 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
@@ -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