diff options
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2003.xml | 8 | ||||
| -rw-r--r-- | pkgs/desktops/xfce/core/xfwm4/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 31f08d9da341..39338904ee52 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -196,10 +196,10 @@ services.xserver.displayManager.defaultSession = "xfce+icewm"; </listitem> <listitem> <para> - There is now only one Xfce package-set and module. This means attributes, <literal>xfce4-14</literal> - <literal>xfce4-12</literal>, and <literal>xfceUnstable</literal> all now point to the latest Xfce 4.14 - packages. And in future NixOS releases will be the latest released version of Xfce available at the - time during the releases development (if viable). + There is now only one Xfce package-set and module. This means that attributes <literal>xfce4-14</literal> + and <literal>xfceUnstable</literal> all now point to the latest Xfce 4.14 + packages. And in the future NixOS releases will be the latest released version of Xfce available at the + time of the release's development (if viable). </para> </listitem> <listitem> diff --git a/pkgs/desktops/xfce/core/xfwm4/default.nix b/pkgs/desktops/xfce/core/xfwm4/default.nix index 2dff3302617c..ed77699f191e 100644 --- a/pkgs/desktops/xfce/core/xfwm4/default.nix +++ b/pkgs/desktops/xfce/core/xfwm4/default.nix @@ -5,7 +5,7 @@ mkXfceDerivation { category = "xfce"; pname = "xfwm4"; - version = "4.14.0"; + version = "4.14.0"; # TODO: remove xfce4-14 alias when this gets bumped sha256 = "1z5aqij2d8n9wnha88b0qzkvss54jvqs8w1w5m3mzjl4c9mn9n8m"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 42478f38b84d..667f2f0ca431 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -497,7 +497,7 @@ mapAliases ({ morituri = whipper; # added 2018-09-13 xfceUnstable = xfce4-14; # added 2019-09-17 xfce4-14 = xfce; - xfce4-12 = xfce; + xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # added 2020-03-14 x11 = xlibsWrapper; # added 2015-09 xbmc = kodi; # added 2018-04-25 xbmcPlain = kodiPlain; # added 2018-04-25 |