From 1475781b19a99aa16c89cf7b4eb4bbb870c6eca4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 22 Aug 2011 17:40:07 +0000 Subject: [PATCH] * Rename xfce-4 to xfce-4.6 in preparation for Xfce 4.8. svn path=/nixpkgs/trunk/; revision=28757 --- .../{xfce-4 => xfce-4.6}/applications/mousepad.nix | 0 .../{xfce-4 => xfce-4.6}/applications/ristretto.nix | 0 .../{xfce-4 => xfce-4.6}/applications/terminal.nix | 0 .../{xfce-4 => xfce-4.6}/applications/xfce4-mixer.nix | 0 .../applications/xfce4-power-manager.nix | 0 .../{xfce-4 => xfce-4.6}/art/xfce4-icon-theme.nix | 0 pkgs/desktops/{xfce-4 => xfce-4.6}/core/exo.nix | 0 .../{xfce-4 => xfce-4.6}/core/gtk-xfce-engine.nix | 0 pkgs/desktops/{xfce-4 => xfce-4.6}/core/libxfce4menu.nix | 0 pkgs/desktops/{xfce-4 => xfce-4.6}/core/libxfce4util.nix | 0 pkgs/desktops/{xfce-4 => xfce-4.6}/core/libxfcegui4.nix | 0 pkgs/desktops/{xfce-4 => xfce-4.6}/core/thunar.nix | 0 pkgs/desktops/{xfce-4 => xfce-4.6}/core/xfce-utils.nix | 0 pkgs/desktops/{xfce-4 => xfce-4.6}/core/xfce4-panel.nix | 0 pkgs/desktops/{xfce-4 => xfce-4.6}/core/xfce4-session.nix | 0 .../desktops/{xfce-4 => xfce-4.6}/core/xfce4-settings.nix | 0 pkgs/desktops/{xfce-4 => xfce-4.6}/core/xfconf.nix | 0 pkgs/desktops/{xfce-4 => xfce-4.6}/core/xfdesktop.nix | 0 pkgs/desktops/{xfce-4 => xfce-4.6}/core/xfwm4.nix | 0 pkgs/desktops/{xfce-4 => xfce-4.6}/default.nix | 0 pkgs/top-level/all-packages.nix | 8 ++++---- 21 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/desktops/{xfce-4 => xfce-4.6}/applications/mousepad.nix (100%) rename pkgs/desktops/{xfce-4 => xfce-4.6}/applications/ristretto.nix (100%) rename pkgs/desktops/{xfce-4 => xfce-4.6}/applications/terminal.nix (100%) rename pkgs/desktops/{xfce-4 => xfce-4.6}/applications/xfce4-mixer.nix (100%) rename pkgs/desktops/{xfce-4 => xfce-4.6}/applications/xfce4-power-manager.nix (100%) rename pkgs/desktops/{xfce-4 => xfce-4.6}/art/xfce4-icon-theme.nix (100%) rename pkgs/desktops/{xfce-4 => xfce-4.6}/core/exo.nix (100%) rename pkgs/desktops/{xfce-4 => xfce-4.6}/core/gtk-xfce-engine.nix (100%) rename pkgs/desktops/{xfce-4 => xfce-4.6}/core/libxfce4menu.nix (100%) rename pkgs/desktops/{xfce-4 => xfce-4.6}/core/libxfce4util.nix (100%) rename pkgs/desktops/{xfce-4 => xfce-4.6}/core/libxfcegui4.nix (100%) rename pkgs/desktops/{xfce-4 => xfce-4.6}/core/thunar.nix (100%) rename pkgs/desktops/{xfce-4 => xfce-4.6}/core/xfce-utils.nix (100%) rename pkgs/desktops/{xfce-4 => xfce-4.6}/core/xfce4-panel.nix (100%) rename pkgs/desktops/{xfce-4 => xfce-4.6}/core/xfce4-session.nix (100%) rename pkgs/desktops/{xfce-4 => xfce-4.6}/core/xfce4-settings.nix (100%) rename pkgs/desktops/{xfce-4 => xfce-4.6}/core/xfconf.nix (100%) rename pkgs/desktops/{xfce-4 => xfce-4.6}/core/xfdesktop.nix (100%) rename pkgs/desktops/{xfce-4 => xfce-4.6}/core/xfwm4.nix (100%) rename pkgs/desktops/{xfce-4 => xfce-4.6}/default.nix (100%) diff --git a/pkgs/desktops/xfce-4/applications/mousepad.nix b/pkgs/desktops/xfce-4.6/applications/mousepad.nix similarity index 100% rename from pkgs/desktops/xfce-4/applications/mousepad.nix rename to pkgs/desktops/xfce-4.6/applications/mousepad.nix diff --git a/pkgs/desktops/xfce-4/applications/ristretto.nix b/pkgs/desktops/xfce-4.6/applications/ristretto.nix similarity index 100% rename from pkgs/desktops/xfce-4/applications/ristretto.nix rename to pkgs/desktops/xfce-4.6/applications/ristretto.nix diff --git a/pkgs/desktops/xfce-4/applications/terminal.nix b/pkgs/desktops/xfce-4.6/applications/terminal.nix similarity index 100% rename from pkgs/desktops/xfce-4/applications/terminal.nix rename to pkgs/desktops/xfce-4.6/applications/terminal.nix diff --git a/pkgs/desktops/xfce-4/applications/xfce4-mixer.nix b/pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix similarity index 100% rename from pkgs/desktops/xfce-4/applications/xfce4-mixer.nix rename to pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix diff --git a/pkgs/desktops/xfce-4/applications/xfce4-power-manager.nix b/pkgs/desktops/xfce-4.6/applications/xfce4-power-manager.nix similarity index 100% rename from pkgs/desktops/xfce-4/applications/xfce4-power-manager.nix rename to pkgs/desktops/xfce-4.6/applications/xfce4-power-manager.nix diff --git a/pkgs/desktops/xfce-4/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce-4.6/art/xfce4-icon-theme.nix similarity index 100% rename from pkgs/desktops/xfce-4/art/xfce4-icon-theme.nix rename to pkgs/desktops/xfce-4.6/art/xfce4-icon-theme.nix diff --git a/pkgs/desktops/xfce-4/core/exo.nix b/pkgs/desktops/xfce-4.6/core/exo.nix similarity index 100% rename from pkgs/desktops/xfce-4/core/exo.nix rename to pkgs/desktops/xfce-4.6/core/exo.nix diff --git a/pkgs/desktops/xfce-4/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce-4.6/core/gtk-xfce-engine.nix similarity index 100% rename from pkgs/desktops/xfce-4/core/gtk-xfce-engine.nix rename to pkgs/desktops/xfce-4.6/core/gtk-xfce-engine.nix diff --git a/pkgs/desktops/xfce-4/core/libxfce4menu.nix b/pkgs/desktops/xfce-4.6/core/libxfce4menu.nix similarity index 100% rename from pkgs/desktops/xfce-4/core/libxfce4menu.nix rename to pkgs/desktops/xfce-4.6/core/libxfce4menu.nix diff --git a/pkgs/desktops/xfce-4/core/libxfce4util.nix b/pkgs/desktops/xfce-4.6/core/libxfce4util.nix similarity index 100% rename from pkgs/desktops/xfce-4/core/libxfce4util.nix rename to pkgs/desktops/xfce-4.6/core/libxfce4util.nix diff --git a/pkgs/desktops/xfce-4/core/libxfcegui4.nix b/pkgs/desktops/xfce-4.6/core/libxfcegui4.nix similarity index 100% rename from pkgs/desktops/xfce-4/core/libxfcegui4.nix rename to pkgs/desktops/xfce-4.6/core/libxfcegui4.nix diff --git a/pkgs/desktops/xfce-4/core/thunar.nix b/pkgs/desktops/xfce-4.6/core/thunar.nix similarity index 100% rename from pkgs/desktops/xfce-4/core/thunar.nix rename to pkgs/desktops/xfce-4.6/core/thunar.nix diff --git a/pkgs/desktops/xfce-4/core/xfce-utils.nix b/pkgs/desktops/xfce-4.6/core/xfce-utils.nix similarity index 100% rename from pkgs/desktops/xfce-4/core/xfce-utils.nix rename to pkgs/desktops/xfce-4.6/core/xfce-utils.nix diff --git a/pkgs/desktops/xfce-4/core/xfce4-panel.nix b/pkgs/desktops/xfce-4.6/core/xfce4-panel.nix similarity index 100% rename from pkgs/desktops/xfce-4/core/xfce4-panel.nix rename to pkgs/desktops/xfce-4.6/core/xfce4-panel.nix diff --git a/pkgs/desktops/xfce-4/core/xfce4-session.nix b/pkgs/desktops/xfce-4.6/core/xfce4-session.nix similarity index 100% rename from pkgs/desktops/xfce-4/core/xfce4-session.nix rename to pkgs/desktops/xfce-4.6/core/xfce4-session.nix diff --git a/pkgs/desktops/xfce-4/core/xfce4-settings.nix b/pkgs/desktops/xfce-4.6/core/xfce4-settings.nix similarity index 100% rename from pkgs/desktops/xfce-4/core/xfce4-settings.nix rename to pkgs/desktops/xfce-4.6/core/xfce4-settings.nix diff --git a/pkgs/desktops/xfce-4/core/xfconf.nix b/pkgs/desktops/xfce-4.6/core/xfconf.nix similarity index 100% rename from pkgs/desktops/xfce-4/core/xfconf.nix rename to pkgs/desktops/xfce-4.6/core/xfconf.nix diff --git a/pkgs/desktops/xfce-4/core/xfdesktop.nix b/pkgs/desktops/xfce-4.6/core/xfdesktop.nix similarity index 100% rename from pkgs/desktops/xfce-4/core/xfdesktop.nix rename to pkgs/desktops/xfce-4.6/core/xfdesktop.nix diff --git a/pkgs/desktops/xfce-4/core/xfwm4.nix b/pkgs/desktops/xfce-4.6/core/xfwm4.nix similarity index 100% rename from pkgs/desktops/xfce-4/core/xfwm4.nix rename to pkgs/desktops/xfce-4.6/core/xfwm4.nix diff --git a/pkgs/desktops/xfce-4/default.nix b/pkgs/desktops/xfce-4.6/default.nix similarity index 100% rename from pkgs/desktops/xfce-4/default.nix rename to pkgs/desktops/xfce-4.6/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 606b4458a23d..d5af3c179c54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7876,11 +7876,11 @@ let inherit (gtkLibs) glib gtk; }; - xfce = xfce4; + xfce = xfce46; - xfce4 = recurseIntoAttrs - (let callPackage = newScope pkgs.xfce4; in - import ../desktops/xfce-4 { inherit callPackage pkgs; }); + xfce46 = recurseIntoAttrs + (let callPackage = newScope pkgs.xfce46; in + import ../desktops/xfce-4.6 { inherit callPackage pkgs; }); ### SCIENCE