Commit Graph

2185 Commits

Author SHA1 Message Date
Thomas Tuegel
c10bb5179f plasma55.plasma-workspace: update patches
The startkde patch was invalidated in the plasma-workspace-5.5.1
release. Quilt is now used to manage these large patches; it is much
simpler to use than Git.
2015-12-16 15:46:38 -06:00
Thomas Tuegel
cc058eff70 kde5_latest: merge all package sets
The three KDE package sets now have circular dependencies between them,
so they can only be built if they are merged into a single package set
during evaluation.
2015-12-16 10:22:43 -06:00
Thomas Tuegel
da89338993 plasma55: 5.5.0 -> 5.5.1 2015-12-16 09:48:18 -06:00
Luca Bruno
bbcf127c7c Fix evaluation after merge in multi-outputs 2015-12-14 10:29:29 +01:00
Matej Cotman
0256de74fb Merge pull request #11215 from ArdaXi/efl-without-vlc
e19.efl: remove dependency on VLC
2015-12-13 22:56:14 +01:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Thomas Tuegel
3960ecb933 Merge branch 'plasma-5.5' 2015-12-11 07:21:50 -06:00
Thomas Tuegel
9678f78056 plasma55.breeze-gtk: init at 5.5.0.1
The GTK themes do not depend on GTK at compile time, so they are also
now included in plasma55.breeze at no cost.
2015-12-11 07:08:33 -06:00
lethalman
fbf606aeb9 Merge pull request #11627 from jgillich/gnome-music-requests
gnome-music: add missing requests2 dependency
2015-12-11 10:06:33 +01:00
Jakob Gillich
9104aae0a4 gnome-music: add missing requests2 dependency 2015-12-11 09:04:46 +01:00
Thomas Tuegel
98bd11125f plasma54.kscreen: propagate libkscreen dependency
libkscreen provides a D-Bus service.
2015-12-09 17:18:05 -06:00
Thomas Tuegel
535faa3c32 plasma55.plasma-desktop: reformat 2015-12-09 16:20:10 -06:00
Thomas Tuegel
1a7d7c1c28 plasma55.plasma-workspace: update patches 2015-12-09 16:20:02 -06:00
Thomas Tuegel
2d586b99cc plasma55.kscreen: propagate libkscreen dependency
libkscreen provides a D-Bus service
2015-12-09 16:19:37 -06:00
Thomas Tuegel
3a0a9f73fc plasma55: 5.4.95 -> 5.5.0 2015-12-09 06:30:02 -06:00
Damien Cassou
9f05627d68 gpaste: 3.16.3 → 3.18.2 2015-12-04 20:39:19 +01:00
Luca Bruno
231fa2b5e2 e19.efl: fix build for multiple-outputs 2015-12-04 14:58:23 +01:00
Vladimír Čunát
96fea82e93 e19.efl: fix build with multiple outputs
(What an ugly expression this is!)
2015-12-04 14:07:50 +01:00
Vladimír Čunát
8c8aba5d36 kde-runtime: fix with multiple outputs after 7477a7cd 2015-12-04 12:52:36 +01:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Vladimír Čunát
81b9cc6f54 html-tidy: unify with its drop-in replacement tidy-html5
- the original project has been unmaintained for years
- some dependants needed to be patched due to renamed headers
  https://github.com/htacg/tidy-html5/issues/326#issuecomment-160329114
- separate tidy-html5 package was removed, as since the 5.0.0 version
  it's meant as a successor to both, and library name got back
  from libtidy5.so to libtidy.so
  https://github.com/htacg/tidy-html5/issues/326#issuecomment-160314666

/cc committers to tidy-html5: @edwjto and @zimbatm.
2015-11-29 10:32:02 +01: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
Thomas Tuegel
9ce51a1605 plasma55: init at 5.4.95 2015-11-23 06:39:08 -06:00
Arda Xi
6841d5ded1 e19.efl: remove dependency on VLC 2015-11-22 21:44:12 +01:00
Vladimír Čunát
12384683cb libcroco*: split $dev output
That also fixes build, as $doc is no longer produced (it would be $docdev).
2015-11-20 14:58:11 +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
Luca Bruno
7f7569b24c gnome-maps: mark 3.16 as broken 2015-11-20 11:24:01 +01:00
Vladimír Čunát
3c397e8ec8 taglib: bring back 1.9 to fix kde4.kdemultimedia
/cc #11097.
2015-11-20 10:44:00 +01:00
Vladimír Čunát
1640e4263b kde4: use cmake-2.8 instead of default, /cc #11097
This fixes kgamma breakage after cmake-3.4 update, and prevents future rot.
2015-11-20 10:31:16 +01:00
Vladimír Čunát
a5c168db4e gnome-screenshot: unbreak build by 3.16.0 -> 3.16.2
/cc @lethalman.
Includes a revert of 1f27976e03.
2015-11-18 14:05:18 +01:00
Luca Bruno
1f27976e03 gnome3_16: mark gnome-screenshot as broken 2015-11-18 11:47:30 +01:00
Luca Bruno
43ee914535 cheese: fix build for 3.18 2015-11-17 18:48:25 +01:00
Luca Bruno
bdd1df16a7 gitg: fix 3.18 build 2015-11-17 18:41:08 +01:00
Luca Bruno
fd01f8d1a7 libgit2-glib: 0.0.24 -> 0.23.6 2015-11-17 18:41:08 +01:00
Domen Kožar
b87dad2839 cheese: libgudev 2015-11-14 16:50:23 +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
Thomas Tuegel
358e2f7a95 plasma54: 5.4.2 -> 5.4.3 2015-11-10 19:14:39 -06: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
Domen Kožar
772e950cd7 Merge pull request #10798 from spacefrogg/gencfsm
gnome-encfs-manager: init at 1.8.15
2015-11-07 02:29:05 +01:00
William A. Kennington III
2837a5e091 Merge branch 'master.upstream' into staging.upstream 2015-11-05 10:07:28 -08:00
Vladimír Čunát
0e731ecbd7 gnome-3.18: port missing libgudev dependencies
(cherry picked from commit 311ac81337)
2015-11-05 09:16:31 +01:00
Eelco Dolstra
3e44182487 Merge remote-tracking branch 'origin/systemd-219' into staging 2015-11-04 15:37:28 +01:00
Michael Raitza
e0c5ee37db libgee-1: init at 0.6.8 2015-11-03 19:05:11 +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
Thomas Tuegel
db408a8ceb plasma_stable: plasma-5.3.2 -> plasma-5.4.2 2015-10-31 08:48:54 -05:00
Thomas Tuegel
beaca8e3b7 plasma-workspace: kapplymousetheme moved to plasma-desktop 2015-10-31 08:48:52 -05:00
Thomas Tuegel
0054a12772 kde-gtk-config: follow symlinks 2015-10-31 08:48:52 -05:00
Thomas Tuegel
892b7c451f plasma-nm: path to mobile-broadband-provider-info
Fixes #9389.
2015-10-31 08:48:47 -05:00
William A. Kennington III
dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Thomas Tuegel
007cde764d plasma-desktop: fix logout/shutdown dialogs 2015-10-30 16:10:37 -05:00
Thomas Tuegel
b4af2259e2 plasma-workspace: fix screen locker 2015-10-30 16:10:37 -05:00
Thomas Tuegel
fda04aaaa3 plasma-desktop: don't move files 2015-10-30 16:10:37 -05:00
Thomas Tuegel
79b1b3e00a plasma-desktop: fix more QML import paths 2015-10-30 16:10:37 -05:00
Thomas Tuegel
154a2d8835 plasma-workspace: fix QML import paths for Qt 5.5 2015-10-30 16:10:37 -05:00
Thomas Tuegel
67cfc9c8c9 plasma-desktop: fix QML import paths for Qt 5.5 2015-10-30 16:10:37 -05:00
Thomas Tuegel
0267246f2f kwin: remove obsolete patch 2015-10-30 16:10:37 -05:00
Thomas Tuegel
2b52937afb kwin: depend on qtmultimedia 2015-10-30 16:10:37 -05:00
Thomas Tuegel
5a2c45427b makeQtWrapper: always wrap impurely 2015-10-30 16:10:37 -05:00
Thomas Tuegel
5292e67e50 remove kf515.makeKDEWrapper 2015-10-30 16:10:37 -05:00
Thomas Tuegel
5df5e1f165 plasma54: propagate packages to user profile 2015-10-30 16:10:37 -05:00
Thomas Tuegel
e4873abc26 plasma-workspace: use impure wrappers 2015-10-30 16:10:37 -05:00
Thomas Tuegel
55c5d17e1b plasma-workspace: propagate runtime dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
7500e0d19c plasma-desktop: propagate runtime dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
3af1894557 makeKDEWrapper: separate from extra-cmake-modules 2015-10-30 16:10:37 -05:00
Thomas Tuegel
f416ba4833 libksysguard: follow symlinks 2015-10-30 16:10:37 -05:00
Thomas Tuegel
a6b201fd2c kwin: update patches 2015-10-30 16:10:37 -05:00
Thomas Tuegel
e870e43e96 plasma54.bluedevil: remove baloo dependency 2015-10-30 16:10:37 -05:00
Thomas Tuegel
a543b45630 propagate plasma-workspace dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
a1da594888 propagate libkscreen dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
148b0f06b1 propagate kwin dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
9e3aa58649 propagate sonnet dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
9747a3c764 propagate plasma-framework dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
5abff86df9 propagate kwindowsystem dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
15a9aaa5ab propagate ktexteditor dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
84de582bd5 propagate krunner dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
dcf9735d08 propagated kross dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
308babd8a1 propagate kpeople dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
8b14c58831 propagate kio dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
c017efa466 propagate kidletime dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
ea2f246b61 propagate ki18n dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
644045a894 propagate khtml dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
7534be95be propagate kglobalaccel dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
57bbea240f propagate kfilemetadata dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
5ef3477a3e propagate kemoticons dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
f4ca03fea0 propagate kdelibs4support dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
c21da82680 propagate kdeclarative dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
d013d746b6 propagate kauth dependencies 2015-10-30 16:10:37 -05:00
Thomas Tuegel
cf1c908377 propagate kactivities dependencies 2015-10-30 16:10:37 -05:00
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
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
Tuomas Tynkkynen
58dfef2792 treewide: Fix references to apacheHttpd_2_* 2015-10-28 10:23:03 +01:00
Vladimír Čunát
311ac81337 gnome-3.18: port missing libgudev dependencies 2015-10-28 10:23:02 +01:00
Tuomas Tynkkynen
4bd5f08bd3 gnome-control-center: Add libgudev
Probably needed after the systemd update.
2015-10-28 10:23:01 +01:00
Tuomas Tynkkynen
db81e22148 treewide: Mass-replace 'xorgserver}/bin' with correct output
vcunat added one fix in xdummy.
2015-10-28 10:17:12 +01:00
Domen Kožar
7477a7cdda kde: add glib include paths to NIX_CFLAGS_COMPILE
(cherry picked from commit 350ffdcc84)
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
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
Vladimír Čunát
afc01cde32 readline-6.3 (the default): split dev and doc outputs 2015-10-13 20:19:02 +02:00
Vladimír Čunát
783c40eb68 dbus: split into multiple outputs and fix referrers 2015-10-13 20:19:01 +02:00
Vladimír Čunát
cba6641623 cairo, pango: fix some string references 2015-10-13 20:18:51 +02:00
Vladimír Čunát
a6e4c87391 gtk3: split into multiple outputs
All references OK, hopefully. Seems surprisingly smooth.
2015-10-13 20:18:45 +02:00
Vladimír Čunát
91407a8bdf ncurses: split into multiple outputs
Some programs (e.g. tput) might better be moved somewhere else than
$dev/bin, but that can be improved later if need be.
2015-10-13 20:18:44 +02:00
Vladimír Čunát
ba9b80c7e0 nspr,nss: split into multiple outputs
Hopefully most references are OK.
2015-10-13 20:18:44 +02: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
Vladimír Čunát
68530a4fb7 dbus-glib: split into multiple outputs
Fixed all 'dbus_glib}' references too.
2015-10-05 10:51:22 +02:00
Vladimír Čunát
c817263b0c plasma53.breeze: fix missing automoc4
I don't know why/when it started missing.
2015-10-04 17:34:29 +02:00
Vladimír Čunát
a0581b1e74 kde-gtk-config-*: fix with multiple outputs 2015-10-04 14:54:57 +02:00
Vladimír Čunát
33373d939a Merge: staging with systemd 2015-10-02 10:24:41 +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