Commit graph

441 commits

Author SHA1 Message Date
Eelco Dolstra
4a57b07653 Merge remote-tracking branch 'origin/master' into staging 2015-06-11 00:18:24 +02:00
Pascal Wittmann
24a218b1cc mcabber: enable tests 2015-06-10 10:17:03 +02:00
William A. Kennington III
9d6555dc0a Merge branch 'master.upstream' into staging.upstream 2015-06-06 12:04:42 -07:00
Arseniy Seroka
70b5e51456 Merge pull request #8178 from jagajaga/fix/versions
fix: add missing versions
2015-06-06 00:22:10 +03:00
William A. Kennington III
ffd0539eba cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out 2015-06-05 13:00:52 -07:00
Arseniy Seroka
daf4ec39a5 fix: add missing versions 2015-06-04 23:34:14 +03:00
lethalman
997022bea9 Merge pull request #8148 from ts468/jitsi
Update version: jitsi: 2.4.4997 -> 2.8.5426
2015-06-03 10:57:37 +02:00
Thomas Strobel
ac355ac095 Update version: jitsi: 2.4.4997 -> 2.8.5426 2015-06-03 07:49:01 +02:00
Domen Kožar
dc3316268e Merge branch 'master' into staging 2015-06-01 11:00:51 +02:00
William A. Kennington III
867d2c5c46 openssl: Remove References to OPENSSL_X509_CERT_FILE 2015-05-31 15:50:51 -07:00
William A. Kennington III
abecf4aca1 bitlbee: 3.2.2 -> 3.4.0 2015-05-31 13:55:18 -07:00
Vladimír Čunát
1f18764f47 telepathy-salut: fix build - use openssl instead of gnutls 2015-05-30 22:47:20 +02:00
William A. Kennington III
b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
William A. Kennington III
cd52c04456 Fix more ca-bundle paths 2015-05-29 14:26:32 -07:00
William A. Kennington III
14c1e0fa1f Fix ca-bundle paths 2015-05-29 14:03:34 -07:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Tobias Geerinckx-Rice
68e3614ad0 viber: fix evaluation for nox-review
Even broken packages ought to evaluate, or die. Especially when
less than a month (!) old...
2015-05-25 13:35:54 +02:00
Luca Bruno
1b6401fd2e More usage of gnome3.defaultIconTheme 2015-05-19 14:40:04 +02:00
Nikolay Amiantov
e919cf0be2 pidgin-otr: update homepage 2015-05-18 17:21:08 +03:00
Jascha Geerds
12f0b61967 hipchat: update 2.2.1287 -> 2.2.1373 2015-05-18 13:16:34 +02:00
Joachim Schiele
bbd342dcf4 openal to openalSoft conversion 2015-05-16 04:04:35 +02:00
Pascal Wittmann
bb9e9cc3f8 Turned some meta.maintainers into lists 2015-05-14 19:09:43 +02:00
Eelco Dolstra
1ba5ef6b6a viber: Mark as broken
It doesn't evaluate due to Qt changes. Also improve checking in
make-tarball.nix to catch this in the future.
2015-05-12 14:30:56 +02:00
William A. Kennington III
00df204c82 Merge remote-tracking branch 'upstream/master' into staging 2015-05-01 15:57:09 -07:00
Michiel Leenaars
85c0aac675 New release of Blink 2015-04-30 09:49:45 +02:00
Vladimír Čunát
30f31c9afc Merge 'master' into staging
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
Joachim Fasting
8488d133f3 meta.licenses -> license 2015-04-21 23:10:07 +02:00
Arseniy Seroka
497bf2a696 Merge pull request #7040 from jagajaga/viber
viber: init pkg
2015-04-16 20:05:58 +03:00
Brandon Dimcheff
b539f86456 add package purple-pidgin-pack
This is 50ish plugins for pidgin.
2015-04-10 15:43:29 -04:00
Thomas Tuegel
88918e10e9 Merge branch 'master' into staging 2015-04-10 07:45:38 -05:00
Arseniy Seroka
2425f27b17 Merge pull request #7280 from auntieNeo/blink
Bumped blink version to 1.2.2
2015-04-09 05:20:19 +03:00
Jonathan Glines
2b949cfd46 Bumped blink version to 1.2.2 2015-04-08 17:01:37 -06:00
William A. Kennington III
90ca8b5875 linphone: 3.6.0 -> 3.8.1 2015-04-06 20:12:07 -07:00
William A. Kennington III
b0abac5821 twinkle: Add missing ccrtp dependency 2015-04-06 20:12:07 -07:00
Eric Seidel
6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
aszlig
6a4370f1ba
qca2: Update to new upstream version 2.1.0.
This also removes qca2_ossl, because it's now bundled with the main QCA
package and we can now drop all those patches and build system fixes,
because they have switched from autotools to cmake.

Tested against a few builds like PSI and Tomahawk.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-03-31 02:13:06 +02:00
Arseniy Seroka
b57c9866c5 viber: add pkg 2015-03-30 00:07:53 +03:00
Thomas Tuegel
5d1f6ad57c qt5: make qt-5.4.1 default 2015-03-24 17:14:56 -05:00
lethalman
97a7f2b8ba Merge pull request #6674 from fooblahblah/choqok
Added choqok build
2015-03-11 15:46:45 +01:00
Michael Raskin
2d7dd6ca2c update gajim 2015-03-09 01:03:00 +03:00
Jeff Simpson
2b0a3cd085 Added choqok build 2015-03-05 07:11:57 -07:00
vbgl
b7bcd30dbe Merge pull request #6661 from devhell/profanity
profanity: 0.4.5 -> 0.4.6
2015-03-05 00:01:08 +01:00
Eelco Dolstra
6f33aa8465 orig-gcc -> orig-cc 2015-03-04 22:15:46 +01:00
devhell
5be852be9f profanity: 0.4.5 -> 0.4.6
Changes include:

  * 16 colour support
  * UI preferences included in themes (http://www.profanity.im/themes.html)
  * Roster panel in console window
  * Word wrapping
  * Configure time display in main window
  * Set default account for /connect
  * Contact presence and resource displayed in titlebar
  * Ability to override resource when sending messages
  * Chat session handling in line with http://xmpp.org/rfcs/rfc6121.html#message-chat
  * Lower CPU usage during periods of inactivity
  * Keychain/keyring integration using account eval_password property
  * Fixed remote code execution bug on OSX when desktop notifications configured to show message text

Most new UI features are enabled by default but can be disabled with the relevant preference command.
2015-03-04 20:57:59 +00:00
Franz Pletz
48f4290cd8 Update silc-client to 1.1.11 2015-02-19 19:31:29 +01:00
Emery Hemingway
f5b3ca1473 ratox: bump to 0.2.1 2015-02-10 12:10:51 -05:00
Nikolay Amiantov
a52db30bdb tkabber: update version 2015-02-09 13:10:12 +03:00
viric
5ae6bf304c Merge pull request #6210 from ehmry/ratox
ratox: initial package at v0.2
2015-02-07 15:47:07 +01:00
Emery Hemingway
b3118791e3 ratox: initial package
http://ratox.2f30.org/
2015-02-07 09:33:18 -05:00
Shea Levy
c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00