Commit graph

1908 commits

Author SHA1 Message Date
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