Commit graph

1580 commits

Author SHA1 Message Date
Vladimír Čunát
a9bad25ffe Merge branch 'master' into staging 2014-11-24 22:14:25 +01:00
aszlig
764f428ede
libgnomecups: Add CUPS >= 1.6 compatibility patch.
Patch is from Gentoo at:

http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-1.6.patch

Fixes the following Hydra build failure:

http://hydra.cryp.to/build/250133/nixlog/5/raw

Thanks to @peti for the notification.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-23 18:20:09 +01:00
Thomas Tuegel
dfaa39db41 polkit-qt-1: Qt 5 support
polkit-qt-1 is upgraded to the latest version, which supports Qt 5. The
attributes are also renamed to differentiate the Qt 4 and Qt 5
branches. The prior naming scheme differentiated between polkit-qt-1 and
polkit-qt, but we no longer package the latter.
2014-11-20 11:10:39 -06:00
Mateusz Kowalczyk
d3568f277c e17.terminology: update from 0.5.1 to 0.7.0 2014-11-17 18:11:03 +00:00
Mateusz Kowalczyk
9b14ab9f6a e17.eina: update from 1.7.5 to 1.7.10 2014-11-17 18:10:49 +00:00
Luca Bruno
0a34445d74 Document the fact that GNOME 3.12 must use clutter 1.18 2014-11-17 15:15:19 +01:00
Luca Bruno
24ad1612b4 Revert "clutter: update 1.18 -> 1.20. Shouldn't break anything"
This reverts commit 5e14c86b80.

Overlooked an experimental API that breaks mutter in GNOME 3.12.
2014-11-17 15:10:56 +01:00
Luca Bruno
5e14c86b80 clutter: update 1.18 -> 1.20. Shouldn't break anything 2014-11-17 15:05:50 +01:00
Luca Bruno
e8adc8b5ec Drop GNOME 3.10 2014-11-14 22:46:37 +01:00
Eelco Dolstra
f33fa1b66b Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Pascal Wittmann
8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Luca Bruno
6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Nikolay Amiantov
aeaa96f7e4 xfce4-volumed: add package (close #4628) 2014-11-08 21:48:51 +01:00
Vladimír Čunát
52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Mateusz Kowalczyk
cd2cd41c96 ristretto: wrap icon theme 2014-11-03 20:02:41 +00:00
Peter Simons
a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
cillianderoiste
919ed14477 Merge pull request #4627 from abbradar/xfce-mixer
xfce4-mixer: add pulseaudio support
2014-10-31 15:08:42 +01:00
Peter Simons
b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
koral
d95bb47970 termite: fixed shebangs 2014-10-31 08:31:45 +01:00
koral
f53ba30c87 Upgraded termite to v8, and its dependency vte to v0.38.0 2014-10-29 12:32:29 +01:00
Luca Bruno
34f681dcf8 Revert "vte: update pkg and patch"
This reverts commit 383075e009.
2014-10-28 21:46:56 +01:00
Luca Bruno
9fd1807279 Revert "vte: fix chroot build"
This reverts commit c17427597e.
2014-10-28 21:46:48 +01:00
Domen Kožar
ca1d7dea55 fix scrollkeeper build 2014-10-28 11:36:44 +01:00
lethalman
db376cac59 Merge pull request #4695 from DamienCassou/gnome-pomodoro-0.10.3
New version of gnome-shell-pomodoro
2014-10-28 09:53:39 +01:00
wmertens
114a775254 Merge pull request #4544 from k0ral/webkitgtk
webkitgtk: 2.4.6 -> 2.6.1
2014-10-28 09:36:02 +01:00
Damien Cassou
672b913487 New version of gnome-shell-pomodoro 2014-10-26 14:07:26 +01:00
Aristid Breitkreuz
c17427597e vte: fix chroot build 2014-10-25 16:45:00 +02:00
Arseniy Seroka
383075e009 vte: update pkg and patch 2014-10-25 16:45:00 +02:00
Aristid Breitkreuz
42aa2e25ec gvfs: lightWeight -> !gnomeSupport 2014-10-25 16:17:39 +02:00
Eelco Dolstra
f4be4f5e54 Merge remote-tracking branch 'origin/master' into staging 2014-10-24 12:24:13 +02:00
Vladimír Čunát
2cf17b0802 Merge recent master into staging
Hydra nixpkgs: ?compare=1156478
2014-10-23 17:40:41 +02:00
Nikolay Amiantov
d771822d5f xfce4-mixer: add pulseaudio support 2014-10-23 16:22:43 +04:00
Nikolay Amiantov
333ccae68f xfce: add config into scope 2014-10-23 16:15:55 +04:00
Vladimír Čunát
c9de1ea49e xfce4-panel: synchronize gst plugins with xfce4-mixer 2014-10-23 14:08:33 +02:00
Vladimír Čunát
72ad248606 xfce4-panel: fix the mixer applet (fixes #4563) 2014-10-23 13:44:05 +02:00
Shea Levy
8d67b707c7 libgit2-glib: Buidl broke with libgit2 + libssh2 2014-10-22 19:19:57 -04:00
Domen Kožar
efea92de19 fixes #1933 2014-10-23 00:14:09 +02:00
Thomas Strobel
46596d6354 Upgrade: Enlightenment E19: 0.19.0 -> 0.19.1 2014-10-19 14:58:04 +02:00
koral
f24f7010b7 webkitgtk: 2.4.6 -> 2.6.1 2014-10-19 11:45:20 +02:00
Eelco Dolstra
09dc132e04 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
Damien Cassou
9166e29645 Update gnome pomodoro using fetchFromGitHub 2014-10-13 11:02:56 +02:00
Damien Cassou
73b428afc8 gnome-pomodoro: use fetchgit to be more stable 2014-10-13 10:56:59 +02:00
Pascal Wittmann
b168a8c118 Merge pull request #4457 from DamienCassou/gpaste-3.12.3.1
gpaste 3.12.3 -> 3.12.3.1
2014-10-10 15:39:55 +02:00
Damien Cassou
45ad3e09fd gpaste 3.12.3 -> 3.12.3.1 2014-10-10 12:55:56 +02:00
Georges Dubus
a172b4b1f8 Merge pull request #4436 from madjar/kde414
Switch to kde 4.14 and remove 4.12
2014-10-09 17:42:19 +02:00
Georges Dubus
0295a6c483 Removed kde 4.12 2014-10-09 12:05:56 +02:00
Oliver Hunt
6f64a7cf43 Added granite
Added meta details, changed hash to sha256, and added versions for granite

Changed name to use versions

Fixed license

Yet another typo fix

Added myself as maintainer and fixed typo

Fixed maintainers

Added pantheon terminal

woops
2014-10-09 01:55:27 +02:00
Eelco Dolstra
a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
AndersonTorres
5c6170a848 XFCE battery plugin: new package
Closes #4386
2014-10-05 17:18:37 +01:00
wmertens
6320c4a980 kde-workspace: Use automatic version (close #4383)
See https://github.com/NixOS/nixpkgs/pull/4265#discussion_r18430068

This should work but I didn't test it 😁
2014-10-05 17:05:40 +02:00