Commit Graph

333 Commits

Author SHA1 Message Date
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Eelco Dolstra
8172cd734c docdev -> devdoc
It's "developer documentation", not "documentation developer" after
all.
2016-09-01 11:07:23 +02:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
obadz
ecd3617d7a xfce.xfce4-power-manager: add withGtk3 version 1.6.0
test passed: nix-build '<nixos/release.nix>' -A tests.xfce.x86_64-linux

Closes: #8595
2016-06-16 15:32:07 +01:00
José Romildo Malaquias
e72d29020c libxfce4ui: add libICE and libSM as propagated build inputs 2016-06-14 11:53:11 -03:00
José Romildo Malaquias
370cc4f44f libxfce4ui: use nativeBuildInputs for dependencies not needed at runtime 2016-06-14 11:51:04 -03:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
obadz
31f4a9b559 xfce.thunar: patch to avoid error
«the desktop file … is in an insecure location»
which pops up when invoking desktop files that are
symlinks to the /nix/store

this error was added by this commit:

1ec8ff89ec

«Only allow direct execution of desktop files in an
XDG directory and if they are executable.»
2016-06-09 12:10:15 +01:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
José Romildo Malaquias
1b5de9df06 xfce4: rename package xfce4screenshooter to xfce4-screenshooter 2016-05-14 23:27:09 -03:00
José Romildo Malaquias
1498dfd24a xfce4-screenshooter: 1.8.1 -> 1.8.2 2016-05-14 09:25:25 -03:00
José Romildo Malaquias
48c63cb6a6 xfce4-screenshooter: add dependency on hicolor_icon_theme 2016-05-14 09:15:06 -03:00
Arseniy Seroka
3e92cbd86e Merge pull request #15215 from romildo/upd.xfce4-cpufreq-plugin
xfce4-cpufreq-plugin: 1.1.1 -> 1.1.3
2016-05-04 21:37:33 +03:00
José Romildo Malaquias
7e09858d6e xfce4-weather-plugin: init at 0.8.7 2016-05-04 14:02:13 -03:00
José Romildo Malaquias
3bcaf22dec xfce4-cpufreq-plugin: 1.1.1 -> 1.1.3 2016-05-04 09:11:34 -03:00
José Romildo Malaquias
41b5de4773 xfce4-whiskermenu-plugin: 1.5.2 -> 1.5.3 2016-05-03 19:13:09 -03:00
José Romildo Malaquias
518b9abfd5 xfce4-whiskermenu-plugin: the xfce4-panel binary is in ${xfce4panel.out} 2016-05-03 19:03:46 -03:00
José Romildo Malaquias
f0da9ff412 gtk-xfce-engine: add support to Gtk3 2016-05-03 15:18:23 -03:00
José Romildo Malaquias
f72a2faa28 gtk-xfce-engine: 2.10.1 -> 3.2.0 2016-05-03 15:14:50 -03:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Robin Gloster
3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
José Romildo Malaquias
2b7de01df9 orage: init at 4.12.1 2016-03-11 07:33:07 -03:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster
3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00
zimbatm
17348dc094 Remove all dots at end of descriptions
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
2016-02-27 17:30:29 +00:00
Vladimír Čunát
9d092e324c xfce.gvfs: don't depend on samba
It seems a better fit for Xfce now.
https://github.com/NixOS/nixpkgs/commit/ca3690d426dce3
2016-02-27 15:23:15 +01:00
Robin Gloster
35f92d9810 xfce4-12.xfce4_verve_plugin: turn off format hardening 2016-02-22 09:45:31 +00:00
Franz Pletz
f921abe393 Merge pull request #13160 from romildo/fix-xfce4-whisker-menu
xfce4-whiskermenu-plugin: fix xfce4-panel path in xfce4-popup-whisker…
2016-02-22 02:12:32 +01:00
José Romildo Malaquias
aee6548701 xfce4-whiskermenu-plugin: 1.5.1 -> 1.5.2 2016-02-21 09:51:44 -03:00
José Romildo Malaquias
a7d64fef38 xfce4-whiskermenu-plugin: fix xfce4-panel path in xfce4-popup-whiskermenu script 2016-02-21 09:24:43 -03:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Raymond Gauthier
662bbb526c thunar: improvements (close #10306)
Add the possibility to specify plugin set to
be used as overridable `thunar` derivation argument.

New nixos config attribute:
`services.xserver.desktopManager.xfce.thunarPlugins`
that allows user to specify plugins in the context
of nixos.

Tests:

 -  With and without plugins.
 -  Using the nixos attributes.
2015-11-24 09:51:39 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
William A. Kennington III
9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Arseniy Seroka
83ce6db83b Merge pull request #10771 from demin-dmitriy/pulseaudio-panel-plugin
xfce4-pulseaudio-plugin: init at 0.2.3
2015-11-13 17:47:00 +03:00
William A. Kennington III
a26c8e9b83 Merge branch 'master.upstream' into staging.upstream 2015-11-07 15:51:51 -08:00
Raymond Gauthier
34eb56e16b mousepad: fix the Using the 'memory' GSettings backend issue.
Close #10867.
It means that settings couldn't be saved. The issue appeared
since upgrade to nixos 15.09 and fall as part of #4415.

Tested on nixos.
 -  No longer has a stderr when running the application.
 -  Settings are effectively saved.
2015-11-07 18:21:37 +01:00
Demin Dmitriy
1736cedc20 xfce4-pulseaudio-plugin: init at 0.2.3 2015-11-01 08:13:06 +03:00
Demin Dmitriy
b030236799 libxfce4ui xfce4panel: add gtk3 support 2015-11-01 08:12:59 +03:00
Eelco Dolstra
81f6c62004 Merge remote-tracking branch 'origin/master' into systemd-219 2015-10-30 15:47:37 +01:00
Vladimír Čunát
787f322540 $docdev fixups: mostly to avoid empty output
... after auto-removing some kinds of files by default.
In some cases I let them be removed and in others I let them be put into
$docdev. That was more due to general indecisiveness on this question
than any reasons in the particular cases.
2015-10-28 18:58:06 +01:00
Perry Barnoy
3d1797160f Created the xfce4-whiskermenu-plugin expression. 2015-10-19 13:58:13 -04:00
Perry Barnoy
a60b53088d Added the xfce4-whiskermenu-plugin 2015-10-19 13:55:46 -04:00
Vladimír Čunát
04c7506f0f xfce core: split into outputs, change style
- The split was only done where it seemed that some parts aren't really
  needed, which were mainly headers and gtk-doc.
- Update style to be closer with what's common in nixpkgs.
- Change explicit removal of icon theme cache into including the
  hicolor theme.
2015-10-14 14:32:26 +02:00
Eelco Dolstra
b23038dd80 Merge remote-tracking branch 'origin/master' into systemd-219 2015-10-01 14:17:46 +02:00
Raymond Gauthier
eebe362911 xfce.thunar-archive-plugin: init at 0.3.1 (close #10029)
A `thunar` plugin that adds archive manipulation features to
right click on file/directory menu. It can use either gnome or
kde archive managers. Detection of backend based on
`*.desktop` files mime types.

Should supercede non-functional pre-existing
`xfce.thunar_archive_plugin` (which for some
unknown reason is building the volume manager
plugin).

Also removed `xfce.thunar_archive_plugin` because
superceded.

Tests:

 -  When plugin package is installed, the supplementary
    menu entries appear in thunar.
 -  Succesfully extracted an archive using backend
    `file-roller` through thunar menu entry.

+ minor changes from vcunat, mainly meta.
2015-09-26 08:18:06 +02:00
Vladimír Čunát
57287106be xfce.xfdesktop: maintenance update 2015-09-24 11:17:26 +02:00
Vladimír Čunát
735f0f2ca8 thunar-dropbox-plugin: fixup after #9935
Close #9935.
I don't think it's good to split thunarx into a separate derivation in
this way. We would have the library and associated stuff twice and two
expressions, etc. Distributions do these things by an analogy to multiple-output
derivation (Debian does, for example), so we could use that, but it
doesn't seem important in this case and would be better after #7701 anyway.
2015-09-23 19:19:31 +02:00
Raymond Gauthier
8d2e4761c8 xfce.thunar-dropbox-plugin: init at 0.2.1
A thunar dropbox plugin that allows to copy links and
add files to dropbox.

Depends on new `xfce.thunarx-2-dev` plugin sdk package instead of
thunar. Doing so seem standard on other distributions such as
Ubuntu and narrows depedencies to only the sdk headers (i.e.:
what's needed by plugins).

Note that replacing the `xfce.thunarx-2-dev` dependency directly
by `xfce.thunar` work equally well. However it now would be
impossible for the `thunar` executable to depend on the plugin.

Tests:

 -  When dropbox daemon active, functionalities are added
    to right click on file and folders menu.
 -  When dropbox daemon inactive, functionalities **not** added
    to menu.
 -  Successfully copied a dropbox link.
 -  Successfully moved a file to dropbox.
2015-09-23 19:19:31 +02:00
Raymond Gauthier
e9f2dc8830 thunar: plugin improvements (close #9908)
Improve thunar/thunarx so that thunar's plugin directory
could be overriden using a `THUNARX_MODULE_DIR`
environment variable so that plugins not built along
with the `thunar` package could be installed as well.

This could allow one to wrap `thunar` in a `thunar-with-plugins`
package where plugins are declared instead of being found (a
bit in the same fashion as gstreamer plugins).
2015-09-23 18:57:50 +02:00
Eelco Dolstra
01f19f54e0 Merge remote-tracking branch 'origin/master' into systemd-219
Conflicts:
	pkgs/os-specific/linux/systemd/fixes.patch
	pkgs/os-specific/linux/upower/0.99.nix
	pkgs/top-level/all-packages.nix
2015-09-21 12:57:30 +02:00
Vladimír Čunát
8e393dde0f xfce.exo: maintenance update 0.10.6 -> 0.10.7 2015-09-20 17:41:07 +02:00
Eelco Dolstra
cc4e33e17c More libgudev dependencies 2015-09-15 12:14:21 +02:00
Domen Kožar
dc3316268e Merge branch 'master' into staging 2015-06-01 11:00:51 +02:00
Domen Kožar
289e8716b2 xfce4-power-manager: 1.4.3 -> 1.4.4 2015-05-31 12:15:24 +02:00
William A. Kennington III
e5bf20a6c6 Merge branch 'master' into staging 2015-05-29 14:52:51 -07:00
William A. Kennington III
b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
Vladimír Čunát
6f67b91db3 xfce: maint. updates of exo, thunar, xfdesktop, xfwm4 2015-05-26 20:47:54 +02:00
Vladimír Čunát
7f30d090b2 xfce: maintenance updates of various core pkgs 2015-04-18 07:11:55 +02:00
Vladimír Čunát
208d1f24db xfce: more update fallout
- forgotten mousepad update, including some wrapping magic
- dealing with panel plugins (either fix or mark as broken)
	CC maintainer @AndersonTorres.
- remove some libxfcegui4 occurrences, as it's being phased out
- minor stuff
2015-03-12 23:02:15 +01:00
Domen Kožar
9567ba4601 xfce: 4.10 -> 4.12 (close #6610) 2015-03-12 23:02:15 +01:00
Luca Bruno
aae9e49cbc Add setup-hook to hicolor_icon_theme 2015-03-09 15:55:24 +01:00
AndersonTorres
5d853f7dca Adding some plugins to XFCE4
Here is a list:
Battery      (1.0.5)
Clipman      (1.2.6)
Cpufreq      (1.0.0)
Cpugraph     (1.0.5)
Datetime     (0.6.2)
Dict         (0.3.0)
Embed        (1.4.1)
Eyes         (4.4.3)
Fsguard      (1.0.1)
Genmon       (3.4.0)
Netload      (1.2.4)
Notes        (1.7.7)
Systemload   (1.1.2)
Verve        (1.0.0)
Xkb          (0.5.6)
2015-01-17 21:53:23 -02:00
Vladimír Čunát
3c050d00a5 upower: use newer version by default
Tested on KDE4, fixed with xfce, and was used with GNOME before.
CC @lethalman.

I did not test e19, as it won't build, probably due to #5392 @shlevy.
CC maintainer @matejc.

Also removed a forgotten unused patch.
2014-12-27 22:46:46 +01:00
Vladimír Čunát
ca80e416dd xfce4-session: support newer upower by an Arch patch
Tested.
2014-12-27 22:46:46 +01:00
Vladimír Čunát
600534513c xfce4-task-manager: update (features and bugfixes) 2014-12-25 11:30:04 +01:00
Domen Kožar
abae51655d xfdesktop: 4.10.2 -> 4.10.3 2014-12-09 11:29:16 +01:00
Domen Kožar
4e611fb21a xfce4.xfce4-power-manager: 1.3.0 -> 1.3.2 2014-12-09 11:29:15 +01:00
Nikolay Amiantov
aeaa96f7e4 xfce4-volumed: add package (close #4628) 2014-11-08 21:48:51 +01:00
Mateusz Kowalczyk
cd2cd41c96 ristretto: wrap icon theme 2014-11-03 20:02:41 +00:00
Nikolay Amiantov
d771822d5f xfce4-mixer: add pulseaudio support 2014-10-23 16:22:43 +04:00
Nikolay Amiantov
333ccae68f xfce: add config into scope 2014-10-23 16:15:55 +04:00
Vladimír Čunát
c9de1ea49e xfce4-panel: synchronize gst plugins with xfce4-mixer 2014-10-23 14:08:33 +02:00
Vladimír Čunát
72ad248606 xfce4-panel: fix the mixer applet (fixes #4563) 2014-10-23 13:44:05 +02:00
AndersonTorres
5c6170a848 XFCE battery plugin: new package
Closes #4386
2014-10-05 17:18:37 +01:00
宋文武
8f1623b38b xfce4-mixer: use wrapper to set GST_PLUGIN_SYSTEM_PATH 2014-08-19 09:57:30 +08:00
Vladimír Čunát
ace3d4685d xfce4-appfinder: update 4.9.4 -> 4.10.1
(cherry picked from commit 8aa892489e)
2014-07-31 16:30:04 +02:00
Vladimír Čunát
bc8abb2242 libxfce4util: minor update 4.10.0 -> 4.10.1
(cherry picked from commit 5c72dac548)
2014-07-31 16:30:04 +02:00
Vladimír Čunát
880fb28ecd xfce4-power-manager: update to 1.3.0, supporting upower-0.99
(cherry picked from commit 2027dcc4f9)
2014-07-31 16:30:04 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Vladimír Čunát
7be0fc2e51 xfce4-xkb-plugin: maintenance update 2014-07-07 19:03:48 +02:00
Bjørn Forsman
b802924af1 xfce: fix typo introduced in recent commit (s/gtk/gtk3/)
Fix typo introduced in commit 0b2dd3a12f
(Xfce: Don't depend on GTK+ 3 by default).
2014-04-29 19:13:43 +02:00
Eelco Dolstra
0b2dd3a12f Xfce: Don't depend on GTK+ 3 by default
Given that Xfce is intended as a light-weight desktop environment,
pulling in two versions of GTK+ by default is not ideal.
2014-04-29 14:42:36 +02:00
Eelco Dolstra
2ca913c509 Add some packages to the channel 2014-04-28 18:34:23 +02:00
Vladimír Čunát
3caa572a8e xfce4-task-manager: minor update 1.0.0 -> .1 2014-03-16 17:46:16 +01:00
Vladimír Čunát
607678341d xfce.tumbler: minor update 0.1.29 -> .30 2014-03-16 17:46:16 +01:00
Vladimír Čunát
ab05fa29eb xfce.gigolo: minor update 0.4.1 -> .2
It no longer uses Waf.
2014-03-16 17:46:15 +01:00
Vladimír Čunát
ec0116f99d xfce4-power-manager: put patch into nixpkgs
It's generated by cgit, which adds cgit version to the end,
and I see no way to avoid that silly behavior.
2014-03-15 11:48:49 +01:00
Domen Kožar
a8c77b6084 fix eval 2014-02-28 09:11:50 +01:00
Domen Kožar
e9f3199973 add gstreamer 1.0 setup-hook and use it where appropriate 2014-02-28 02:03:07 +01:00
Vladimír Čunát
c895bb910d xfce4-power-manager: update patch hash (no idea what's changed) 2014-02-22 18:20:44 +01:00
Domen Kožar
15fb296b43 xfce: partially add gtk3 support 2014-02-07 00:30:21 +01:00
Domen Kožar
a5b054e18a xfce4-screenshooter: add platforms.linux 2014-01-24 14:33:40 +01:00
Jaka Hudoklin
78d3180dbe xfce: add xfce screenshooter 2014-01-13 10:55:18 +00:00
Song Wenwu
0596f3074b add parole 0.5.4 2014-01-10 20:51:24 +08:00
Vladimír Čunát
9020582fea xfce4-terminal: bugfix update 0.6.2 -> .3 2013-12-27 08:48:39 +01:00
Vladimír Čunát
b5fba47147 Merge branch master into x-updates
Conflicts (not used, deleted):
	pkgs/desktops/xfce/common.nix
2013-11-23 10:22:26 +01:00
Ricardo M. Correia
fa52e46203 xfce4-session: Don't set $PATH in xflock4 script
This makes Xfce4's "Lock Screen" action button actually work when xscreensaver
is installed and the daemon is running.
2013-11-19 15:38:57 +01:00
Ricardo M. Correia
bc05abe5c3 xfce4-datetime-plugin: Add package
Shows the date and time in the panel, and a calendar appears when you left-click on it.
2013-11-19 15:38:56 +01:00
Ricardo M. Correia
934c461839 xfce4-xkb-plugin: Add package
Allows you to setup and use multiple keyboard layouts.
2013-11-19 15:38:56 +01:00
Vladimír Čunát
c33c2e68e4 xfce4notifyd: minor update, add to the default installation 2013-11-18 21:08:25 +01:00
Vladimír Čunát
4aa1dff1d6 gvfs: major update 1.14.2 -> 1.18.3, unify to one
There were several files defining gvfs, now use one common.
Also delete long-unused forgotten xfce file.
2013-11-17 20:20:13 +01:00
Sergey Mironov
d8b0c942a1 xfce: enable tumbler the thumbnail manager (close #1206) 2013-11-16 16:58:08 +01:00
Sergey Mironov
86038eaa1d xfce: remove icon caches (close #1207)
vcunat deleted another one
2013-11-12 14:40:07 +01:00
Eelco Dolstra
db2a9afb75 Remove obsolete xfceutils attribute 2013-10-30 15:35:09 +01:00
Eelco Dolstra
df548ffc9e Remove unused Xfce files 2013-10-30 15:35:09 +01:00
Sergey Mironov
28bf9caca2 xfce4-power-manager: fix an brightness plugin issue
Close #943.
2013-09-08 10:56:58 +02:00
Domen Kožar
330219d0c4 add thunar-archive-plugin 2013-08-16 13:57:08 +02:00
Eelco Dolstra
91bb940160 mousepad: Don't segfault at startup 2013-08-15 16:37:30 +02:00
Eelco Dolstra
a218b2d3cb xfce: Fix missing icons
Xfce didn't have a default value for its icon theme, so most icons
were missing until the user explicitly selected an icon theme in the
appearance settings.  Example:

  http://hydra.nixos.org/build/5717570/download/1/screen.png

This patch sets the Rodent theme as the default (which used to be the
case on NixOS).

http://lists.freebsd.org/pipermail/freebsd-ports/2012-June/076349.html
http://www.freebsd.org/cgi/query-pr.cgi?pr=168688
2013-08-15 16:15:11 +02:00
Vladimír Čunát
9594a4f6fb xfce: minor updates for several components
Now tumbler doesn't segfault for me
(at least not as soon as it used to).
2013-05-08 13:48:51 +02:00
Vladimír Čunát
80e4a64740 xfce4session: bugfix update, superseding the patches 2013-05-08 13:48:51 +02:00
Vladimír Čunát
16c59ef836 xfce4session: fix a bug causing random crashes
This should work, finally https://bugzilla.xfce.org/show_bug.cgi?id=9709
2013-05-03 11:59:37 +02:00
Vladimír Čunát
a8ab0e53a4 xfce4session: make it systemd-aware
This should solve many issuses, including:
 - show mountable volumes and mount-on-click (in Thunar)
 - fix shutdown actions (and don't ask for password anymore)

It doesn't explicitly depend on anything in x-updates,
but AFAIK noone has tested it against master (yet).
Connected to #441.
2013-04-29 11:45:37 +02:00
Vladimír Čunát
bde20f3e88 Merge branch 'master' into x-updates
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Vladimír Čunát
400515843c xfce4notifyd: bugfix update, check now, minor fixes 2013-04-21 13:08:11 +02:00
Vladimír Čunát
979f2b0110 xfce: ./support/ not needed anymore 2013-04-04 12:02:53 +04:00
Vladimír Čunát
b1eeae8cac Merge branch 'master' into x-updates
Conflicts (easy):
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/pango/default.nix
2013-03-17 11:28:28 +01:00
Vladimír Čunát
feb063cbdc xfce.xfdesktop: regression-fix release 2013-03-10 22:59:45 +01:00
Vladimír Čunát
b8339a1c1d xfce4-power-manager: update this forgotten package 2013-03-09 22:30:42 +01:00
Vladimír Čunát
96a0d0cc6f xfce4-power-manager: update this forgotten package 2013-03-09 22:30:06 +01:00
Vladimír Čunát
feff239bcb xfdesktop: minor update 2013-03-09 18:45:17 +01:00
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