diff --git a/nixos/modules/services/desktops/tumbler.nix b/nixos/modules/services/desktops/tumbler.nix index ccbb6d1434d9..d18088d4634b 100644 --- a/nixos/modules/services/desktops/tumbler.nix +++ b/nixos/modules/services/desktops/tumbler.nix @@ -23,7 +23,7 @@ in package = mkOption { type = types.package; - default = pkgs.xfce4-13.tumbler; + default = pkgs.xfce4-14.tumbler; description = "Which tumbler package to use"; example = pkgs.xfce4-12.tumbler; }; diff --git a/pkgs/desktops/xfce4-13/automakeAddFlags.sh b/pkgs/desktops/xfce4-14/automakeAddFlags.sh similarity index 100% rename from pkgs/desktops/xfce4-13/automakeAddFlags.sh rename to pkgs/desktops/xfce4-14/automakeAddFlags.sh diff --git a/pkgs/desktops/xfce4-13/default.nix b/pkgs/desktops/xfce4-14/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/default.nix rename to pkgs/desktops/xfce4-14/default.nix diff --git a/pkgs/desktops/xfce4-13/exo/default.nix b/pkgs/desktops/xfce4-14/exo/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/exo/default.nix rename to pkgs/desktops/xfce4-14/exo/default.nix diff --git a/pkgs/desktops/xfce4-13/garcon/default.nix b/pkgs/desktops/xfce4-14/garcon/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/garcon/default.nix rename to pkgs/desktops/xfce4-14/garcon/default.nix diff --git a/pkgs/desktops/xfce4-13/gigolo/default.nix b/pkgs/desktops/xfce4-14/gigolo/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/gigolo/default.nix rename to pkgs/desktops/xfce4-14/gigolo/default.nix diff --git a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix b/pkgs/desktops/xfce4-14/libxfce4ui/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/libxfce4ui/default.nix rename to pkgs/desktops/xfce4-14/libxfce4ui/default.nix diff --git a/pkgs/desktops/xfce4-13/libxfce4util/default.nix b/pkgs/desktops/xfce4-14/libxfce4util/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/libxfce4util/default.nix rename to pkgs/desktops/xfce4-14/libxfce4util/default.nix diff --git a/pkgs/desktops/xfce4-13/mkXfceDerivation.nix b/pkgs/desktops/xfce4-14/mkXfceDerivation.nix similarity index 100% rename from pkgs/desktops/xfce4-13/mkXfceDerivation.nix rename to pkgs/desktops/xfce4-14/mkXfceDerivation.nix diff --git a/pkgs/desktops/xfce4-13/mousepad/default.nix b/pkgs/desktops/xfce4-14/mousepad/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/mousepad/default.nix rename to pkgs/desktops/xfce4-14/mousepad/default.nix diff --git a/pkgs/desktops/xfce4-13/orage/default.nix b/pkgs/desktops/xfce4-14/orage/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/orage/default.nix rename to pkgs/desktops/xfce4-14/orage/default.nix diff --git a/pkgs/desktops/xfce4-13/parole/default.nix b/pkgs/desktops/xfce4-14/parole/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/parole/default.nix rename to pkgs/desktops/xfce4-14/parole/default.nix diff --git a/pkgs/desktops/xfce4-13/ristretto/default.nix b/pkgs/desktops/xfce4-14/ristretto/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/ristretto/default.nix rename to pkgs/desktops/xfce4-14/ristretto/default.nix diff --git a/pkgs/desktops/xfce4-13/thunar-volman/default.nix b/pkgs/desktops/xfce4-14/thunar-volman/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/thunar-volman/default.nix rename to pkgs/desktops/xfce4-14/thunar-volman/default.nix diff --git a/pkgs/desktops/xfce4-13/thunar/default.nix b/pkgs/desktops/xfce4-14/thunar/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/thunar/default.nix rename to pkgs/desktops/xfce4-14/thunar/default.nix diff --git a/pkgs/desktops/xfce4-13/tumbler/default.nix b/pkgs/desktops/xfce4-14/tumbler/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/tumbler/default.nix rename to pkgs/desktops/xfce4-14/tumbler/default.nix diff --git a/pkgs/desktops/xfce4-13/xfburn/default.nix b/pkgs/desktops/xfce4-14/xfburn/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfburn/default.nix rename to pkgs/desktops/xfce4-14/xfburn/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix b/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix rename to pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-battery-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix rename to pkgs/desktops/xfce4-14/xfce4-battery-plugin/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-clipman-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix rename to pkgs/desktops/xfce4-14/xfce4-clipman-plugin/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix rename to pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix rename to pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh b/pkgs/desktops/xfce4-14/xfce4-dev-tools/setup-hook.sh similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh rename to pkgs/desktops/xfce4-14/xfce4-dev-tools/setup-hook.sh diff --git a/pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch b/pkgs/desktops/xfce4-14/xfce4-dict/configure-gio.patch similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch rename to pkgs/desktops/xfce4-14/xfce4-dict/configure-gio.patch diff --git a/pkgs/desktops/xfce4-13/xfce4-dict/default.nix b/pkgs/desktops/xfce4-14/xfce4-dict/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-dict/default.nix rename to pkgs/desktops/xfce4-14/xfce4-dict/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix b/pkgs/desktops/xfce4-14/xfce4-mixer/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-mixer/default.nix rename to pkgs/desktops/xfce4-14/xfce4-mixer/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-netload-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-netload-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-netload-plugin/default.nix rename to pkgs/desktops/xfce4-14/xfce4-netload-plugin/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix b/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix rename to pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix b/pkgs/desktops/xfce4-14/xfce4-panel/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-panel/default.nix rename to pkgs/desktops/xfce4-14/xfce4-panel/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix b/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix rename to pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-pulseaudio-plugin/default.nix rename to pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix rename to pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-session/default.nix b/pkgs/desktops/xfce4-14/xfce4-session/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-session/default.nix rename to pkgs/desktops/xfce4-14/xfce4-session/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix b/pkgs/desktops/xfce4-14/xfce4-settings/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-settings/default.nix rename to pkgs/desktops/xfce4-14/xfce4-settings/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce4-14/xfce4-taskmanager/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix rename to pkgs/desktops/xfce4-14/xfce4-taskmanager/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix b/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-terminal/default.nix rename to pkgs/desktops/xfce4-14/xfce4-terminal/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix rename to pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-whiskermenu-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix rename to pkgs/desktops/xfce4-14/xfce4-whiskermenu-plugin/default.nix diff --git a/pkgs/desktops/xfce4-13/xfce4-xkb-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-xkb-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfce4-xkb-plugin/default.nix rename to pkgs/desktops/xfce4-14/xfce4-xkb-plugin/default.nix diff --git a/pkgs/desktops/xfce4-13/xfconf/default.nix b/pkgs/desktops/xfce4-14/xfconf/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfconf/default.nix rename to pkgs/desktops/xfce4-14/xfconf/default.nix diff --git a/pkgs/desktops/xfce4-13/xfdesktop/default.nix b/pkgs/desktops/xfce4-14/xfdesktop/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfdesktop/default.nix rename to pkgs/desktops/xfce4-14/xfdesktop/default.nix diff --git a/pkgs/desktops/xfce4-13/xfwm4/default.nix b/pkgs/desktops/xfce4-14/xfwm4/default.nix similarity index 100% rename from pkgs/desktops/xfce4-13/xfwm4/default.nix rename to pkgs/desktops/xfce4-14/xfwm4/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5e8315b36be..57750b18b47d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22334,10 +22334,10 @@ in solarc-gtk-theme = callPackage ../misc/themes/solarc { }; xfce = xfce4-12; - xfceUnstable = xfce4-13; + xfceUnstable = xfce4-14; xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { }); - xfce4-13 = recurseIntoAttrs (callPackage ../desktops/xfce4-13 { }); + xfce4-14 = recurseIntoAttrs (callPackage ../desktops/xfce4-14 { }); xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { };