JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,049 Commits 2 Branches 0 Tags 12 GiB
665b2c8247
Commit Graph

1464 Commits

Author SHA1 Message Date
Domen Kožar
3e2f390260 Merge pull request #1322 from zimbatm/no-ruby18 
WIP: Request to remove ruby 1.8 from the tree
 2014-03-07 13:41:05 +01:00
Domen Kožar
9fc9fcde6c gnome3.gitg, gnome3.empathy: fix icons 2014-02-28 10:17: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
Domen Kožar
b192f9ee13 gnome3 apps: correctly render icons 2014-02-28 01:40:21 +01:00
Luca Bruno
53fbbe3262 gnome3: Setup hook for gdk-pixbuf and gnome-icon-theme 
Add necessary paths to the environment so that
applications can find icons.
 2014-02-28 01:40:21 +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
Vladimír Čunát
0f4942ecbc gnome3.libgee: downgrade to latest stable, add meta 
Tests started to fail, and stable is preferred anyway.
Cf. #1770 discussion.
 2014-02-22 17:13:40 +01:00
Luca Bruno
3991f590f4 empathy: new package 
Messaging program which supports text, voice, video chat,
and file transfers over many different protocols

https://wiki.gnome.org/Apps/Empathy
 2014-02-21 11:47:19 +01:00
Luca Bruno
d50909f56b folks: new package 2014-02-21 11:47:19 +01:00
Luca Bruno
dfa357c3e4 yelp: save loaders.cache in yelp-specific directory 2014-02-21 09:52:32 +01:00
Luca Bruno
226be5a247 evolution-data-server: install gschemas in share/evolution-data-server 2014-02-21 09:52:32 +01:00
Luca Bruno
4232f21de3 evolution-data-server: Generate vala bindings 2014-02-21 09:52:31 +01:00
Domen Kožar
189273af38 add gnome3.vino 2014-02-19 16:38:41 +01:00
Domen Kožar
66a353c9b9 Merge pull request #1786 from lethalman/icons 
gnome-icon-theme-symbolic and yelp update
 2014-02-19 15:19:56 +01:00
Luca Bruno
df2661953e yelp: Show icons in the application 2014-02-19 14:29:07 +01:00
Luca Bruno
6aef8266f0 gnome-icon-theme-symbolic: new package 2014-02-19 14:25:27 +01:00
Domen Kožar
e2bc091213 Merge pull request #1777 from lethalman/gitglib 
libgit2-glib: Fix build after gnome3.gnome_common changes
 2014-02-18 14:36:30 +01:00
Luca Bruno
5181cbd7c6 libgit2-glib: Fix build after gnome3.gnome_common changes 2014-02-18 13:23:32 +01:00
Mathijs Kwik
68d8f67c04 e17/terminology: upgrade to 0.4.0 2014-02-18 09:44:50 +01:00
Domen Kožar
810eff6087 Merge pull request #1769 from lethalman/epiphany 
Epiphany: new package
 2014-02-18 09:10:30 +01:00
Domen Kožar
0d56579b81 Merge pull request #1770 from lethalman/libgee 
libgee: Update to 0.13.90 and enable checks
 2014-02-18 09:10:06 +01:00
Evgeny Egorochkin
952fa02b90 KDE 4.12: add branch meta 2014-02-18 03:18:02 +02:00
Evgeny Egorochkin
586188fa7d KDE 4.11: add branch meta 2014-02-18 03:10:25 +02:00
Evgeny Egorochkin
5174a69400 KDE 4.10: add branch info 2014-02-18 02:59:13 +02:00
Luca Bruno
8b4003c102 libgee: Update to 0.13.90 and enable checks 2014-02-18 00:38:18 +01:00
Luca Bruno
92f9949e09 epiphany: new package 
WebKit based web browser for GNOME

https://wiki.gnome.org/Apps/Epiphany
 2014-02-18 00:13:14 +01:00
Luca Bruno
e1801a83f0 gnome-common: Propagate autoconf and automake build inputs 2014-02-18 00:09:53 +01:00
Luca Bruno
9d34103a57 gucharmap: new package 
GNOME Character Map, based on the Unicode Character Database

https://wiki.gnome.org/Apps/Gucharmap
 2014-02-17 12:51:30 +01:00
Luca Bruno
d8dd998ff0 gnome3: Add missing yelp_tools in gnome-3/default.nix 2014-02-17 12:51:30 +01:00
Domen Kožar
72cf0e2280 gnome3.yelp-tools: add 2014-02-17 12:32:59 +01:00
Domen Kožar
e80b520a9d gnome3.gnome_common: patch ACLOCAL like for gnome2 2014-02-16 23:45:47 +01:00
Domen Kožar
4fe88d295c Merge pull request #1760 from lethalman/gnome-common 
gnome3.gnome-common: new package
 2014-02-16 22:30:25 +01:00
Luca Bruno
1c18c001b9 gnome3.gnome-common: new package 2014-02-16 22:28:21 +01:00
Domen Kožar
7f2a372a37 Merge pull request #1757 from lethalman/yelp 
Yelp and yelp-xsl
 2014-02-16 12:05:00 +01:00
Luca Bruno
da36d7d220 yelp: new package 
Yelp is the help viewer in Gnome.

https://wiki.gnome.org/Apps/Yelp
 2014-02-16 11:43:35 +01:00
Luca Bruno
923681d576 yelp-xsl: new package 
Yelp's universal stylesheets for Mallard and DocBook.

https://wiki.gnome.org/Apps/Yelp
 2014-02-16 11:43:16 +01:00
Domen Kožar
3f3a3ec24c Merge pull request #1755 from lethalman/baobab 
baobab: new package
 2014-02-15 22:32:31 +01:00
Luca Bruno
402c1d582e baobab: new package 
Graphical application to analyse disk usage in any Gnome environment.

https://wiki.gnome.org/Apps/Baobab
 2014-02-15 22:21:06 +01:00
William A. Kennington III
bdb842d5eb Move all db4 packages to the default db5 2014-02-15 12:03:02 +01:00
Evgeny Egorochkin
432a698e8d KDE-4.12: package 4.12.2 2014-02-13 04:26:42 +02:00
Domen Kožar
61f20ca45e libqmi: 1.0 -> 1.8.0, move outside gnome3 namespace, fix build 2014-02-08 20:17:00 +01:00
Domen Kožar
5ffab7710d gnome3.gnome_control_center: build and fix runtime deps 2014-02-08 12:30:23 +01:00
Vladimír Čunát
9665c85f99 kde410.kde_workspace: fix CVE-2013-4132 by upstream patch 2014-02-08 11:52:56 +01:00
Domen Kožar
506a030b91 gnome3: add missing files 2014-02-07 00:37:17 +01:00
Domen Kožar
65a28e8b73 Add gnome3 desktop manager. Very experimental. 
Currently very basic gnome-shell launches on my laptop. Quite some
services won't start yet, most notable is gnome-control-center.

GTK3 apps still don't have theming applied and for example launching
chromium results in horrible red windows.
 2014-02-07 00:31:29 +01:00
Domen Kožar
c5c14c72f4 gnome3.gnome-settings-daemon: add missing input 2014-02-07 00:31:10 +01:00
Domen Kožar
1142be6301 gnome3.gnome_terminal: add missing runtime dependencies 2014-02-07 00:30:21 +01:00
Domen Kožar
2d166153ec gnome3.gnome-shell: add GDK_PIXBUG_MODULE that has svg and png loaders 2014-02-07 00:30:21 +01:00
Domen Kožar
c9decf12e3 gnome3.gnome-keyring: add missing runtime dependency 2014-02-07 00:30:21 +01:00
Domen Kožar
15fb296b43 xfce: partially add gtk3 support 2014-02-07 00:30:21 +01:00
Vladimír Čunát
d39d5cbc16 gnome2.vte: fix CVE-2012-2738 (just DOS) 2014-02-05 20:25:21 +01:00
Evgeny Egorochkin
a598b62474 KDE-4.11: update to 4.11.5 2014-02-04 21:58:25 +02:00
Vladimír Čunát
449cfcfa91 gnome3: re-introduce libsoup dependency (fix many evals) 2014-02-01 10:10:45 +01:00
Benno Fünfstück
13d11227f1 Remove left-over reference to libsoup_2_44 2014-01-30 19:02:29 +01:00
Domen Kožar
f1f0b3a205 Add gnome3.gnome_shell 2014-01-26 09:55:52 +01:00
Domen Kožar
553963eb0c gnome3: always use libcanberra_gtk3 2014-01-26 00:21:43 +01:00
Domen Kožar
96777994c8 gnome3.gnome_settings_daemon: depend on ibus 2014-01-26 00:21:19 +01:00
Domen Kožar
8b3c8926eb gnome3.gnome_session: use systemd 2014-01-26 00:20:49 +01:00
Domen Kožar
832f050679 gnome3: fix some packages to use mirror url 2014-01-26 00:20:22 +01:00
Domen Kožar
12f8e30138 gnome-keyring: use gtk3 2014-01-26 00:19:49 +01:00
Domen Kožar
3c6d52c3da gjs: add pango support 2014-01-26 00:19:23 +01:00
Domen Kožar
7546695dbb gdm: add gobject introspection support 2014-01-26 00:19:06 +01:00
Domen Kožar
369c6a06bf gcr: add gobject introspection support 2014-01-26 00:18:44 +01:00
Domen Kožar
ec4502ff1b gnome3.gconf: use gtk3, not gtk2 2014-01-26 00:18:22 +01:00
Domen Kožar
00eaf038ac gnome3.at_spi2_core: add gobject introspection support 2014-01-26 00:17:49 +01:00
Domen Kožar
a5b054e18a xfce4-screenshooter: add platforms.linux 2014-01-24 14:33:40 +01:00
Domen Kožar
357a789366 gnome3: remove librsvg with gtk2 2014-01-21 14:11:20 +01:00
Domen Kožar
12b6786c65 gnome3.mutter: add optional deps 2014-01-21 14:11:20 +01:00
Domen Kožar
b4acb42a2c gnome3.libgdata: remove unneeded dep 2014-01-21 14:11:20 +01:00
Domen Kožar
b4d1d88e42 enable gobjectintrospection for some libs 2014-01-21 14:11:20 +01:00
Domen Kožar
0c9f4cb22a evolution-data-server: upgrade and move to gnome3 namespace 2014-01-21 14:11:19 +01:00
Domen Kožar
dbfaeaf0df add gnome3.libgdata and liboauth 2014-01-21 14:11:19 +01:00
Vladimír Čunát
ac6761c908 Merge master into stdenv-updates 
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
 2014-01-20 19:39:28 +01:00
Domen Kožar
34270e37a7 Add gnome3.gjs 2014-01-20 12:35:31 +01:00
Domen Kožar
914b6c249b Add gnome3.mutter 2014-01-20 12:35:31 +01:00
Domen Kožar
35e76926a5 Add gnome3.caribou 2014-01-20 12:35:31 +01:00
Domen Kožar
745472d66a Add gnome3.gnome_settings_daemon 2014-01-19 23:15:00 +01:00
Domen Kožar
e3c80f19cf Add gnome3.geocode_glib 2014-01-19 22:09:51 +01:00
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
 2014-01-18 14:46:20 +01:00
Vladimír Čunát
b631cf1327 evince: fix crash with open-file dialog, maintain 
The gtk3 schema dir was missing for that.

I see no icons, as evince is searching for hicolor theme,
and I fear that theme selection is user-configurable :-/
 2014-01-15 21:41:43 +01:00
Jaka Hudoklin
78d3180dbe xfce: add xfce screenshooter 2014-01-13 10:55:18 +00:00
Vladimír Čunát
a2c316288c Merge master into stdenv-updates 
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
 2014-01-12 12:29:24 +01:00
Rob Vermaas
01291d331c Gnome3: add gdm 3.10.0.1 2014-01-11 23:42:40 +01:00
Rob Vermaas
db7a05e3ad Gnome1: add gobjectIntrospection to rest 2014-01-11 23:10:27 +01:00
Domen Kožar
ae02a0c411 Merge pull request #1403 from iyzsong/gstreamer 
add gstreamer 1.2.1
 2014-01-11 12:37:47 -08:00
Domen Kožar
ef94c2171c Add gnome3.gnome_session 2014-01-11 17:29:06 +01:00
Domen Kožar
215931f5d0 gnome3.gnome_desktop: 3.11 -> 3.10 (use gnome3 stable) 2014-01-11 15:40:28 +01:00
Rob Vermaas
1bf54ce52c Gnome3: added libzapojit 2014-01-11 14:19:41 +01:00
Rob Vermaas
59626be3de Gnome3: add gnome-online-accounts. 2014-01-11 14:14:39 +01:00
Rob Vermaas
3a8aa93821 Gnome3: add rest-0.7.90 2014-01-11 13:21:01 +01:00
Rob Vermaas
0657498c6f Gnome3: add libqmi-1.0 2014-01-11 12:36:02 +01:00
Domen Kožar
4ade852707 gnome3.eog: downgrade to stable gnome major version 2014-01-11 12:25:40 +01:00
Rob Vermaas
98d36be7d8 Gnome3 core: add libgxps. 2014-01-11 12:23:27 +01:00
Domen Kožar
4dfcdb0f3c evince: downgrade to stable gnome, add icons, fix runtime error 2014-01-11 12:18:25 +01:00
Domen Kožar
153b4ccf71 Add gitg: Gnome GUI for git 2014-01-10 16:46:52 +01:00
Song Wenwu
0596f3074b add parole 0.5.4 2014-01-10 20:51:24 +08:00
Domen Kožar
9de85d7a42 remove gnome3.scrollkeeper (obsolete) 2014-01-10 01:45:37 +01:00
Domen Kožar
c3f148b3a8 gnome3.gnome-dictionary: 3.5.2 -> 3.10.0 2014-01-10 01:45:37 +01:00
Domen Kožar
401dcc6715 Add gnome3.dconf 2014-01-10 01:45:36 +01:00
Domen Kožar
c41f1ae7d4 gnome3.libgweather: 3.6.2 -> 3.10.1 2014-01-10 01:45:36 +01:00
Domen Kožar
84b9a03290 gnome3.gnome-terminal: 3.4.1.1 -> 3.10.2 2014-01-10 01:45:36 +01:00
Domen Kožar
54084b9a36 gnome3.gnome_keyring: 3.6.3 -> 3.10.1 2014-01-10 01:45:36 +01:00
Domen Kožar
d56b0542e0 gnome3.gcr: 3.6.3 -> 3.10.1 2014-01-10 01:45:35 +01:00
Domen Kožar
3187ee0559 gnome3.gconf: 3.2.5 -> 3.2.6 2014-01-10 01:45:35 +01:00
Domen Kožar
3154c378ad gnome3: build packages on linux platform 2014-01-10 01:45:35 +01:00
Domen Kožar
bc6e2e9c36 remove pointless passthru meta 2014-01-10 01:45:35 +01:00
Domen Kožar
5040ae0ccf fix typo in gnome3.libpeas 2014-01-10 01:45:35 +01:00
Domen Kožar
e8416dbe40 Add gnome3.file-roller 2014-01-10 01:45:34 +01:00
Domen Kožar
d33e5eadd0 Add gnome3.nautilus and remove gnome2.nautilus (didn't compile) 
Some icons are still missing (and theme), didn't find a way to fix that.
 2014-01-10 01:45:34 +01:00
Domen Kožar
527aadf5ee add gnome.eog: GNOME Image Viewer 2014-01-10 01:45:34 +01:00
Domen Kožar
6cada7f0c1 gnome3.evince: 3.6 -> 3.11 2014-01-10 01:45:33 +01:00
Domen Kožar
c210ed0712 gnome3.gnome-icon-theme: 3.6 -> 3.10, add platforms 2014-01-10 01:45:33 +01:00
Domen Kožar
c83b582c7b gnome3.gsettings_desktop_schemas: 3.6 -> 3.10, add gobjectIntrospection 2014-01-10 01:45:33 +01:00
Domen Kožar
00ff5466d3 gnome3.gnome-desktop: 3.5 -> 3.11 2014-01-10 01:45:33 +01:00
Domen Kožar
5f9b57deb0 gnome3.libcroco: add platforms 2014-01-10 01:45:32 +01:00
Domen Kožar
a19c59a63f Add gnome3.gtksourceview 2014-01-10 01:45:32 +01:00
Domen Kožar
9e486d9f3f Add gnome3.libpeas 2014-01-10 01:45:32 +01:00
Domen Kožar
094947ba73 gnome_themes_standard: bump to 3.10.0 and move into gnome3 attrset 2014-01-10 01:45:32 +01:00
Vladimír Čunát
72478f1c8e gnome2.libgnomeprint: fix build by using bison2 2014-01-05 11:03:30 +01:00
Shea Levy
4af1c79c06 Remove uses of __overrides feature 
In addition to replacing use of a feature with IMO confusing semantics,
this will also let us cleanly separate out all-packages.nix into
category-specific files without changing the structure of the pkgs
attrset.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-12-30 11:04:45 -05:00
Vladimír Čunát
a126ce011a gnumeric: add schemas and icons, refactor 
Also move goffice under gnome3,
as it's released in the same way.
 2013-12-28 15:45:20 +01: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
4c5a71f777 Merge master into x-updates 
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
 2013-12-18 23:21:29 +01:00
Nixpkgs Monitor
882ddb2b1d gnome3.gnome_keyring: update from 3.6.2 to 3.6.3 2013-12-18 18:18:29 +02:00
Nixpkgs Monitor
68e201b41c gnome.libgnomeprintui: update from 2.18.4 to 2.18.6 2013-12-18 18:18:29 +02:00
Nixpkgs Monitor
3b3e7e8f25 gnome.gvfs: update from 1.14.1 to 1.14.2 2013-12-11 09:47:45 +02:00
Vladimír Čunát
e215435378 cinnamon-session: minor tweaks and make schemas available 2013-12-10 22:46:34 +01:00
Vladimír Čunát
fac74b7aa9 Merge #1344: add cinnamon-session 2013-12-10 22:13:38 +01:00
Vladimír Čunát
6ca6ad8794 gnome3.at_spi2_core on darwin: attempt to fix the build 2013-12-10 21:52:50 +01:00
Vladimír Čunát
089da3ee5c Merge master into x-updates 
Conflicts (simple):
	pkgs/top-level/all-packages.nix
 2013-12-10 13:00:02 +01:00
Roelof Wobben
4f8e940c40 changed gnome-desktop 2013-12-09 10:38:59 +01:00
Roelof Wobben
f144a3b963 changed gnome-desktop 2013-12-09 10:37:07 +01:00
Roelof Wobben
23bacdf6ea added cinnamon-session.nix 2013-12-08 21:40:52 +01:00
Evgeny Egorochkin
c5005bfe11 KDE-4.10: Kopete: fix build against giflib5 2013-12-08 12:04:02 +02:00
Roelof Wobben
11b337fc76 added cinnamon-session 2013-12-07 20:00:54 +01:00
Vladimír Čunát
b36ed39f2e cinnamon: various fixes 
cinnamon-translations: use $out/share instead of $out/usr/share,
add version into name

all-packages.nix: refactor
 2013-12-07 14:27:21 +01:00
Vladimír Čunát
6690c97569 Merge branch 'master' into x-updates 
Conflicts (just different styles, same semantics):
	pkgs/development/libraries/libusb1/default.nix
 2013-12-07 14:17:16 +01:00
Vladimír Čunát
50493458bd gnome3.gnome-menus: fix file path, add maintainer 
Also some whitespace nitpicks.
 2013-12-07 14:04:50 +01:00
Michael Raskin
cf4b259770 Merge pull request #1339 from roelof1967/gnome-menus 
new package : gnome-menus 3.x
 2013-12-07 01:12:51 -08:00
Roelof Wobben
7f62dd42f3 give gnome-menus a better place 2013-12-07 10:09:25 +01:00
Michael Raskin
2afb58a8d5 Merge pull request #1316 from roelof1967/cinnamon-translations 
new pakage:  Cinnamon translations
 2013-12-07 00:13:24 -08:00
Roelof Wobben
3c1fb82718 added gnome-menus-3 2013-12-05 09:14:25 +01:00
Evgeny Egorochkin
41f0e6ad92 KDE-4.11: update to 4.11.4 2013-12-04 16:57:36 +02:00
Evgeny Egorochkin
389bdaec02 KDE411.Akonadi: update to 1.11.0 2013-12-04 16:55:08 +02:00
zimbatm
06c780077f Removes the ruby18 dependency to klinkstatus 2013-12-03 11:42:12 +00:00
Vladimír Čunát
3a5f9ecd70 cinnamon.cjs refactor: include version in name 2013-12-02 22:01:24 +01:00
Vladimír Čunát
d09b722f77 Merge master into x-updates 2013-12-02 21:41:16 +01:00
Roelof Wobben
81460560c3 add cinnamon-desktop (close #1314) 
Reviewed and refactored by @vcunat.
 2013-12-02 21:21:45 +01:00
Roelof Wobben
28d24ea4eb cinnamon-transalations working 2013-12-02 13:25:38 +01:00
Roelof Wobben
f3536a0dcb broken translation files 2013-12-02 09:24:08 +01:00
Tomasz Kontusz
f4d4e12ca6 Remove caches from liferea, evince and network-manager-applet 2013-12-01 20:26:31 +01:00
Roelof Wobben
808603852a cjs is working with the new mozjs185 2013-11-30 22:46:39 +01:00
Roelof Wobben
f668fd37df broken patch 2013-11-30 22:46:39 +01:00
Roelof Wobben
43b894a5b3 solved the gobject error message 2013-11-30 22:46:39 +01:00
Roelof Wobben
34df0b45ba GJS error 2013-11-30 22:46:38 +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
0bec9c1e4f libcroco: minor update 0.6.6 -> .8 2013-11-18 20:30:21 +01:00
Vladimír Čunát
747e757500 libunique: fix build, make the package unique 
The one in gnome2 was failing to build,
but all there is likely in a desolate state anyway.

In gmpc it also seemed without any reason to have a duplicate.
 2013-11-17 22:26:49 +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
Vladimír Čunát
90e63ea5dd gnome3.at_spi2_*: bugfix update 2.10.0 -> .2 2013-11-17 14:31:03 +01:00
Vladimír Čunát
68430cf3d7 Merge branch master into x-updates 
Conflicts (trivial, minor update on master, major here):
	pkgs/development/libraries/mesa/default.nix
 2013-11-16 20:32:44 +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
Vladimír Čunát
f448cc022b changes proposed for 'release-13.10' into x-updates 
Conflicts (simple, taking whole higher/later versions):
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/polkit/default.nix
 2013-11-05 08:38:15 +01:00
Marc Weber
4a96c8cf6a gnome-autogen.sh: make check_m4macros aware of ACLOCAL_PATH 2013-11-01 10:32:24 +01:00
Mathijs Kwik
f4903d890e Merge branch 'master' into x-updates 2013-11-01 08:35:16 +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
Evgeny Egorochkin
fd05af8bc0 KDE4.11: update to 4.11.2. Add missing xslt file. 2013-10-07 22:32:47 +03:00
Eelco Dolstra
9faba5f073 Remove KDE 4.8 
4.10 has been the default for a while.
 2013-10-07 17:12:50 +02:00
Eelco Dolstra
9db68de9e6 polkit, pulseaudio: Drop some Linux-specific dependencies 2013-10-06 00:21:28 +02:00
Vladimír Čunát
cb8fff57c1 update gtk deps, on GNOME-3.10 branches now 2013-10-05 21:25:53 +02:00
Eelco Dolstra
fca11ef500 Fix evaluation errors 2013-10-01 13:12:45 +02:00
James Cook
bae1462276 Disable introspection for gcr. 
gcr stopped building after 7fbcc562 (adding introspection into GTK
libs); this gets it to build again.
 2013-09-26 18:55:27 -07:00
Peter Simons
75c5fc541d pkgs/desktops/gnome-2/desktop/libgweather: remove dubious assertion 
Fix assertion failure from http://hydra.nixos.org/build/5985506/nixlog/1/raw
for some suitable definition of "fixing". Let's see what happens now.
 2013-09-15 21:36:18 +02:00
Jason \"Don\" O'Conal
2a73189a9c deluge: fix build on darwin (close #930) 2013-09-14 15:26:48 +02:00
Jason \"Don\" O'Conal
9767a725cc djvulibre: fix build on darwin (close #931) 2013-09-14 15:21:35 +02:00
Vladimír Čunát
c1ed13dad0 Merge branch 'master' into x-updates 2013-09-08 12:04:20 +02:00
Sergey Mironov
28bf9caca2 xfce4-power-manager: fix an brightness plugin issue 
Close #943.
 2013-09-08 10:56:58 +02:00
Vladimír Čunát
2fda1165da Merge branch 'master' into x-updates 2013-08-28 10:37:41 +02:00
Matej Cotman
93c4fd2855 vte: patch for alt key (close #858) 
Edit (vcunat): bump to latest version supporting gtk2.
 2013-08-25 19:08:59 +02:00
Evgeny Egorochkin
952aa0e719 KDE: we don't really support anything but Linux right now, so no reason to have all those evaluation 
errors.
 2013-08-25 01:07:46 +03:00
Vladimír Čunát
c1e62e7e91 Merge branch 'master' into x-updates 2013-08-22 19:29:09 +02:00
Evgeny Egorochkin
b25bcf853f package KDE 4.11 2013-08-21 20:41:07 +03:00
Joachim Schiele
99fe2013ae Merge pull request #797 from qknight/smokegen-patch-fix 
fixed patch rejection and added RPATH magic
 2013-08-21 00:51:31 -07:00
Joachim Schiele
13df65b89b Merge pull request #798 from qknight/perlqt-patch-fixes 
Perlqt patch fixes
 2013-08-21 00:51:06 -07:00
Joachim Schiele
a8a7c78f89 Merge pull request #799 from qknight/qtruby-patch-fixes 
qtruby patch fixes
 2013-08-21 00:50:53 -07:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Domen Kožar
330219d0c4 add thunar-archive-plugin 2013-08-16 13:57:08 +02:00
Joachim Schiele
7b5a92c49d fixed patch rejection and added RPATH magic 2013-08-15 16:25:02 +00: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
Joachim Schiele
bb9263edbf removed all patches from perlqt 2013-08-14 17:41:24 +00:00
Joachim Schiele
9109cc6e4f removed one patch which seems to be upstream now 2013-08-14 17:41:06 +00:00
Vladimír Čunát
72a8019334 introspection disabling -- clutter-gtk, NM-applet, gnome_panel 
Didn't build as it was, and not needed anywhere AFAIK.
 2013-08-06 09:27:34 +02:00
Vladimír Čunát
7fbcc56260 add introspection into GTK libs (part of #517) 
This is all work of Marc Weber <marco-oweber@gmx.de>, except for a few nitpicks.

Tested space blowup: IMHO negligible to headers and similar stuff,
e.g. the firefox closure (reported by du) grows from 560 to 579 MB.
Saving space should be handled separately,
e.g. we have the multiple-outputs branch.
 2013-08-04 21:11:24 +02:00
Vladimír Čunát
d374527509 GTK-related minor updates 2013-08-03 09:45:22 +02:00
Joachim Schiele
d7dc9cd0d2 fixed a patch which was rejected, i wonder why it was still there... 2013-07-31 18:15:53 +00:00
Eelco Dolstra
70d6623586 Fix a name collision between two distinct KDE wallpaper packages 2013-07-30 16:52:11 +02:00
Karn Kallio
57ce3126d7 kde-base-artwork: fix hash. 2013-07-17 20:16:24 +02:00
Eelco Dolstra
66021f9cd8 Fix kdenetwork 2013-07-17 15:01:50 +02:00
Eelco Dolstra
dfd621745a Remove KDE 4.10.4 2013-07-17 15:01:50 +02:00
Eelco Dolstra
8e8c3d665c Remove KDE 4.7 
It's obsolete.
 2013-07-16 22:54:04 +02:00
Evgeny Egorochkin
da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Evgeny Egorochkin
fb07ba725b libgnomeprintui: fix version to match tarball 2013-07-14 02:08:50 +03:00
Evgeny Egorochkin
f95ece9acd KDE 4.10: bump to 4.10.5 2013-07-12 16:36:12 +03:00
Vladimír Čunát
6f5e5cfe06 kde4: unify used libcanberra 
I wondered why I'm getting two versions in the closure of KDE apps.
 2013-07-05 14:45:44 +02:00
Joachim Schiele
f064ee612f Merge pull request #709 from qknight/kdenetwork-kopete-fixes 
fixes two issues via patches to get knetwork compiling; both patches are minimal and mine is now also upstream
 2013-07-05 04:38:34 -07:00
Peter Simons
400d4a03b0 Update references to 'rLang' to the new name 'R'. 2013-07-04 23:41:22 +02:00
Joachim Schiele
d8f8d052c5 fixes two issues via patches to get knetwork compiling 
kopete-4.10.4-kopete-linphonemediaengine.patch
----------------------------------------------
patch copied from here:
  https://bugs.kde.org/show_bug.cgi?id=318825

kopete-4.10.4-kopete-stun.patch
-------------------------------
  when compiling kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/channelmanager.cc
  it would produce this error:

  kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stunrequest.h:91:9: error: ‘StunMessageType’ does not name a type

  problem:
    this is cased by a cyclic use of stun.h, stunrequest.h and channelmanager.cc with the outcome,
    that kdenetwork couldn't be compiled since kopete fails to build.

  solution:
    move the StunMessageType enum into its own #ifndef
 2013-07-03 16:35:03 +02:00
Jason "Don" O'Conal
a42133a102 gnome.GConf: fix build on darwin 
* disable polkit
* add --enable-static to configureFlags
 2013-07-04 00:21:46 +10:00
Jason "Don" O'Conal
6307798b45 gnome.ORBit2: fix build on darwin 
* add libintlOrEmpty to build inputs
 2013-07-03 22:03:47 +10:00
Mathijs Kwik
bf61d25dac kde 4.10: option to use a libcanberra with gtk support 
by default (as it was before), kde depends on a libcanberra with its
gtk dependency removed so a kde system can be gtk-free.

However, both firefox and chromium depend on gtk+ and libcanberra too.
So this leads to 2 versions being installed. this option combats that
by letting the kde use the other libcanberra
 2013-06-27 21:35:22 +02:00
Domen Kozar
35431a7d7b libgnomeprint: build on linux 2013-06-18 22:50:15 +02:00
Vladimír Čunát
3d1491c166 kde410.kdepimlibs: add pkgconfig 
Accidentally noticed the request in logs.
 2013-06-13 13:02:24 +02:00
Vladimír Čunát
7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates 
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
 2013-06-08 15:41:39 +00:00
Evgeny Egorochkin
d2807428eb KDE 4.10: update to 4.10.4 2013-06-05 19:41:28 +03:00
Vladimír Čunát
b770365574 ReRevert Merge x-updates into master 
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
 2013-05-29 23:25:02 +02:00
Evgeny Egorochkin
64661b0a2b KDE4.10: kde-runtime: fix build against openEXR 2013-05-25 12:01:28 +03:00
Evgeny Egorochkin
6b9c2218c6 KDE 4.10: kdelibs, kdepim: remove todo notices, fix compilation against openEXR. 2013-05-25 12:01:27 +03:00
Evgeny Egorochkin
e15a244a74 KDE 4.10: Akonadi: update to 1.9.2 2013-05-25 12:01:27 +03:00
Mathijs Kwik
b6b9366b7b kde 4.10.3: fix hashes 2013-05-20 18:44:57 +02:00
Evgeny Egorochkin
079a6ad338 KDE 4.10: bugfix release 4.10.3 2013-05-19 19:32:53 +03:00
Mathijs Kwik
0c15d386cb it seems kde 4.10 does not yet use udisks2 
With udisks1, I do see my usb/cardreader drives.
With udisks2, I don't.

So this probably needs to be configured at build-time.
As udisks1 does work, I don't care all that much.
 2013-05-17 09:28:38 +02:00
Evgeny Egorochkin
a6b9035142 KDE 4.10 kdelibs: indicate that kdelibs has udisks2 support. 2013-05-11 21:22:33 +03:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +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
1278859d31 Merge branch 'master' into x-updates 
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
 2013-05-08 13:46:46 +02:00
Evgeny Egorochkin
b7bc27cfff KDE 4.10: propagate nepomuk_core along with kdepimlibs. 2013-05-07 17:23:46 +03:00
Evgeny Egorochkin
0256e55934 Fix KDE 4.8 and 4.7 build against new SIP 2013-05-06 22:15:07 +03:00
Evgeny Egorochkin
f8ee077afc KDE4.10 dolphin-plugins-*: fix the build. 
Patch contributed by Karn Kallio.
 2013-05-06 22:15:07 +03:00
Evgeny Egorochkin
b2f6770208 KDE4.10 kioslave-{svn,perldoc}: Fix build. 
Patch contributed by Karn Kallio.
 2013-05-06 22:15:07 +03:00
Evgeny Egorochkin
6e406edf0a KDE4.10: Kate: Add experimental python support. 2013-05-06 22:15:06 +03:00
Evgeny Egorochkin
ee4a7cbbf4 KDE4.10 print-manager: Fix build. 
Patch contributed by Karn Kallio.
 2013-05-06 22:15:06 +03:00
Evgeny Egorochkin
a1924fca12 KDE4.10: Fix PyKDE4 build I accidentally left in a broken state. Remove notice from kajongg because it 
compiles fine now.
 2013-05-06 22:15:06 +03:00
Evgeny Egorochkin
9f0d9a3b01 KDE 4.10: kdesdk-thumbnailers: Patch the build system to fix build failure. 
Patch contributed by Karn Kallio.
 2013-05-06 22:15:05 +03:00
Evgeny Egorochkin
a2359c02cd KRDC: it builds now, so remove the notice 2013-05-06 22:15:05 +03:00
Evgeny Egorochkin
ccbea23039 KStars: forgot to remove the notice that it doesn't build. 2013-05-06 22:15:05 +03: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
Evgeny Egorochkin
e83c2fa4a0 Add KDE 4.10.2. Not ready for production yet, but does compile. 2013-04-21 05:46:18 +03:00
Vladimír Čunát
e8823c9e5e Merge pull request #441 from ierton/udisks2-xfce 
udisks2 for xfce
 2013-04-20 01:37:14 -07:00
Vladimír Čunát
60ff4d0c7a python_rsvg: couldn't find gtk, fixed now 2013-04-18 10:04:56 +02:00
Vladimír Čunát
ca3e6d30f1 gnome3.at_spi2_core: supply path to system-wide dbus-daemon 2013-04-18 09:54:33 +02:00
Vladimír Čunát
469d098083 gnome2.libgnome: fix for new glib (my own patch) 2013-04-17 19:01:28 +02:00
Vladimír Čunát
6bd036d5f9 non-linux attempts to fix: libbonobo and libjpeg 2013-04-14 14:06:10 +02:00
Vladimír Čunát
f4f8857284 gnome_vfs: fix build by disabling fatality of deprecations 2013-04-13 23:59:24 +02:00
Vladimír Čunát
8249695b61 Merge branch 'master' into x-updates 
Needed that to fix the tarball.
 2013-04-11 23:31:33 +02:00
Marc Weber
88a8330d44 make ORBit2 build again by disabling deprecation warnings for linc2, the commit introducing it didn't show any strong reason 2013-04-08 14:50:10 +02:00
Mathijs Kwik
a288311c0b add terminology: e17 terminal emulator 2013-04-04 22:18:08 +02:00
Mathijs Kwik
07c50d5124 e17/ethumb: support video thumbnails and exif 2013-04-04 22:18:07 +02:00
Mathijs Kwik
6dcddbf3b5 e17/ethumb: add optional dependency on e_dbus 
ethumb_client depends on it, but will fail (skip on installation)
silently when not found
 2013-04-04 22:18:07 +02:00
Mathijs Kwik
d0b30155a5 e17/emotion: enable vlc video backend 
we should probably make this configurable, but for now enabling (and
testing) at least 1 backend is better than none, as emotion without
backends won't anything at all
 2013-04-04 22:18:07 +02:00
Mathijs Kwik
5431663e12 e17/e_dbus: make sure depending packages can find (propagated) dbus 2013-04-04 22:18:07 +02:00
Vladimír Čunát
979f2b0110 xfce: ./support/ not needed anymore 2013-04-04 12:02:53 +04:00
Vladimír Čunát
8406a62973 gtk3: core platform update (versions from GNOME 3.8) 2013-03-29 02:22:29 +01: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
8db4152ddf A more complete fix of cyrus-sasl update (broken KDEs). 
This amends commit af656c6698.
 2013-03-13 21:06:37 +01:00
Sander van der Burg
af656c6698 kdepimlibs break against newer cyrus-sasl. Including this extra header fixes it 2013-03-13 10:44:12 +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
Shea Levy
1670244f80 Merge branch 'vlada/xfce-notg' of git://github.com/vcunat/nixpkgs 
This branch refactors xfce and updates it to 4.10. I had been hoping to
find someone besides Vlada to test this (I don't use xfce), but no one
has come forward yet in 2 weeks so if this breaks something they can
make an issue or fix it. It all looks good by inspection.
 2013-03-08 17:03:22 -05:00
Vladimír Čunát
90825913f2 kde48.okteta: disable parallel build 
It often failed on hydra.
 2013-02-28 09:54:22 +01:00
Peter Simons
5f32207dfc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
Vladimír Čunát
fb81c8e455 kde48.kdebase_workspace: disable parallel build 
There were frequent problems with this on Hydra.
 2013-02-24 09:44:10 +01:00
Vladimír Čunát
e817e8fcdb gnome3: factor out doCompileSchemas 2013-02-21 21:58:09 +01:00
Vladimír Čunát
787b150089 gnome2.libart_lgpl: update 2013-02-21 21:51:09 +01:00
Vladimír Čunát
dbe8a69a36 libcroco: move to gnome-3, minor update 2013-02-21 21:29:05 +01:00
Vladimír Čunát
4e5fe00a1f gnome3.libgweather: update 2013-02-21 21:26:19 +01:00
Vladimír Čunát
dd4a846b0f update evince, seems to work now 2013-02-21 21:19:50 +01:00
Vladimír Čunát
bf4313cd88 update gsettings-desktop-schemas and make system-wide 
Conflicts:
	pkgs/data/misc/gsettings-desktop-schemas/default.nix
	pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
 2013-02-21 20:42:39 +01:00
Vladimír Čunát
51a413ac1c gnome3: add gnome-icon-theme 2013-02-21 20:38:47 +01:00
Vladimír Čunát
b8a44440e4 gnome3: port and update (lib)gnome-keyring 2013-02-21 20:36:20 +01:00
Vladimír Čunát
38a0bc8cdf add gnome3.gcr; ToDo: tests would fail if enabled 2013-02-21 20:31:24 +01:00
Vladimír Čunát
99b95f9e75 gnome3: fix more nativeBuildInputs 2013-02-21 20:21:00 +01:00
Vladimír Čunát
52461be8c5 port gvfs from gnome2 2013-02-21 20:18:12 +01:00
Vladimír Čunát
99bc034a04 gnome3.gconf: migrate 2013-02-21 20:09:10 +01:00
Vladimír Čunát
4b3e2531c9 update at-spi 2013-02-21 19:54:55 +01:00
Vladimír Čunát
713b420be8 removed some libraries that are up-to-date on the top level 2013-02-21 18:15:37 +01:00
Vladimír Čunát
90fcea2a25 Merge branch 'x-updates' into vlada/gnome3-notg 2013-02-21 18:12:15 +01:00
Vladimír Čunát
0d72174dbd Merge branch stdenv-updates into x-updates 
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
 2013-02-21 12:43:00 +01: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
Lluís Batlle i Rossell
bcbf9472ea Merge remote-tracking branch 'central/master' into x-updates 2013-02-18 13:49:11 +01:00
Shea Levy
c42d77aa35 Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-02-17 08:19:40 -05:00
Shea Levy
8d35dabd65 e17.embryo: Fix meta. 
Meta attributes, if they are lists, must be lists of strings.
 2013-02-16 16:38:46 -05:00
Eelco Dolstra
2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00