cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
75629 commits 1 branch 0 tags 3.7 GiB
Commit graph

2027 commits

Author SHA1 Message Date
Thomas Tuegel
3e67cf4f01 propagate frameworkintegration dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
a5eafc16e0 propagate bluez-qt dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
a166ec9318 propagate baloo dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
998f234d1a plasma54.plasma-desktop: add missing dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
a3adb749d7 plasma54.plasma-workspace: add missing runtime dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
b9b5b69f11 plasma54.libksysguard: clean up expression 2015-10-30 16:10:37 -05:00
Eelco Dolstra
81f6c62004 Merge remote-tracking branch 'origin/master' into systemd-219 2015-10-30 15:47:37 +01:00
Eelco Dolstra
c232159fee gnome-control-center: Use libgudev 
http://hydra.nixos.org/build/26678553
 2015-10-30 15:46:26 +01:00
Domen Kožar
7477a7cdda kde: add glib include paths to NIX_CFLAGS_COMPILE 
(cherry picked from commit 350ffdcc8434f668f49e06eaf4d5cd685d42965d)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-10-25 20:03:09 +01:00
Domen Kožar
87b4bdfa24 kde4.kde_runtime: depend on glib due to networkmanager 2015-10-25 12:59:11 +01:00
Vladimír Čunát
4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02: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
William A. Kennington III
8a44a36ca4 Merge branch 'master.upstream' into staging.upstream 2015-10-15 10:22:28 -07:00
Javier Aguirre
2f5f8e1076 geary: 0.8.2 -> 0.10.0 
I commented out the line about disabling valadoc, It was failing
with this version.
 2015-10-11 21:22:39 +02:00
Thomas Tuegel
1c6caa802e plasma53.breeze: fix build after kde4.kdelibs update 
The latest kdelibs-4 version does not pull in automoc4 automatically.
 2015-10-06 19:07:27 -05:00
Thomas Tuegel
53ebf46729 plasma54: 5.4.1 -> 5.4.2 2015-10-06 12:19:11 -05:00
Thomas Tuegel
398b01ed2a plasma54: build with KDE Frameworks 5.14 2015-10-05 13:08:25 -05:00
Thomas Tuegel
c398216789 plasma54: take latest versions 2015-10-05 13:08:24 -05:00
Luca Bruno
3c45ef3627 gnome-common: fix derivation name for the patch 2015-10-05 15:17:53 +02:00
Eelco Dolstra
b23038dd80 Merge remote-tracking branch 'origin/master' into systemd-219 2015-10-01 14:17:46 +02:00
Eelco Dolstra
96e1b7eaf9 gnome-settins-daemon: Use libgudev 2015-10-01 14:17:24 +02:00
William A. Kennington III
271972de0a Merge branch 'master.upstream' into staging.upstream 2015-09-29 15:54:33 -07:00
Thomas Tuegel
8e9fca18e3 plasma54: don't override mkDerivation 
Provides a globally unique name (plasmaPackage) instead of using
attribute paths as namespaces and locally overloading the mkDerivation
name.
 2015-09-29 16:58:59 -05:00
Jude Taylor
0b1fd74a8d fix syntax error 2015-09-28 17:33:33 -07:00
Thomas Tuegel
3ae6dabaed plasma54: allow overriding mkDerivation 2015-09-27 15:09:51 -05:00
Thomas Tuegel
2e0589b4ca kde414: build with kdelibs-4.14.12 
Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
 2015-09-27 15:08:12 -05:00
Thomas Tuegel
a482b9be4a plasma54: init at 5.4.1 2015-09-27 15:08:11 -05:00
Luca Bruno
57d41aaed7 libgit2: add 0.21.x version as it's incompatible with the new 0.23 2015-09-27 15:27:57 +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
Luca Bruno
45b1f5858c Merge branch 'gnome' into staging 2015-09-25 10:51:50 +02:00
Luca Bruno
26aea8b1aa gnome3: init 3.18 2015-09-25 10:48:41 +02:00
Vladimír Čunát
57287106be xfce.xfdesktop: maintenance update 2015-09-24 11:17:26 +02:00
Damien Cassou
fd5a4f0a9c Merge pull request #10033 from DamienCassou/update-gpaste-3.16.3.1 
gpaste: 3.16.3 -> 3.16.3.1
 2015-09-24 10:56:51 +02:00
Damien Cassou
5ad29f6b85 gpaste: 3.16.3 -> 3.16.3.1 2015-09-24 10:14:00 +02:00
William A. Kennington III
5cfe893cc4 Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream 
This is a partial commit from staging in an attempt to make merges
smaller.
 2015-09-23 14:35:36 -07: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
Vladimír Čunát
76ef7a93e3 Merge: xlibs and x11 attribute cleanup 
Frequently using multiple *almost* identical attributes is bad.
 2015-09-23 10:42:34 +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
William A. Kennington III
3fcbd5a829 Merge branch 'master.upstream' into staging.upstream 2015-09-20 14:54:53 -07:00
David Kleuker
3ff372b7ac pantheon-terminal: 0.3.0.1 -> 0.3.1.3 2015-09-20 18:24:37 +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
William A. Kennington III
1bc98b2e36 boost: Reduce the number of supported versions 2015-09-17 15:40:32 -07:00
Luca Bruno
67d2344120 gnome-shell: use src.nix 2015-09-17 17:02:55 +02:00
Peter Simons
8836c58dc0 Remove all references to haskell-ng and haskellngPackages from Nixpkgs. 2015-09-15 16:11:58 +02:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg 
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
 2015-09-15 12:54:34 +02:00
Eelco Dolstra
cc4e33e17c More libgudev dependencies 2015-09-15 12:14:21 +02:00
Vladimír Čunát
21e3ff658a x11: replace its usage by xlibsWrapper directly 
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
 2015-09-15 12:08:24 +02:00
Vladimír Čunát
0c74f18e4c xlibs.xlibs: remove 
It was really ugly that `xlibs.xlibs` meant something else than `xlibs`,
especially when using `with xlibs`, such as in wine.
Also, now `xlibs` is the same as `xorg`.
 2015-09-15 11:59:33 +02:00
Luca Bruno
fe25f52cce gcr: disable parallel builds 2015-09-10 12:58:43 +02:00
Damien Cassou
2466652309 Merge pull request #9738 from DamienCassou/update-gpaste-3.16.3 
gpaste: 3.16 → 3.16.3
 2015-09-09 10:26:08 +02:00
Damien Cassou
7ae0166557 gpaste: 3.16 → 3.16.3 2015-09-09 06:37:29 +02:00
Pascal Wittmann
c11dc40d09 Merge pull request #9254 from FRidh/jupyter 
ipython: 3.2 -> 4.0
 2015-09-08 17:43:21 +02:00
Jim Garrison
7a2c69c785 vte (gtk2): apply change-scroll-region.patch (close #9688) 
More info (including upstream fix):
cb07c67478/index.html (L754-L773)
Patch from: https://bug542087.bugzilla-attachments.gnome.org/attachment.cgi?id=176035
 2015-09-07 10:56:16 +02:00
Mathnerd314
5ab139c893 evolution-data-server: Fix crash 2015-09-05 10:16:46 -06:00
Frederik Rietdijk
fb5f7832d9 gnome 3.16 accersiser: change ipythonLight to ipython 2015-08-29 10:57:37 +02:00
Luca Bruno
77354ebacd gcr: 3.14.0 -> 3.16.0, should fix race condition during build 2015-08-28 11:35:29 +02:00
Luca Bruno
52d7550da3 gdm: point to /etc/gdm/custom.conf 2015-08-27 18:11:39 +02:00
Vladimír Čunát
3b1c772d12 gnome-contacts: fix evaluation 2015-08-26 07:57:57 +02:00
Jascha Geerds
66c3dff47c gnome3: Depend on defaultIconTheme instead of hicolor- or adwaita 2015-08-25 14:23:10 +02:00
William A. Kennington III
64cd711f5c Merge branch 'master.upstream' into staging.upstream 2015-08-21 15:17:26 -07:00
Jascha Geerds
2e91746661 gnome-calendar: Depend on gnome3.defaultIconTheme instead of hicolor_icon_theme 2015-08-20 22:08:40 +02:00
William A. Kennington III
2138f789bc Merge branch 'master.upstream' into staging.upstream 2015-08-20 10:32:29 -07:00
Jascha Geerds
304a5e6168 gnome-calendar: Add missing dependency on hicolor_icon_theme (#9369) 2015-08-20 16:01:49 +02:00
William A. Kennington III
901482ad99 Merge branch 'master.upstream' into staging.upstream 2015-08-19 13:54:48 -07:00
Tobias Geerinckx-Rice
848c1a72b2 gnome-control-center: don't add sounds to userEnv 
It's not needed after all.

See discussion at https://github.com/NixOS/nixpkgs/pull/9308.
 2015-08-18 23:14:51 +02:00
William A. Kennington III
2ac70270e8 Merge branch 'master.upstream' into staging.upstream 2015-08-18 11:36:32 -07:00
Tobias Geerinckx-Rice
24dedd0c9b gnome-control-center: depend on sound-theme-freedesktop 
Required for working speaker test sounds in the Sound applet.
 2015-08-18 15:42:47 +02:00
William A. Kennington III
a106080623 Merge branch 'master.upstream' into staging.upstream 2015-08-14 13:22:00 -07:00
Luca Bruno
c4358e0278 gjs: fix readline reference in .la file 2015-08-14 21:08:06 +02:00
Jascha Geerds
1e364f993b gnome-getting-started-docs: init at 3.16.2 2015-08-14 12:56:06 +02:00
Jascha Geerds
a4b8cbd3d0 gnome3.yelp: Add gstreamer plugins and use gapps-hook 
The gstreamer plugins are required by gnome-getting-started-docs
 2015-08-14 12:55:32 +02:00
Jascha Geerds
26db863cda gnome3.devhelp: init at 3.16.1 2015-08-14 11:59:00 +02:00
Jascha Geerds
f11d416666 gnome-nettool: init at 3.8.1 2015-08-14 11:24:31 +02:00
Jascha Geerds
5d48d41e7c gnome3.accerciser: init at 3.14.0 2015-08-13 23:55:07 +02:00
Jascha Geerds
4df408c8be gnome-calendar: init at 3.16.2 2015-08-13 22:27:39 +02:00
William A. Kennington III
952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
Jascha Geerds
a32e85984e gnome-characters: init at 3.16.2 2015-08-13 20:29:15 +02:00
Jascha Geerds
e42786f1ba gnome3: Add gnome-maps to optionalPackages 2015-08-13 17:46:50 +02:00
Jascha Geerds
bbc4f8e141 gnome-devel-docs: init at 3.16.2 2015-08-13 17:30:46 +02:00
Jascha Geerds
5f067a0e61 gnome-logs: init at 3.16.2 2015-08-13 16:58:53 +02:00
Jascha Geerds
014d6583e7 gnome-taquin: init at 3.16.1 2015-08-13 16:22:58 +02:00
Jascha Geerds
3b95ae79cd gnome-weather: init at 3.16.2 2015-08-13 15:57:11 +02:00
Jascha Geerds
0eb925465d gnome3.hitori: init at 3.16.1 2015-08-13 15:13:59 +02:00
Jascha Geerds
b24734ff10 gnome-tetravex: init at 3.16.0 2015-08-13 15:03:10 +02:00
Jascha Geerds
d921092479 gnome-robots: init at 3.16.1 2015-08-13 14:54:01 +02:00
Jascha Geerds
61557fbe5d gnome-nibbles: init at 3.16.1 2015-08-13 14:43:06 +02:00
Jascha Geerds
99f32bad76 gnome-mines: init at 3.16.1 2015-08-13 13:31:53 +02:00
Jascha Geerds
e9d2426d9b gnome-mahjongg: init at 3.16.1 2015-08-13 13:23:39 +02:00
Jascha Geerds
9a6dd2b760 gnome-klotski: init at 3.16.1 2015-08-13 12:54:48 +02:00
Jascha Geerds
ab4d1e3bb3 gnome-chess: init at 3.16.2 2015-08-13 12:47:12 +02:00
Jascha Geerds
106837a449 gnome3.four-in-a-row: init at 3.16.2 2015-08-13 12:38:24 +02:00
Jascha Geerds
7dd58b645a gnome3.five-or-more: init at 3.16.1 2015-08-13 09:45:05 +02:00
Jascha Geerds
1ff4589fd3 gnome3.aisleriot: init at 3.16.2 2015-08-12 23:51:02 +02:00
Jascha Geerds
214c26bfa1 gnome-sudoku: init at 3.16.0 2015-08-12 17:46:23 +02:00
Luca Bruno
43d5ab0926 gnome-maps: fix icons 2015-08-12 17:05:17 +02:00
Jascha Geerds
5343f1fab1 gnome-maps: init at 3.16.2 2015-08-12 15:56:24 +02:00
Luca Bruno
6a56ac18ad polari: init at 3.16.1 2015-08-11 10:49:20 +02:00
Luca Bruno
b9d8c72098 gjs: 1.42 -> 1.43 2015-08-11 10:48:58 +02:00
William A. Kennington III
4624985561 Merge branch 'master.upstream' into staging.upstream 2015-08-07 13:40:39 -07:00
Jascha Geerds
05a653ba58 gnome-tweak-tool: 3.16.0 -> 3.16.2 2015-08-07 13:12:08 +02:00
Jascha Geerds
f1227ca8a2 gnome-yelp: 3.16.0 -> 3.16.1 2015-08-07 13:06:20 +02:00
Luca Bruno
150b23d3f5 cheese: don't depend on libtool 2015-08-06 12:40:14 +02:00
ts468
863fa55cc1 Merge pull request #9102 from ts468/upstream.e19 
E19 update to 1.19.8
 2015-08-06 09:02:17 +02:00
William A. Kennington III
0ecc61b4d7 Merge branch 'master.upstream' into staging.upstream 2015-08-05 16:24:57 -07:00
Tobias Geerinckx-Rice
f12065cba6 gnome-video-effects: add missing gnome3 attr 
Fix evaluation.
 2015-08-05 22:55:10 +02:00
Thomas Strobel
a8776cdc3d e19 update 
efl: 1.14.1 -> 1.15.0
elementary: 1.14.1 -> 1.15.0
emotion: 1.14.0 -> 1.15.0
evas: 1.14.0 -> 1.15.0
enlightenment: 1.19.5 -> 1.19.8
pythonefl: 1.14.0 -> 1.15.0
 2015-08-05 22:33:23 +02:00
Luca Bruno
dc4d5aa29a cheese: init at 3.16.1 2015-08-05 22:17:33 +02:00
Luca Bruno
eda4fd9be7 gnome-video-effects: init at 0.4.1 2015-08-05 22:17:33 +02:00
Luca Bruno
b093790ae2 gnome-desktop: propagate gsettings_desktop_schemas, required by the .pc 2015-08-05 22:17:33 +02:00
William A. Kennington III
a2da9cfcaf Merge branch 'master.upstream' into staging.upstream 2015-08-03 14:27:14 -07:00
Jascha Geerds
c6f5bb5785 gnome-tweak-tool: Add patches to work nicely on NixOS 
- Search for themes and icon in system data dirs
- Don't show multiple entries for a single theme
- Create config dir if it doesn't exist
 2015-08-03 10:14:14 +02:00
Jascha Geerds
da0b6a4fdf gnome3: Add myself as a maintainer 2015-08-02 12:40:10 +02:00
William A. Kennington III
09b4a7cc1b Merge branch 'master.upstream' into staging.upstream 2015-07-31 17:26:20 -07:00
Luca Bruno
adfd0c7830 nautilus: 3.16.1 -> 3.16.2 2015-07-31 13:29:27 +00:00
Luca Bruno
9fdb7edae3 gdm 3.16: share some tests 2015-07-31 13:29:26 +00:00
Eelco Dolstra
55932c1bec Don't statically depend on cacert for certificates 
This reverts commit cd52c04456 and
others.

Managing certificates (including revoking certificates and adding
custom certificates) becomes extremely painful if every package in the
system potentially depends on a different copy of cacert. Also, it
makes updating cacert rather expensive.
 2015-07-31 01:34:58 +02:00
William A. Kennington III
7ebe164ae0 Merge branch 'master.upstream' into staging.upstream 2015-07-30 15:03:10 -07:00
Jascha Geerds
97dd0dae74 gnome3: Set nixos desktop background and screensaver 2015-07-30 17:56:01 +02:00
Luca Bruno
7f65b99998 swell-foop: use wrapGAppsHook 2015-07-30 10:45:04 +00:00
Luca Bruno
ac0daa6dd9 lightsoff: use wrapGAppsHook 2015-07-30 10:45:04 +00:00
Luca Bruno
13d2056cbf iagno: use wrapGAppsHook 2015-07-30 10:45:04 +00:00
Luca Bruno
0743aaf878 libgda: add required openssl dependency, previously implicit 2015-07-30 12:01:37 +02:00
Jascha Geerds
d27b0bc596 gsettings_desktop_schemas: Fix path to background images 
This fixes the "blue screen" desktop background caused by gnome being
unable to find the image.
 2015-07-30 01:03:56 +02:00
William A. Kennington III
aaef42ab8c Merge branch 'master.upstream' into staging.upstream 2015-07-29 10:23:08 -07:00
Luca Bruno
8a8eb54148 gnome3: add default maintainers list 2015-07-29 15:44:55 +00:00
Luca Bruno
b9dd9bb7e6 gnome3: add maintainers list 2015-07-29 15:38:42 +00:00
Luca Bruno
da6193ad4b tali: init at 3.16.1 2015-07-29 15:32:46 +00:00
Luca Bruno
4ce9e12142 quadrapassel: init at 3.16.1 2015-07-29 15:32:44 +00:00
Luca Bruno
d202f0c625 gnome-documents: add getting started pdf 2015-07-29 13:51:09 +00:00
Luca Bruno
11643f47c3 Revert "evolution: add missing openssl dependency" 
This reverts commit 490979c7ce.

This is not the right fix. It's probably a broken .la file.
 2015-07-29 13:36:23 +00:00
Luca Bruno
e897cd502d Revert "gnome3: file-roller: add openssl dependency" 
This reverts commit 64f3fb96d8.

This is not the right fix. It's probably a broken .la file.
 2015-07-29 13:35:57 +00:00
Bjørn Forsman
490979c7ce evolution: add missing openssl dependency 
Fixes recently introduced "ld: cannot find -lcrypto" build error.
 2015-07-29 15:08:23 +02:00
Jascha Geerds
1ce5c96836 gnome3: Add hicolor_icon_theme to core packages 2015-07-29 13:33:26 +02:00
Jascha Geerds
8d51c46f30 gnome3: Add missing hicolor_icon_theme dependency to several packages 2015-07-29 13:33:25 +02:00
Luca Bruno
2e92e7c06a Merge branch 'gwrap' 2015-07-29 11:32:01 +00:00
Luca Bruno
d74c414887 gnome-clocks: use wrapGAppsHook 2015-07-29 11:17:04 +00:00
Luca Bruno
95c2935061 gnome-documents: use wrapGAppsHook 2015-07-29 11:16:55 +00:00
Luca Bruno
7ef2102b67 gnome-music: use wrapGAppsHook 2015-07-29 11:16:45 +00:00
Luca Bruno
0db56d47cc gnome-photos: use wrapGAppsHook 2015-07-29 11:16:33 +00:00
Luca Bruno
ed3c294e75 grilo: add setup hook for grilo plugins 2015-07-29 11:16:06 +00:00
Tobias Geerinckx-Rice
64f3fb96d8 gnome3: file-roller: add openssl dependency 
Build fails otherwise with `ld: cannot find -lcrypto`.
 2015-07-28 23:19:26 +02:00
Vladimír Čunát
7c36b4611d gnome3.adwaita-icon-theme: remove empty dir tree 
Also similar for old gnome2 icon theme.
/cc maintainer @lethalman.
 2015-07-28 17:05:07 +02:00
William A. Kennington III
6b55ca513d Merge branch 'master.upstream' into staging.upstream 2015-07-27 16:11:03 -07:00
Tobias Geerinckx-Rice
8129a404f4 gnome3: override libsoup with gnomeSupport = true 
Fix Gnome 3 packages broken by fc1077c.
 2015-07-27 17:36:14 +02:00
William A. Kennington III
bd5f2c9638 Merge branch 'master.upstream' into staging.upstream 2015-07-27 08:17:19 -07:00
Eelco Dolstra
d24a5a49ea kde-workspace: Disable gpsd dependency 
This dependency causes substantial system bloat: gpsd depends on
pythonFull, which in turn depends on tcl/tk, etc.
 2015-07-26 22:46:24 +02:00
Vladimír Čunát
b875ea5d29 Merge branch 'master' into staging 2015-07-26 17:57:46 +02:00