Commit Graph

548 Commits

Author SHA1 Message Date
William A. Kennington III
ae28ff8b91 Merge branch 'master.upstream' into staging.upstream 2015-07-06 17:15:11 -07:00
Pascal Wittmann
a4f69f5a39 bitlbee: update from 3.4 to 3.4.1 2015-07-06 18:16:49 +02:00
William A. Kennington III
d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Michael Raskin
807fbc4b57 baresip: update 0.4.12 -> 0.4.13 2015-07-05 00:32:53 +03:00
Pascal Wittmann
d5275c70c3 mcabber: update from 0.10.3 to 1.0.0 2015-07-03 10:18:48 +02:00
William A. Kennington III
7eae48871f Merge branch 'master.upstream' into staging.upstream 2015-07-01 13:38:17 -07:00
Artjom Vejsel
25ee65de97 qtox: 20150128 -> 20150624 2015-07-01 14:39:04 +03:00
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
Nikolay Amiantov
28d9da7498 pidgin-otr: adopt and add platforms 2015-02-02 14:00:17 +03:00
Andrey Arapov
522d059dc9 libtoxcore, utox, qtox, toxic: Update to the newest Dev version 2015-01-31 03:20:12 +01:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Pascal Wittmann
db69fcd0bc gtmess: update from 0.96 to 0.97
and remove obsolete patch
2015-01-15 00:25:07 +01:00
Ludovic Courtès
41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Vladimír Čunát
7637e71cee merge #5521: give fetchgit outputs nicer names 2015-01-13 17:46:44 +01:00
Vladimír Čunát
3dfd87d7af fixup "git-export" directory names
All tested to build.
For freetalk the hash change seems unrelated to fetchgit changes.

FIXME: it might be suitable to adapt nix-prefetch-git.
2015-01-13 17:46:09 +01:00
aszlig
0d12020a3f
Merge pull request #5582 from devhell/profanity.
This add profanity and dependencies and a few cleanups from me for the
profanity package expression.

Thanks to @devhell and apologies for pestering him with my nitpicking.

* Commit summary:
  profanity: Add option for autoAwaySupport.
  profanity: Clean up package expression file.
  profanity: Add libnotifySupport config option
  all-packages: Add libnotify option to profanity
  profanity: Add "platforms" meta information
  profanity: Add libXScrnSaver and libX11 buildInputs
  libstrophe: Add "platforms" meta information
  libstrophe: Fix typo
  profanity: Add profanity, a ncurses XMPP client
  libstrophe: Add new package
2015-01-05 08:33:11 +01:00
aszlig
f1f5a7f6c5
profanity: Add option for autoAwaySupport.
Actually, two dependencies used for notifySupport are for
autoAwaySupport and have nothing to do with notifications, so let's
split them apart.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-05 08:30:44 +01:00
aszlig
a313780202
profanity: Clean up package expression file.
No real changes in functionality, other than renaming libnotifySupport
to just notifySupport.

I've wrapped the lines to a maximum of 80 characters in width, so the
file looks less cluttered up. Which includes setting apart the attribute
for notifySupport and its respective dependencies from the main
dependencies.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-05 08:22:32 +01:00
dev.hell
429dd8e884 profanity: Add libnotifySupport config option
This adds support for profanity to be optionally built with libnotify.
2015-01-04 23:51:51 +00:00
dev.hell
f2faa549d9 profanity: Add "platforms" meta information 2015-01-04 22:42:58 +00:00
dev.hell
799f94185f profanity: Add libXScrnSaver and libX11 buildInputs
This adds libXScrnSaver and libX11 to the buildInputs.

Thanks to @aszlig for spotting this.
2015-01-04 22:39:24 +00:00
dev.hell
19aa2b5b0f profanity: Add profanity, a ncurses XMPP client
This adds profanity, a ncurses irssi-style XMPP client, which depends on
libstrophe.
2015-01-04 21:22:44 +00:00
aszlig
d0d880f630
mcabber: Build with support for GPG.
Originally I had in mind to introduce an attribute like "enableGPG", but
it seems that other distro include it per default, so I guess most users
coming from other distros would expect it that way. And so it is now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-04 17:59:30 +01:00
Michael Raskin
4d2d316894 baresip: 0.4.11 -> 0.4.12 2014-12-31 20:50:20 +03:00
Vladimír Čunát
3f7ff5f8f9 telepathy-misson-control: minor update, disable upower
Disabling upower is probably just a temporary work around
the incompatibility with 0.99.*
2014-12-30 11:04:50 +01:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Damien Cassou
bc789064d8 Package for the Polari IRC app
This commit includes a patch to telepathy's derivation, written by
Lethalman. This patch makes public the Telepathy's dependency to
dbus_glib. This patch will become problematic with the next pkgconfig
upgrade but this upgrade should make the patch irrelevant. See these 2
links for more information:
- https://bugs.freedesktop.org/show_bug.cgi?id=15199
- https://bugzilla.redhat.com/show_bug.cgi?id=436773

Modified by Luca Bruno:
- Moved telepathy_idle to propagatedUserEnvPkgs
- Added myself to maintainers
- Enable parallel building
2014-12-12 15:12:19 +01:00
Tino Breddin
cd5ea51a7d update hipchat to latest version 2014-12-07 12:05:32 +01:00
Richard Wallace
1cddfd69c4 there is no bin/ directory 2014-12-05 14:55:34 -07:00
Domen Kožar
683740466a Merge pull request #5217 from geerds/tox
Tox: Update libtoxcore, qtox, utox and toxic
2014-12-04 14:12:49 +01:00
Jascha Geerds
c81575eae1 qtox: Fix installPhase 2014-12-04 11:26:00 +01:00
Jascha Geerds
459fd43988 tox-prpl: Update to the newest dev version
This update is necessary due to API changes in libtoxcore.
2014-12-04 11:02:27 +01:00
Jascha Geerds
d5dc5eaff0 utox: Update to the newest dev version
This update is necessary due to API changes in libtoxcore.
2014-12-04 02:53:48 +01:00
Jascha Geerds
44dd2ed9ec toxic: Update to the newest dev version
This update is necessary due to API changes in libtoxcore. Sad to say that
the recent stable version doesn't work with our libtoxcore. We need to
update to the recent dev version.
2014-12-04 02:47:32 +01:00
Jascha Geerds
c57a4c2f78 Update libtoxcore and qtox to the newest dev version
As from now qtox depends on openalSoft instead of openal. This is due to
incompatibilities between those to two implementations. Anyway, this
should be okay because their official debian package depends on
openalSoft as well.
2014-12-04 02:29:56 +01:00
cillianderoiste
ebc96e4b0a Merge pull request #5201 from geerds/pidgin-window-merge
Add package pidgin-window-merge
2014-12-02 16:35:24 +00:00
Jascha Geerds
4ba9aa074f Add package pidgin-window-merge 2014-12-02 11:37:11 +01:00
Cillian de Róiste
dae0611770 pidginotr: update from 4.0.0 to 4.0.1 2014-11-27 22:59:34 +01:00
Domen Kožar
ea42838981 fix teamspeak_client build 2014-11-27 11:34:56 +01:00
Vladimír Čunát
7e94263c6d pidgin: minor update 2014-11-24 23:32:58 +01:00
Michael Raskin
4027494334 We had hash for wrong mcabber version and the tarball was cached 2014-11-21 23:39:35 +03:00
Domen Kožar
8236ca5d70 properly package pyopenssl 2014-11-19 19:41:44 +01:00
Vladimír Čunát
6e75afb5cf pidgin: enableParallelBuilding 2014-11-17 09:27:55 +01:00
Antoine R. Dumont
cab722f816 pidgin-with-plugins: fix plugin directories (close #5009) 2014-11-17 09:27:55 +01:00
Michael Raskin
737c8145c8 Update VacuumIM 2014-11-04 12:04:43 +03:00
Peter Simons
b5fed52c43 Merge pull request #4238 from wkennington/master.boost
Make boost 156 the default
2014-11-03 23:03:01 +01:00
Evgeny Egorochkin
195d3c7965 kde4.kadu: update from 0.12.2 to 0.12.3 2014-11-03 13:15:57 +02:00
William A. Kennington III
a9c472d16e boost: Fix incompatible applications 2014-11-02 17:22:28 -08:00
William A. Kennington III
aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
Nikolay Amiantov
b91721a119 pidgin-latex: replace with SF one and fix 2014-11-02 04:35:43 +03:00
Pascal Wittmann
521bc6ba0c Fix evaluation of pidgin wrapper 2014-10-30 12:50:07 +01:00
Rickard Nilsson
eaf513da6a pidgin: Fix compilation errors, clean up 2014-10-30 10:10:48 +01:00
Bjørn Forsman
71d4380a41 pidgin-with-plugins: fix version number placement in pkg name
Currently the pidgin plugins wrapper is named
"pidgin-VERSION-with-plugins". Fix it so that it becomes
"pidgin-with-plugins-VERSION".

(And add missing newline at the end of file.)
2014-10-26 11:51:09 +01:00
Vladimír Čunát
e63d9554b4 pidgin: maintenance+security update
Fixes CVE-2014-3694..3698

Added a note to clean the expression, CC #4602.
2014-10-23 13:03:23 +02:00
Nikolay Amiantov
2feaa0278a pidgin: add wrapper (close #4577, fixes #992) 2014-10-23 13:03:23 +02:00
Jos van den Oever
fb9ac9e8eb Add Blink, a simple sip client. 2014-10-16 12:21:36 +02:00
Michael Raskin
b32dbc8be6 Gajim update 2014-10-07 16:23:28 +04:00
Michael Raskin
c16cce3204 Update freetalk 2014-10-07 16:23:28 +04:00
Domen Kožar
1b929642ea telepathy: 0.5.3 -> 0.8.80 2014-10-02 11:14:38 +02:00
Lluís Batlle i Rossell
c1e962f1e2 Updating toxic to 0.5.1 2014-09-29 10:26:28 +02:00
Lluís Batlle i Rossell
93fd8fb3a5 Updating utox/libtoxcore to the latest, to fix utox build.
There was a test failing. I also renamed the attr uTox to utox, for the more
common lowercase in all-packages.
2014-09-29 10:24:36 +02:00
Lluís Batlle i Rossell
bf62423f89 Fix toxic install for DHTnodes and other share files. 2014-09-29 10:24:36 +02:00
Lluís Batlle i Rossell
c9494b8090 Making tox/toxic A/V libs disabled in ARM. 2014-09-29 10:24:35 +02:00
Lluís Batlle i Rossell
04b3932117 Adding qtox. Making libtoxcore propagate libvpx. 2014-09-29 10:24:35 +02:00
Lluís Batlle i Rossell
1b6101775d Updating utox (fixing PREFIX too) 2014-09-29 10:24:35 +02:00
Lluís Batlle i Rossell
1955da1b8c Updating toxic/libtoxcore/libsodium 2014-09-29 10:24:35 +02:00
tv
fe7f83a2f4 bitlbee: fix typo 2014-09-24 12:43:36 +02:00
William A. Kennington III
31220480d8 boost: Update depdendent packages 2014-09-21 17:20:59 -07:00
Nathaniel Baxter
72d43c3e04 teamspeak_client: Use nixpkgs quazip instead of provided library. 2014-09-16 09:17:16 +10:00
Nathaniel Baxter
afb405aed5 teamspeak_client: Remove qt4 dependency. 2014-09-16 09:17:15 +10:00
Rob Vermaas
8b955e62f5 Update hipchat to 2.2.1163 2014-09-15 16:01:32 +02:00
Luca Bruno
e3fd4499ef ekiga: fix icons. Closes #4015 2014-09-09 22:27:05 +02:00
Eelco Dolstra
585983bc95 Merge remote-tracking branch 'origin/staging'
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
William A. Kennington III
cc5d2cf55a bitlbee: 3.2 -> 3.2.2 2014-09-06 18:47:47 -07:00
Vladimír Čunát
ac03d296b9 telegram-cli: work around a build problem 2014-09-06 21:28:03 +02:00
Vladimír Čunát
6734f37ec6 twinkle: disable parallel building, as it was failing
http://hydra.nixos.org/build/13919809
2014-09-02 21:52:34 +02:00
Luca Bruno
2bee211fc9 mcabber: fix mispelled stdenv 2014-08-31 02:09:21 +02:00
Pascal Wittmann
907845127e mcabber: update from 0.10.1 to 0.10.3, add meta-information and adopt it 2014-08-31 00:41:40 +02:00
Domen Kožar
13ca3624a7 toxic: git -> 0.4.7 2014-08-25 17:13:50 +02:00
Domen Kožar
2099db4d00 uTox: downgrade to work with current libtoxcore 2014-08-25 17:09:41 +02:00
Bjørn Forsman
c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Nathaniel Baxter
33879427b7 maintainers: add myself as a maintainer to obconf and teamspeak_client 2014-08-24 10:10:13 +02:00
Luca Bruno
007232ff8f linphone: mark as broken for ZHF 2014-08-22 12:54:02 +02:00
Vladimír Čunát
2d03fbf752 twinkle eval: fix the typo 2014-08-20 23:38:43 +02:00
Vladimír Čunát
c198a36898 twinkle: fix build (fixes #3673)
Pulled patches from Debian and hacked around linking errors.
I'm able to ring my mobile phone now.
However, on exit the process is stuck and needs kill -9.

CC: maintainer @MarcWeber.
2014-08-20 21:32:19 +02:00
Domen Kožar
9b854cc70c Merge branch 'teamspeak_3_update' 2014-08-16 20:14:58 +02:00
Nathaniel Baxter
9c48f5160c teamspeak_client: Remove qt.conf to stop segfaults
teamspeak_client: Use the quazip library provided by teamspeak

This commit should be squashed before being commited to nixpkgs!

Signed-off-by: Domen Kožar <domen@dev.si>
2014-08-16 20:13:29 +02:00
Edward O'Callaghan
dc80331638 pidgin-latex-sf: bump reversion, url and hash
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>

@vcunat: fix URL.
2014-08-14 20:49:02 +02:00
Michael Raskin
6129a7aea6 Help kadu find phonon 2014-08-12 16:22:25 +04:00
Domen Kožar
8092ce6649 teamspeak_client: 3.0.13.1 -> 3.0.16 2014-08-10 19:05:15 +02:00
Vladimír Čunát
16fa6be4b8 ekiga: fix starting bin/ekiga (gschemas) 2014-08-10 18:25:34 +02:00
Luca Bruno
4ee1fcc6b9 ekiga: bump version and resurrect for ZHF 2014-08-08 22:38:27 +02:00
Vladimír Čunát
52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra
8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Vladimír Čunát
6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
Domen Kožar
e07c2c2cfd add uTox 2014-07-31 12:59:03 +02:00
aszlig
9edfad2717
toxic: Update to latest upstream Git master.
Unfortunately they've changed their build system to be makefile-only and
they don't seem to include test cases in the CLI anymore, so we needed
to adapt accordingly. Also added freealut and openal to the buildInputs,
in order to allow audio support.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-28 20:53:11 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Vladimír Čunát
b9045a7d96 Merge branch 'x-updates' into staging
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Vladimír Čunát
5979d428b4 Merge recent master into x-updates
Hydra: ?compare=1134869

Conflicts (just meta):
	pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
2014-07-09 22:13:29 +02:00