Vladimír Čunát
|
86639d9bb9
|
Merge branch 'master' into x-updates
Conflicts (taken master versions):
pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
pkgs/desktops/xfce/applications/gigolo.nix
pkgs/desktops/xfce/applications/mousepad.nix
pkgs/desktops/xfce/applications/ristretto.nix
pkgs/desktops/xfce/applications/terminal.nix
pkgs/desktops/xfce/applications/xfce4-mixer.nix
pkgs/desktops/xfce/applications/xfce4-notifyd.nix
pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
pkgs/desktops/xfce/art/xfce4-icon-theme.nix
pkgs/desktops/xfce/core/exo.nix
pkgs/desktops/xfce/core/garcon.nix
pkgs/desktops/xfce/core/gtk-xfce-engine.nix
pkgs/desktops/xfce/core/libxfce4ui.nix
pkgs/desktops/xfce/core/libxfce4util.nix
pkgs/desktops/xfce/core/libxfcegui4.nix
pkgs/desktops/xfce/core/thunar-volman.nix
pkgs/desktops/xfce/core/thunar.nix
pkgs/desktops/xfce/core/tumbler.nix
pkgs/desktops/xfce/core/xfce4-appfinder.nix
pkgs/desktops/xfce/core/xfce4-panel.nix
pkgs/desktops/xfce/core/xfce4-power-manager.nix
pkgs/desktops/xfce/core/xfce4-session.nix
pkgs/desktops/xfce/core/xfce4-settings.nix
pkgs/desktops/xfce/core/xfconf.nix
pkgs/desktops/xfce/core/xfdesktop.nix
pkgs/desktops/xfce/core/xfwm4.nix
pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
pkgs/development/libraries/webkit/default.nix
pkgs/top-level/all-packages.nix
|
2013-03-09 17:55:37 +01:00 |
|
|
Vladimír Čunát
|
f0c683faec
|
xfdesktop: minor update
|
2013-03-09 17:07:50 +01:00 |
|
|
Vladimír Čunát
|
c3511c115d
|
xfce: fix NixOS support
Sorry for this forgotten commit.
|
2013-03-09 10:51:34 +01:00 |
|
Michael Raskin
|
b26c770651
|
Exporting XFCE gvfs: it is referenced in NixOS, it is unclear how to remove the dependency cleanly and it affects rebuild even with config that doesn't mention XFCE at all.
|
2013-03-09 12:20:19 +04:00 |
|
|
Vladimír Čunát
|
e979d7ad2f
|
vlada/xfce
Major Xfce refactoring, also adding versions 4.10.*
Signed-off-by: Vladimír Čunát <vcunat@gmail.com>
|
2013-02-21 12:16:51 +01:00 |
|
|
Vladimír Čunát
|
9abff7a85e
|
Major Xfce refactoring, also adding versions 4.10.*
Please, comment on #296.
|
2013-02-09 18:38:26 +01:00 |
|