Commit graph

2427 commits

Author SHA1 Message Date
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Thomas Tuegel
04ad2ebfb2 Merge branch 'kde-propagate' 2016-06-09 12:40:04 -05:00
Thomas Tuegel
98bb89b9d0 kde5.extra-cmake-modules: propagate build inputs correctly 2016-06-09 09:14:20 -05:00
Joachim Fasting
687fff86c1 Merge pull request #16087 from romildo/upd.enlightenment
enlightenment: 0.20.8 -> 0.20.9
2016-06-09 14:01:56 +02: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
José Romildo Malaquias
3b28b5673b enlightenment: 0.20.8 -> 0.20.9 2016-06-09 08:05:14 -03:00
Thomas Tuegel
8dae2eddcf kde5.kdeplasma-addons: add missing ksysguard dependency 2016-06-08 14:58:35 -05:00
Thomas Tuegel
b214c6b64f kde5.plasma-desktop: add missing ksysguard dependency 2016-06-08 13:51:25 -05:00
Thomas Tuegel
bcd6e295d7 kde5.plasma-workspace: add iso-codes dependency
Fixes #16040. CMake finds the iso-codes dependency through pkgconfig.
2016-06-08 10:26:24 -05:00
Luca Bruno
217feced47 gnome3_20.totem: fix build on i686
See https://bugzilla.gnome.org/show_bug.cgi?id=767374
2016-06-07 21:22:27 +02:00
Nikolay Amiantov
66077b9a36 gpaste: fix evaluation 2016-06-07 17:23:19 +03:00
Thomas Tuegel
dc7d5231d6 Merge branch 'plasma-5' 2016-06-07 08:47:19 -05:00
Thomas Tuegel
43a7d90e97 Revert "Revert "kde5.frameworks: 5.21 -> 5.22""
This reverts commit 9769952933.
2016-06-07 06:21:09 -05:00
Thomas Tuegel
80b1cf6633 kde5.plasma-integration: init at 5.6.4 2016-06-06 16:08:33 -05:00
Damien Cassou
da62589d8e gnome3_20: Add GNOME 3.20 package set 2016-06-06 20:33:58 +02:00
Thomas Tuegel
9769952933 Revert "kde5.frameworks: 5.21 -> 5.22"
This reverts commit 112d4c71b2.

This upgrade causes a serious Plasma performance degradation and causes
incorrect font rendering. Reverting until the cause is known.
2016-06-05 14:56:27 -05:00
Vladimír Čunát
a03ff26080 Merge #15639: xorg-server 1.17.4 -> 1.18.3
... and fglrxCompat to maintain compatibility.
2016-06-05 00:52:06 +02:00
Thomas Tuegel
ddaebefb12 Revert "extra-cmake-modules: don't change the RPATH settings"
This reverts commit 94fcfc9c41.
2016-06-01 08:14:51 -05:00
Joachim Fasting
5134bfab0c Merge pull request #15872 from romildo/fix.mate
mate-themes and mate-icon-theme: move to pkgs/desktops/mate/
2016-06-01 02:49:26 +02:00
José Romildo Malaquias
f67c878241 mate-icon-theme: move to pkgs/desktops/mate/ 2016-05-31 15:08:51 -03:00
José Romildo Malaquias
e428c0346f mate-themes: move to pkgs/desktops/mate/ 2016-05-31 15:06:43 -03:00
Thomas Tuegel
94fcfc9c41 extra-cmake-modules: don't change the RPATH settings
We don't need KDE upstream messing up our RPATH.
2016-05-31 13:02:15 -05:00
Joachim Fasting
228331cc7d Merge pull request #15837 from romildo/new.mate-icon-theme-faenza
mate-icon-theme-faenza: init at 1.14.1
2016-05-31 15:41:31 +02:00
Tobias Geerinckx-Rice
b1dda910a3
gnome3.libcroco: 0.6.8 -> 0.6.11 2016-05-31 15:17:04 +02:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
José Romildo Malaquias
f5dff2cd14 mate-icon-theme-faenza: init at 1.14.1 2016-05-30 15:32:47 -03:00
José Romildo Malaquias
5c221d0b00 mate-common: init at 1.14.1 2016-05-30 15:32:36 -03:00
José Romildo Malaquias
69cbaebf27 elementary: 1.17.0 -> 1.17.1 2016-05-28 09:54:32 -03:00
José Romildo Malaquias
91a23ebcc6 efl: 1.17.0 -> 1.17.1 2016-05-28 09:54:23 -03:00
Vladimír Čunát
e4832c7541 Merge branch 'staging'
Includes a security update of libxml2.
2016-05-27 15:58:40 +02:00
Luca Bruno
ef8ea38fe8 gdm: fix build with systemd 230 2016-05-27 11:18:16 +02:00
obadz
1fb49e8089 Revert "gdm: apply substition to cope with systemd 229 -> 230 upgrade"
This reverts commit 745c379f1b.

@lethalman will commit a better solution
2016-05-27 10:17:11 +01:00
obadz
745c379f1b gdm: apply substition to cope with systemd 229 -> 230 upgrade
Inspired from eee5bf72c9
2016-05-27 10:13:14 +01:00
Damien Cassou
6ef9dec981 gpaste: 3.18.3 -> 3.18.4 2016-05-25 18:09:25 +02:00
Vladimír Čunát
69cc0a7bc5 xf86-input-evdev: split dev output 2016-05-23 13:02:55 +02:00
Vladimír Čunát
c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Bjørn Forsman
ca717d0d65 gnome-terminal: enable GNOME Shell search provider (for 3.18)
[This is a re-application of the patch that was originally written for
GNOME 3.16. It was lost during the transition to GNOME 3.18.]

Silly ./configure, it looks for dbus file from gnome-shell in the
installation tree of the package it is configuring. Fix by copying the
needed file from gnome-shell before ./configure is run.

This change makes gnome-shell a build time dependency (not runtime).
2016-05-19 13:59:16 +02:00
Tuomas Tynkkynen
1819181726 treewide: Make explicit that 'dev' output of xorgserver is used 2016-05-19 10:04:41 +02:00
Tuomas Tynkkynen
f7a0b0b9bc treewide: Make explicit that 'dev' output of libdrm is used 2016-05-19 10:00:39 +02:00
Tuomas Tynkkynen
e363b019cf treewide: Make explicit that 'dev' output of gnome3.libsoup is used 2016-05-19 10:00:37 +02:00
Tuomas Tynkkynen
ec8af05e1f treewide: Make explicit that 'dev' output of gnome3.glib is used 2016-05-19 10:00:36 +02:00
Tuomas Tynkkynen
f81af4e6f0 treewide: Make explicit that 'dev' output of glib is used 2016-05-19 10:00:35 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Michael Alan Dorman
7c1106d595 gitg: 3.18.0 -> 3.20.0 2016-05-18 08:19:52 -04:00
Michael Alan Dorman
bfe9fded9c libgit2-glib: 0.23.6 -> 0.24.0 2016-05-18 08:19:48 -04:00
Joachim Fasting
f3f16643a8 Merge pull request #15522 from romildo/upd.enlightenment
enlightenment: 0.20.7 -> 0.20.8
2016-05-18 03:21:30 +02:00
José Romildo Malaquias
f3dc37840d enlightenment: 0.20.7 -> 0.20.8 2016-05-17 11:27:30 -03:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Thomas Tuegel
f7ec37f3e8 Merge branch 'pr-15453' 2016-05-15 18:19:57 -05:00
Thomas Tuegel
112d4c71b2 kde5.frameworks: 5.21 -> 5.22 2016-05-15 18:19:12 -05:00