Commit Graph

200 Commits

Author SHA1 Message Date
Shea Levy
c42d77aa35 Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-02-17 08:19:40 -05:00
Vladimír Čunát
aaf607c5dc linphone: minor update and fix 2013-02-16 21:48:47 +01:00
Eelco Dolstra
5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
aszlig
29aa4af796
tkabber: Add ${tk}/bin to wrapper's PATH.
Pesky little impurity is now fixed, as it has bitten me several times in the
last days.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-01-14 11:34:03 +01:00
Lluís Batlle i Rossell
b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
2012-12-28 23:28:16 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Piotr Pietraszkiewicz
45937caa2f Bumped kadu to v0.12.2 and its dependency libgadu to v1.11.2 2012-12-17 20:44:59 +01:00
Florian Friesdorf
a551d61083 skype 4.1.0.20 2012-12-06 15:40:55 +01:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Alexander Tsamutali
0dc8926b06 applications/networking/instant-messengers/mcabber:
Updated to 0.10.1.
2012-11-23 22:36:02 +03:00
Eelco Dolstra
5d6860ec5b skype: Update to 4.0.0.8
Also, use $out/libexec/skype rather than $out/opt/skype.
2012-11-08 16:31:08 +01:00
Michael Raskin
52d68190db Update Pidgin 2012-10-29 14:27:31 +04:00
Rickard Nilsson
ae573d8501 skype: Fix syntax error in .desktop-file 2012-10-19 09:53:06 +02:00
Michael Raskin
640a13c04c Update Psi 2012-10-17 22:59:41 +04:00
Eelco Dolstra
87399d57d6 Doh! Forgot to add file 2012-10-15 14:02:15 -04:00
Eelco Dolstra
b377586b7a Fix psi build
hydra.nixos.org/build/3154247
2012-10-15 10:52:53 -04:00
Michael Raskin
4517d03af1 Opportunistic measures to prevent the need to convert null to string; they may work or may not work for actually building 2012-09-24 23:49:11 +04:00
Michael Raskin
732811700a Added BareSIP 2012-09-24 21:03:02 +04:00
Michael Raskin
37418b3f70 Add farstream support to gajim 2012-09-23 21:39:26 +04:00
Michael Raskin
e12c0dbace LaTeX + Spelling work 2012-09-13 19:25:04 +04:00
Michael Raskin
5df4c97694 Fix wrapping 2012-09-13 19:25:04 +04:00
Michael Raskin
c20a9e4ac5 Make Gajim find speller 2012-09-13 19:25:04 +04:00
Michael Raskin
8b7d12d0f5 Gajim: make OpenSSL code work 2012-09-13 18:03:50 +04:00
Michael Raskin
947741de5f Gajim: update to 0.15.1 2012-09-13 18:03:50 +04:00
Michael Raskin
009db2ae7a Fix license 2012-09-13 15:30:12 +04:00
Michael Raskin
2dec65340b Fix python path 2012-09-13 14:46:45 +04:00
Michael Raskin
917db3212f Add PyFeed dependency. Starts now 2012-09-13 14:32:38 +04:00
Michael Raskin
070f2419dd Fixed a few SaT dependencies 2012-09-13 14:24:07 +04:00
Michael Raskin
b52919ac9e Buildable Salut-à-toi 2012-09-13 14:14:49 +04:00
aszlig
36947c8957
tkabber: Honor OPENSSL_X509_CERT_FILE.
This gets rid of the dependency on cacert and ensures that Tkabber will read
OPENSSL_X509_CERT_FILE whenever the sslcacertstore is not set by the user in
Tkabber's options.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-09 07:00:00 +02:00
aszlig
c544eb4c71
tkabber: Set the correct path to tkabber-plugins.
This should now point to the path for the tkabber plugins package, which will be
used as soon as the tkabber-plugins derivation is available as a symlink in the
user's environment.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-09 07:00:00 +02:00
aszlig
e18227378a
tkabber-plugins: Add missing meta attributes.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-09 07:00:00 +02:00
aszlig
bf72d46084
tkabber: Add missing meta.license.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-09 06:59:59 +02:00
aszlig
5b59bb4d28
tkabber-plugins: Remove dependency on tkabber.
The tkabber plugins really do not require a dependency on tkabber itself, so
let's drop it. In addition, this also removes creating a $out/bin dir, which was
left back then when creating the tkabber-plugins derivation by copy & pasting
stuff from the main tkabber derivation.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-09 06:59:59 +02:00
aszlig
5d15972278
tkabber: Clean up TCLLIBPATH generation.
This should make things a lot more DRY as we now can generalize library paths by
using the libPrefix attribute of each library. In addition this also cuts the
line length in wrapProgram.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-09 06:59:59 +02:00
aszlig
d058ae5b0b
tkabber: Add tclgpg to TCLLIBPATH.
This ensures that Tkabber can now be used with GPG support, though as of gnupg
version 2, this requires gpg-agent as well. Only if all conditions are met, an
option to actually use GPG will show up in Tkabber's settings.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-09 06:59:59 +02:00
aszlig
28a725fcbe
bwidget/tcllib/tcltls: Add libPrefix attributes.
This is what I forgot in the packages I have added a few months ago, so it's
time to revisit them and improve things, like for example set the right
libPrefix in order to stay consistent with other TCL libraries.

In addition this fixes some whitespace ugliness in the affected packages.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-09 06:59:58 +02:00
Michael Raskin
6be27d8c4e Vacuum-IM: update to 1.2.0 2012-08-09 08:59:38 +04:00
aszlig
b06fb762b4 Add tkabber plugins v0.11.1. 2012-06-22 14:47:34 -04:00
aszlig
74b408e151 Add tkabber v0.11.1. 2012-06-22 14:47:34 -04:00
Lluís Batlle i Rossell
19be0c1f27 Updating skype from 2.2 to 4.0
svn path=/nixpkgs/trunk/; revision=34544
2012-06-18 12:39:44 +00:00
Yury G. Kudryashov
5487fbe94a telepathy-glib-0.18.1 (0.19.x requires glib-2.32.x)
Drop pkg-config patch, pass pkgconfigUpstream to rakia and salut.

svn path=/nixpkgs/trunk/; revision=34495
2012-06-13 07:09:23 +00:00
Yury G. Kudryashov
316222e2e1 Mass telepathy update, add telepathy-haze
svn path=/nixpkgs/trunk/; revision=34494
2012-06-13 07:09:19 +00:00
Yury G. Kudryashov
28aabd6311 kde-telepathy-0.4.0, tweak update script etc.
svn path=/nixpkgs/trunk/; revision=34493
2012-06-13 07:09:15 +00:00
Yury G. Kudryashov
6b6dba1bce kde-telepathy-0.3.1
Drop upstream patches already included in this version

svn path=/nixpkgs/trunk/; revision=34402
2012-06-09 13:09:37 +00:00
Yury G. Kudryashov
5299c1f6fb svn merge ^/nixpkgs/trunk
- 1 conflict (gnome-doc-utils)
- final merge before --reintegrate

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
2012-03-31 20:01:40 +00:00
Yury G. Kudryashov
ce85d430bc Batch update telepathy-related packages
Some of these packages need glib-2.30.x, so I commit it to this branch.

Add sofia-sip and telepathy-rakia.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33475
2012-03-29 16:33:32 +00:00
Yury G. Kudryashov
3c72ac97eb Fix typo
svn path=/nixpkgs/trunk/; revision=33466
2012-03-29 10:17:40 +00:00
Yury G. Kudryashov
a87c8d9bee Add telepathy-logger
svn path=/nixpkgs/trunk/; revision=33457
2012-03-28 19:23:42 +00:00
Yury G. Kudryashov
0d90c06ba1 Remove some packages with Qt3 dependency
kde3.k3b: use kde4.k3b instead
kde3.kphone: there are many other SIP phones
valknut: last version from 2009, doesn't support new ADC protocol
qdu: latest release in 2004, use kde4.filelight

REVIEWBOARD:5

svn path=/nixpkgs/trunk/; revision=33273
2012-03-19 18:31:02 +00:00