Commit Graph

3427 Commits

Author SHA1 Message Date
Carles Pagès
1145130e9b yafc: update to 1.3.6 2015-10-18 22:20:07 +02:00
Michael Raskin
fe6226af8a firefox: 41.0.1 -> 41.0.2 2015-10-16 19:28:34 +03:00
taku0
45705d584a firefox-bin: 41.0.1 -> 41.0.2 2015-10-16 09:30:23 +09:00
William A. Kennington III
0ad0fbdf8a chromium: 45.0.2454.101 -> 46.0.2490.71 2015-10-15 13:13:56 -07:00
William A. Kennington III
fc69fadfe4 chromiumBeta: 46.0.2490.52 -> 46.0.2490.64 2015-10-15 13:13:55 -07:00
Vladimír Čunát
52ea05187a snort: fix evaluation 2015-10-15 21:46:13 +02:00
William A. Kennington III
8a44a36ca4 Merge branch 'master.upstream' into staging.upstream 2015-10-15 10:22:28 -07:00
Tobias Geerinckx-Rice
7d64d43b0d rsstail 2015-09-06 -> 2.1 2015-10-15 14:22:01 +02:00
Ricardo M. Correia
18cad45480 flashplayer: 11.2.202.521 -> 11.2.202.535 2015-10-15 11:20:38 +02:00
Michael Raskin
5c32df44c1 gajim: 0.16.3 -> 0.16.4 2015-10-13 19:30:01 +03:00
Michael Raskin
e8d82e08cf baresip: 0.4.14 -> 0.4.15 2015-10-13 19:29:43 +03:00
Nathaniel Baxter
102f70bfb2 teamspeak_client: Fixed qt and quazip lib references. 2015-10-13 22:12:41 +11:00
Nikolay Amiantov
0aaadc2b9e gajim: drop LaTeX support
It's in a separate plugin now.
2015-10-12 20:06:12 +03:00
Nikolay Amiantov
5963d94c3c mumble: use bundled celt library again 2015-10-12 17:55:00 +03:00
Javier Aguirre
0cc91c2f83 spideroak: 5.1.6 -> 6.0.1
Changed deprecated ensureDir for mkdir
2015-10-12 09:24:22 +02:00
Matthias Beyer
99d7a7d83e teamspeak_client: 3.0.16 -> 3.0.18.1 (Added missing SHA update) 2015-10-11 17:09:52 +02:00
Matthias Beyer
5bf207541d teamspeak_client: 3.0.16 -> 3.18.1 2015-10-11 14:31:41 +02:00
Nikolay Amiantov
70bb555368 opera: fix build 2015-10-10 14:24:05 +03:00
Arseniy Seroka
504fbfac2f Merge pull request #10274 from obadz/google-drive-ocamlfuse
google-drive-ocamlfuse: 0.5.12 -> 0.5.18
2015-10-07 23:49:16 +03:00
obadz
d90040afd8 chromium: add enable_hangout_services_extension=true to fix screensharing bug
as suggested in: https://code.google.com/p/chromium/issues/detail?id=416856#c53
2015-10-07 20:39:22 +01:00
obadz
31dc4f6c1b google-drive-ocamlfuse: 0.5.12 -> 0.5.18 2015-10-07 17:47:22 +01:00
Lluís Batlle i Rossell
c1e6e97f6b Updating twisterd to 0.9.30
(cherry picked from commit f2264ec42a9792091639eef1050b08403f368ff2)
2015-10-07 11:37:59 +02:00
Eelco Dolstra
741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Jascha Geerds
470e71abbd pidgin-skypeweb: init at 2015-10-02 2015-10-05 13:40:54 +02:00
Arseniy Seroka
61672889f2 Merge pull request #10210 from devhell/nload
nload: init at 0.7.4
2015-10-05 02:48:41 +03:00
Domen Kožar
161bf6c8cd Merge pull request #10220 from enolan/update-flash
flashplayer: 11.2.202.508 -> 11.2.202.521 security
2015-10-04 15:23:55 +02:00
William A. Kennington III
759c86c817 chromiumBeta: 46.0.2490.42 -> 46.0.2490.52 2015-10-03 22:22:21 -07:00
William A. Kennington III
2f88045360 mumble: Combine into a generic derivation
Also add a git version since 1.3.0 supports qt5 as well as a host of new
features.
2015-10-03 22:22:21 -07:00
Echo Nolan
89931277de flashplayer: add myself to maintainers 2015-10-03 20:54:38 -07:00
Echo Nolan
78dd7f8543 flashplayer: 11.2.202.508 -> 11.2.202.521 security
Several CVEs, listed here:
https://helpx.adobe.com/security/products/flash-player/apsb15-23.html

Tested by installing firefox-wrapper with nix-env and running twitch.tv
and a flash game.
2015-10-03 20:54:23 -07:00
Aycan iRiCAN
4e9f5328a5 snort: move dynamic path defs to wrapper script. 2015-10-03 17:22:40 +03:00
Gabriel Ebner
31779e6347 qutebrowser: 0.4.0 -> 0.4.1 2015-10-03 15:30:32 +02:00
Vladimír Čunát
e0ebb928e1 claws-mail: use a better-maintainable URL
/cc maintainer @khumba.
2015-10-03 12:43:39 +02:00
devhell
c412e048b5 nload: init at 0.7.4
Built and tested locally.

nload is a console application which monitors network traffic and
bandwidth usage in real time. It visualizes the in- and outgoing traffic
using two graphs and provides additional info like total amount of
transfered [sic] data and min/max networking usage.
2015-10-03 11:29:51 +01:00
Bryan Gardiner
a0de3cd969
claws-mail: 3.11.1 -> 3.12.0, remove priority workaround 2015-10-02 18:43:21 -07:00
lethalman
5f30859a1d Merge pull request #10173 from devhell/iptraf-ng
iptraf-ng: init at 1.1.4
2015-10-02 11:40:28 +02:00
Aycan iRiCAN
5d952d68de snort: typo fix 2015-10-02 12:08:25 +03:00
Aycan iRiCAN
0e69d85980 snort: provide dynamic preprocessor path via wrapper 2015-10-02 11:43:03 +03:00
Aycan iRiCAN
8d8457d9ae add wrapProgram to buildInputs 2015-10-02 10:18:55 +03:00
Aycan iRiCAN
6b84f5cd61 snort: introducing inline snort support via nfq daq 2015-10-02 10:11:04 +03:00
devhell
66dd86d4ca iptraf-ng: init at 1.1.4
This commit adds `iptraf-ng` which is a fork of `iptraf`. The original
has not been updated in ~10 years. This fork is more modern but
development is a bit slow (last update to master 15 months ago).
Nevertheless, unlike `iptraf` this one doesn't barf around and works
properly.
2015-10-01 22:38:50 +01:00
Eelco Dolstra
b23038dd80 Merge remote-tracking branch 'origin/master' into systemd-219 2015-10-01 14:17:46 +02:00
Eelco Dolstra
562851a068 thunderbird: Update to 38.3.0 2015-10-01 13:54:00 +02:00
Eelco Dolstra
25bb1e10f3 firefox: Update to 41.0.1 2015-10-01 13:51:24 +02:00
taku0
57155e04a7 firefox-bin: 41.0 -> 41.0.1, thunderbird-bin: 38.2.0 -> 38.3.0 2015-10-01 20:44:37 +09:00
William A. Kennington III
383377437e chromium: Updates
Built and run locally

  - Beta: 46.0.2490.33 -> 46.0.2490.42
  - Stable: 45.0.2454.99 -> 45.0.2454.101
2015-09-30 13:22:38 -07:00
Bryan Gardiner
4eb5068a13 claws-mail: fix conflict with shared_mime_info link
Fixes #10156. Close #10157.
2015-09-30 19:43:29 +02:00
Bryan Gardiner
c39a557095 claws-mail: add hicolor_icon_theme dependency
We want the hicolor_icon_theme hook to strip Claws's icon-theme.cache.
2015-09-30 19:42:52 +02:00
Thomas Tuegel
3e600a805d quassel_qt5: fix build with Qt 5.5 2015-09-30 10:53:52 -05:00
Moritz Ulrich
47c92a87c8 mutt: 1.5.23 -> 1.5.24
This change uses a different patchset for mutt-with-sidebar.
2015-09-29 00:23:55 +02:00
Eelco Dolstra
422e3736d5 thunderbird: Update to 38.2.0 2015-09-28 15:44:37 +02:00
Eelco Dolstra
4b664cb922 chromium-dev: Revert to 47.0.2508.0
47.0.2516.0 doesn't build.

http://hydra.nixos.org/build/26422610
http://hydra.nixos.org/build/26422600
2015-09-28 15:40:13 +02:00
Thomas Tuegel
d8d5e9868c dropbox: prepare for Qt upgrade 2015-09-27 15:09:50 -05:00
Thomas Tuegel
f998d502fc dropbox: build with Qt 5.5 2015-09-27 15:09:50 -05:00
Thomas Tuegel
f00d622e44 dropbox: set meta.platforms 2015-09-27 15:09:49 -05:00
Thomas Tuegel
cf4defce2c quassel: build with Qt 5.5 2015-09-27 15:08:12 -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
viric
46c18a47e1 Merge pull request #10063 from akaWolf/qtox
qTox: update & fix git revision.
2015-09-25 19:23:47 +02:00
Artjom Vejsel
1bfa084cdc qtox: 20150821 -> 20150925 2015-09-25 19:47:51 +03:00
Artjom Vejsel
0c95190fff qtox: fix git hash revision 2015-09-25 19:36:23 +03:00
aszlig
592f0f7ead
firefox: Drop crash_OTMC+GTK3.patch.
The patch only applies for Firefox versions between 37.0 and 40.1.

Because we're on version 41.0 the changes are already included upstream
and thus the patch doesn't apply and is even unnecessary.

As for version 38.3 for ESR, the patch doesn't apply as well if compiled
with enableGTK3. Of course, this is a bit unfortunate but I don't have
the time right now to properly rebase the patch on 38.3.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: devhell <"^"@regexmail.net>
2015-09-25 13:42:02 +02:00
William A. Kennington III
abb4088c6c chromium: Updates
- stable: 45.0.2454.93 -> 45.0.2454.99
  - dev:    47.0.2508.0  -> 47.0.2516.0
2015-09-23 12:30:00 -07:00
Arseniy Seroka
d9b4d81a39 Merge pull request #10003 from gebner/qutebrowser-youtube
qutebrowser: youtube support
2015-09-23 18:26:04 +03:00
Vladimír Čunát
68bd8e4a9d jitsi: fix meta.license and refactor meta
/cc maintainer @khumba.
2015-09-23 13:42:47 +02:00
Vladimír Čunát
0a836bb5c0 jitsi: rename xlibs -> xorg 2015-09-23 13:36:23 +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
taku0
50355a22a4 firefox-bin: 40.0.3 -> 41.0 2015-09-23 10:08:00 +09:00
Eelco Dolstra
f46fe7b909 firefox: Update to 41.0 2015-09-22 20:28:21 +02:00
Eelco Dolstra
4bcbfb33f8 firefox-esr: Update to 38.3.0esr 2015-09-22 20:28:21 +02:00
Gabriel Ebner
c33641b8d4 qutebrowser: set gstreamer and qt plugin paths. 2015-09-22 19:33:52 +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
0a7176c5a1 Revert "bundlerEnv: Use released versions of bundler"
This reverts commit 7bc8b1561e.

This breaks some ruby gems and needs to be reworked again.
2015-09-20 22:05:29 -07:00
William A. Kennington III
7bc8b1561e bundlerEnv: Use released versions of bundler
We were using HEAD for unreleased features. These features are now in
release builds so we should go back to using those. This also means we
won't have to deal with hash mismatches for all ruby packages.
2015-09-20 18:56:56 -07:00
Domen Kožar
2677b9d2cc Merge pull request #9965 from devhell/profanity
profanity: 0.4.6 -> 0.4.7
2015-09-20 21:10:05 +02:00
Carter Charbonneau
170177ad26 retroshare: 0.6-svn-7445 -> 0.6-git-fabc3a3 (close #9542) 2015-09-20 20:44:55 +02:00
devhell
eace7b6f9c profanity: 0.4.6 -> 0.4.7
Built and run successfully on local.

From the Changelog:
```
- GNU Readline
- OpenPGP support
- Message Carbons (xep-0280)
- Message Delivery Receipts (xep-0184)
- MUC Mediated Invitation support
- Configurable time formatting
- Option to show JIDs in roster
- Option to hide empty groups in roster
- Generate UUID for unnamed new MUC rooms
- Themable UI preference to indicate OTR and PGP messages
- Reformatted help
- devel: Added functional tests using libexpect and libstabber
```
2015-09-20 19:38:03 +01:00
Pascal Wittmann
07aefa403d filezilla: 3.13.1 -> 3.14.0 2015-09-20 12:25:56 +02:00
Domen Kožar
94e3e1195e chromium: remove preferLocalBuild
It's another attempt to fix chromium builds.

See http://hydra.nixos.org/build/26086977/nixlog/4/raw

Unpacking sources is actually taking more than 2h so build fails.
Instead, rather build it remotely and then copy over the output as
we don't have limits for download time.

See 089bdce621 for reference

cc @aszlig

(cherry picked from commit cef54e7d67870ff68c9787ff60cd50ca4bf1d8af)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-20 11:16:42 +02:00
William A. Kennington III
2664685d67 quassel: Build with fPIC to fix ssl use on gcc5 2015-09-19 16:05:38 -07:00
devhell
49a5d06d3c transmission-remote-gtk: 1.1.1 -> 1.2
This commit includes some rework since the original googlecode
repository redirects to the GitHub page.

Built and tested successfully on local.

From the Changelog:
```
* Wed Jun 11 2014 1.2
- A basic RSS reader which uses libmrss.
- Fix some 32bit platforms reporting 0 connected peers and unknown ETA.
- Resolve some GTK deprecations.
- Fix a crash in port test callback.
- Fix decimal marker in status bar version.
- Support for GeoIPCity.dat.
- Fix a crash when removing lots of columns (something changed in GTK).
- Optional and non-default support for validating SSL certs.
- Remove all GTK2 support.
- Allow alt-speed limits to override global speed limits in the statusbar
  display.
```
2015-09-19 21:18:22 +01:00
Thomas Tuegel
a074852aa6 linssid: unbundle QWT 2015-09-19 11:12:50 -05:00
Thomas Tuegel
8a3716e4b6 linssid: use Qt 5.4
This breaks the build.
2015-09-19 09:29:51 -05:00
Bryan Gardiner
c8ea6c07c6 jitsi: fix the system tray icon
Java's desktop integration on Linux relies on dlopen'ing some libraries (gtk2 or
gnome).  This commit makes Java able to find gtk2, fixing the problem of Jitsi's
system tray icon not appearing.

Part of bug #4014.
2015-09-18 20:11:29 +02:00
Edward Tjörnhammar
697ef465cd jitsi: kill the elves of solaris 2015-09-18 20:11:29 +02:00
Bryan Gardiner
268b4d5cfe
claws-mail: fix attachment MIME type detection
Adds support for shared-mime-info to Claws, to fix attachments in
outgoing messages always having MIME type application/octet-stream
because Claws doesn't know where to look, instead complaining:

/nix/store/...-claws-mail-3.11.1/etc/mime.types: fopen: No such file or directory

Moreover, Claws relies on incoming MIME types for knowing when e.g. to
display an attached image, so sending application/octet-stream
unnecessarily is bad.

Tested against release-15.09.
2015-09-18 04:52:44 -07:00
Bryan Gardiner
5e3eb6741f
claws-mail: enable parallel building 2015-09-18 04:32:35 -07:00
William A. Kennington III
fda452c56c chromium: Updates
- dev: 47.0.2503.0 -> 47.0.2508.0
  - beta: 46.0.2490.22 -> 46.0.2490.33
  - stable: 45.0.2454.85 -> 45.0.2454.93
2015-09-17 15:51:32 -07:00
Vladimír Čunát
80b26e4079 jitsi: fix tarball on darwin 2015-09-17 22:04:39 +02:00
Bryan Gardiner
37cd8fc16f jitsi: fix when installed via systemPackages
Close #9754.
Otherwise, the wrong directory is changed into, and trying to start Jitsi gives:

$ jitsi
Error: Could not find or load main class net.java.sip.communicator.launcher.SIPCommunicator
2015-09-17 21:19:47 +02:00
Jascha Geerds
d8b6defaae hipchat: 2.2.1373 -> 2.2.1388 2015-09-17 11:06:24 +02:00
Thomas Tuegel
3faf5b53a5 dropbox: 3.8.5 -> 3.8.9 2015-09-16 17:55:12 -05:00
Bjørn Forsman
b95bec7917 wireshark: 1.12.5 -> 1.12.7
Build and run tested.
2015-09-16 19:00:34 +02:00
Edward Tjörnhammar
c6cadd11db Merge pull request #9785 from khumba/jitsi-rpath-fix
jitsi: patch RPATHs for missing libraries
2015-09-16 16:10:04 +02:00
Bjørn Forsman
0af5fccf2a pidgin-sipe: 1.18.1 -> 1.20.0
Build and run tested (on release-15.09 branch).
2015-09-16 15:47:16 +02:00
Bryan Gardiner
476f2e3e2d
jitsi: add myself as maintainer 2015-09-16 06:42:26 -07:00
Bryan Gardiner
e422c2398c
jitsi: make a path patch for java slightly safer 2015-09-16 06:42:26 -07:00
Bryan Gardiner
8ef6197be5
jitsi: patch RPATHs of bundled .so files
Possibly helps with bug #3482.
2015-09-16 06:42:25 -07:00
William A. Kennington III
773b4deb7c Merge commit 'a6f6c0e' into master.upstream
This is a partial merge of staging where we have up to date binaries for
all packages.
2015-09-15 12:16:49 -07: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
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
Domen Kožar
eb29d8e44b Merge pull request #9869 from Mathnerd314/import-fix
all-packages: Use callPackage where possible
2015-09-15 06:53:50 +02:00
Mathnerd314
eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Domen Kožar
0b4ec468c5 disable chronos /cc @offlinehacker
(cherry picked from commit 83cc494542b9c53921616caa06984bd72f4e3dea)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-15 05:41:20 +02:00
Eelco Dolstra
acd97de64d Fix Darwin eval 2015-09-14 19:21:15 +02:00
Pascal Wittmann
f16eea1867 w3m: use gpm with ncurses support
fixes #9652
2015-09-14 17:47:32 +02:00
William A. Kennington III
27f0664960 chromiumBeta: Update 2015-09-13 20:23:21 -07:00
Bryan Gardiner
ab206a0e9a
claws-mail: install the .desktop file 2015-09-11 23:23:30 -07:00
Bryan Gardiner
7d7e983393
claws-mail: add myself as maintainer 2015-09-11 23:23:26 -07:00
Arseniy Seroka
cb2fcd412a qutebrowser: 0.3 -> 0.4.0 2015-09-12 00:57:49 +03:00
Tobias Geerinckx-Rice
26eaa93094 rsstail: 2.0 -> 2015-09-06
There are no releases, so don't let's pretend.
2015-09-10 01:47:09 +02:00
Arseniy Seroka
90a7bb69d0 Merge pull request #9711 from anderspapitto/bitlbee
plugin support for bitlbee, and facebook plugin
2015-09-09 03:03:53 +03:00
William A. Kennington III
71ec4dbd45 chromium: Dev / Beta Updates 2015-09-08 15:19:48 -07:00
Anders Papitto
78f7a09e3a bitlbee service: enable plugins 2015-09-08 14:24:50 -07:00
Anders Papitto
207f74eee9 bitlbee-facebook: init at 2015-08-27 2015-09-08 14:24:25 -07:00
Anders Papitto
7bcf564587 bitlbee: patch to allow plugindir configuration 2015-09-08 12:05:48 -07:00
Pascal Wittmann
7d12a0a709 Merge pull request #9606 from nckx/update-links2
links2: 2.10 -> 2.11
2015-09-08 17:38:26 +02:00
Pascal Wittmann
41fb95168e filezilla: 3.12.0.2 -> 3.13.1 2015-09-08 13:53:28 +02:00
Eelco Dolstra
916793cf13 Merge branch 'master' into systemd-219
Conflicts:
	nixos/modules/system/boot/systemd.nix
	pkgs/applications/networking/p2p/transmission/default.nix
	pkgs/development/libraries/libseccomp/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/top-level/all-packages.nix
2015-09-07 21:28:33 +02:00
Vladimír Čunát
8f33b8cc93 mass rewrite of find parameters to cross-platform style
Fixes #9044, close #9667. Thanks to @taku0 for suggesting this solution.
Now we have no modes starting with `/` or `+`.

Rewrite the `-perm` parameters of find:
 - completely safe: rewrite `/0100` and `+100` to `-0100`,
 - slightly semantics-changing: rewrite `+111` to `-0100`.
I cross-verified the `find` manual pages for Linux, Darwin, FreeBSD.
2015-09-06 10:26:30 +02:00
Rok Garbas
7dc9dfae88 blink: 1.4.0 -> 1.4.1 2015-09-05 15:01:06 +02:00
William A. Kennington III
f2271f7c19 drive: Migrate to go-packages 2015-09-05 00:42:49 -07:00
William A. Kennington III
e617eeea41 syncthing: Move to go-packages 2015-09-04 21:00:57 -07:00
Alexei Robyn
4028f88786 pidgin-opensteamworks: 1.5.1 -> 1.6.1, fixes #9489
Also, changed source url to (new) official github repo
2015-09-03 13:09:54 +02:00
Eelco Dolstra
a536eda82e Add firefox-esr 2015-09-03 11:15:53 +02:00
Domen Kožar
c0e97bb547 panamax_ui: fix libv8 pinpoint 2015-09-03 10:30:11 +02:00
William A. Kennington III
4bd817b82a pond: Migrate to go-packages 2015-09-02 22:17:45 -07:00
Domen Kožar
fb16b908bc qbittorrent: partial revert of 1d78f31b76
It still fails on 32bit:
http://hydra.nixos.org/build/25460116/nixlog/1/raw

(cherry picked from commit 57391b7322d97aa03158c730aec318cb0e8d2b2d)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-02 20:23:28 +02:00
Tobias Geerinckx-Rice
eead42d104 links2: 2.10 -> 2.11
Changes: http://links.twibright.com/download/ChangeLog
2015-09-02 16:31:13 +02:00
William A. Kennington III
b55a4df70f chromium: Updates
This bumps the stable and dev track forward a version
2015-09-01 21:22:34 -07:00
Vladimír Čunát
f2d25c5a4d firefox-gtk3: fix crashes by a Fedora-backported patch
These might be the same crashes as with gtk2 and system cairo #9368.
2015-09-01 21:34:17 +02:00
Vladimír Čunát
f65b692a07 firefox: fix argv0 with enableGTK3 (/cc #9562)
Also add a simple test detecting such problems.
2015-09-01 21:34:16 +02:00
lethalman
f8f224af05 Merge pull request #9500 from rnhmjoj/telegram-pass-args
telegram-cli: keep arguments passed to the wrapper
2015-09-01 18:57:04 +02:00
Eelco Dolstra
8fc039188e Mark some packages with undownloadable source as broken 2015-09-01 12:00:04 +02:00
Eelco Dolstra
9013dc5826 inotifyTools -> inotify-tools
Fixes #9456.
2015-09-01 10:52:47 +02:00
rnhmjoj
721dc51640 telegram-cli: keep arguments passed to the wrapper
Also break long lines
2015-08-30 22:57:08 +00:00
Kamil Chmielewski
4b522294c8 bleujeans: fix hanging on connect screen 2015-08-30 16:13:49 +02:00
Thomas Tuegel
875f660481 wrapFirefox: remove (broken) sed trick
This sed trick to set argv[0] is made obsolete by c234f37, which sets
argv[0] correctly anyway.
2015-08-30 08:33:44 -05:00
Domen Kožar
b950ec8617 Merge pull request #9485 from taku0/firefox-bin-40.0.3
firefox-bin: 40.0.2 -> 40.0.3
2015-08-28 14:22:36 +02:00
Eelco Dolstra
0619a23236 firefox: Update to 40.0.3 2015-08-28 11:26:44 +02:00
taku0
3f14b5f226 firefox-bin: 40.0.2 -> 40.0.3 2015-08-28 10:12:21 +09:00
Enrico Fasoli
d4988bd5ba syncthing: 0.11.21 -> 0.11.22 2015-08-27 14:17:33 +00:00
Luca Bruno
c91d360cec pidginsipe: add nss and nspr (ZHF) 2015-08-27 12:29:45 +02:00
Eelco Dolstra
320f963e16 firefox: Build with internal cairo
This might fix the recent segfaults, according to
https://bugzilla.redhat.com/show_bug.cgi?id=1253086.

Fixes #9368.
2015-08-27 11:18:39 +02:00
ts468
b1db014f40 Merge pull request #9462 from ts468/upstream.linphone
linphone: update linphone with dependencies
2015-08-26 22:33:56 +02:00
Thomas Strobel
63a1d2a364 linphone: wrap to find plugins 2015-08-26 22:17:41 +02:00
Thomas Strobel
7160a32001 linphone: 3.8.1 -> 3.8.5 2015-08-26 17:08:27 +02:00
lethalman
18bd7ede65 Merge pull request #9434 from ctheune/submit/syncthing-0.11.21
syncthing: 0.11.20 -> 0.11.21
2015-08-26 10:39:37 +02:00
Arseniy Seroka
a8f220d8fa Merge pull request #9426 from ebzzry/conkeror-update
conkeror: 20150319 -> 20150730
2015-08-25 20:37:09 +03:00
Ricardo M. Correia
4c8b2beb55 flashplayer: 11.2.202.491 -> 11.2.202.508 2015-08-25 17:59:55 +02:00
Christian Theune
6ee8cad091 syncthing: 0.11.20 -> 0.11.21 2015-08-25 07:59:50 +02:00
Rommel M. Martinez
c99c0dd1ed conkeror: 20150319 -> 20150730 2015-08-25 01:19:14 +08:00
Thomas Tuegel
90a72bd177 Merge branch 'master' into staging 2015-08-23 10:29:12 -05:00
Jascha Geerds
a1d85fc261 Merge pull request #9388 from akaWolf/qtox
qtox updated
2015-08-22 11:14:39 +02:00
Artjom Vejsel
c9ca9db213 qtox: 20150624 -> 20150821 2015-08-22 09:59:49 +03:00
Artjom Vejsel
7f1efceff8 qtox: add wrapper for set runtime qt5.svg plugin 2015-08-22 09:59:33 +03:00
William A. Kennington III
64cd711f5c Merge branch 'master.upstream' into staging.upstream 2015-08-21 15:17:26 -07:00
Jude Taylor
9941e181e9 weechat: help weechat find libiconv on darwin 2015-08-21 14:02:39 -07:00
William A. Kennington III
8712a2d8d1 chromium: Updates 2015-08-21 11:05:11 -07:00
Moritz Ulrich
9346230743 weechat: 1.2 -> 1.3 2015-08-21 15:43:52 +02:00
Arseniy Seroka
7d7bbf125e teamviewer 10: new sha256 2015-08-21 00:51:27 +03:00
William A. Kennington III
2138f789bc Merge branch 'master.upstream' into staging.upstream 2015-08-20 10:32:29 -07:00
aszlig
e4c2f97a27
Merge pull request #9269 from @jraygauthier.
Although I couldn't test this because I'm not using a DE, nobody else
than the one submitting the pull request has commented on this. So if it
should break the icon for other people, nobody would probably start an
assassination because of this and the commit can be easily reverted if
it should break the icon.
2015-08-20 13:02:55 +02:00
William A. Kennington III
4f22eadf2c Merge branch 'master.upstream' into staging.upstream 2015-08-19 20:52:17 -07:00
Jaka Hudoklin
559e2ab951 kubernetes: 0.18.0 -> 1.0.3 2015-08-19 23:51:54 +02:00
William A. Kennington III
901482ad99 Merge branch 'master.upstream' into staging.upstream 2015-08-19 13:54:48 -07:00
Nikolay Amiantov
8f59f4c78c firefox: build with pulseaudio support (close #8087) 2015-08-19 20:08:54 +02:00
Arseniy Seroka
7f20a09bd7 Merge pull request #9322 from taku0/firefox-bin-40.0.2
firefox-bin: 39.0.3 -> 40.0.2, thunderbird-bin: 38.1.0 -> 38.2.0
2015-08-19 14:41:42 +03:00
William A. Kennington III
54dee45402 Revert "firefoxWrapper: switch to GStreamer 1.0"
This reverts commit 69269bebeb.
2015-08-19 00:39:16 -07:00
William A. Kennington III
5711761622 firefox: Revert gstreamer-1.0 changes
This causes firefox to sometimes crash and hang when playing videos.
2015-08-19 00:39:14 -07:00
William A. Kennington III
2ac70270e8 Merge branch 'master.upstream' into staging.upstream 2015-08-18 11:36:32 -07:00
taku0
dffb7373a5 firefox-bin: 39.0.3 -> 40.0.2, thunderbird-bin: 38.1.0 -> 38.2.0 2015-08-18 20:35:10 +09:00
Domen Kožar
3409dc7fe8 Merge pull request #9319 from ctheune/submit/syncthing-0.11.20
syncthing: 0.11.16 -> 0.11.20
2015-08-18 13:08:17 +02:00
Oliver Charles
ec8f2716f8 Merge pull request #9296 from kamilchm/bluejeans
bluejeans: 2.100.41.8 -> 2.100.102.8
2015-08-18 07:59:22 +01:00
Christian Theune
97afc0a914 syncthing: 0.11.16 -> 0.11.20 2015-08-18 08:15:37 +02:00
Kamil Chmielewski
8d21fe21ce bluejeans: 2.100.41.8 -> 2.100.102.8 2015-08-17 17:37:53 +02:00
kmicu
69269bebeb
firefoxWrapper: switch to GStreamer 1.0
wkennington@f6c1004 switched Firefox to GStreamer 1.0 by changing its
buildInput *only*, but that is not enough. We need to fix Firefox
wrappers by changing their buildInputs and set GST_PLUGIN_SYSTEM_PATH_1_0
instead of GST_PLUGIN_SYSTEM_PATH.

With above changes playing H.264/MP4 media works in firefoxWrapper and
conkerorWrapper as tested with
http://www.quirksmode.org/html5/tests/video.html and
https://soundcloud.com/immclovin33/synthetix-sundays-53-with-marko-maric-19715

It should help with peti#9247

Reviewed-by: kmicu <kmicu@protonmail.ch>
Tested-by: kmicu <kmicu@protonmail.ch>
2015-08-17 10:48:26 +02:00
Raymond Gauthier
cff84b2a71 chromium: improvement.
Fixed `*.desktop` refering to nix store for its icon.
2015-08-15 18:32:30 -04:00
William A. Kennington III
435c5d2c42 firefox: 40.0 -> 40.0.2 2015-08-14 13:58:36 -07:00
William A. Kennington III
4ed131efb3 chromiumBeta: 45.0.2454.26 -> 45.0.2454.37 2015-08-14 13:46:37 -07:00
Pascal Wittmann
6364245475 telegram-cli: make maintainers a list 2015-08-14 22:38:38 +02:00
William A. Kennington III
952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
Simon Vandel Sillesen
1d78f31b76 qBittorrent: 3.1.11 -> 3.2.3 2015-08-13 04:07:08 +02:00
Jude Taylor
71756e741b update ZNC version 2015-08-12 11:27:54 -07:00
William A. Kennington III
6a3b25dbd3 chromium: Updates 2015-08-11 16:08:34 -07:00
Tobias Geerinckx-Rice
ffec002c68 rsstail: 1.9.1 -> 2.0 2015-08-11 21:08:44 +02:00
William A. Kennington III
30f1d5b3cf firefox: 39.0.3 -> 40.0 2015-08-11 11:26:46 -07:00
Damien Cassou
9593caf2b1 Merge pull request #9202 from NixOS/update-backintime-1.1.6
backintime: 1.1.4 -> 1.1.6
2015-08-11 18:22:48 +02:00
Damien Cassou
c36c7fe33d backintime: 1.1.4 -> 1.1.6 2015-08-11 18:10:50 +02:00
aszlig
471cdd15e2
chromium: Update beta and dev channels.
Overview of the updated versions:

beta: 45.0.2454.15 -> 45.0.2454.26
dev:  45.0.2454.15 -> 46.0.2471.2

Changes for getting beta and dev channel to build:

 * The reference for chrome::FILE_FLASH_PLUGIN doesn't exist anymore in
   version 46, because it has been dropped upstream, see the following
   review URL:

   https://codereview.chromium.org/1255943002

   We set the PPAPI Flash path using a command line flag anyway, so it
   doesn't hurt us if we don't patch that path (which was an old
   artifact from the NSAPI->PPAPI conversion anyway).

Changes for the dev channel only:

 * It seems that in the SCM, chrome/test/data/webui/ contains a lot of
   files, however they are missing in the tarball.

   This has been reported upstream at: https://crbug.com/515917

   Our fix is to just not include webui/i18n_process_css_test.html at
   all, to avoid the configure (gyp) phase to fail, because we're not
   building tests anyway.

All channels built and tested by my Hydra instance at:

https://headcounter.org/hydra/eval/218978

Test reports:

x86:    https://headcounter.org/hydra/build/723341/download/1/log.html
x86_64: https://headcounter.org/hydra/build/723342/download/1/log.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-08-11 12:17:38 +02:00
Alexei Robyn
417dd5528e pidgin-opensteamworks: init at v1.5.1
Adds pidgin-opensteamworks, a Pidgin plugin to add support for the
Steam Friends/Steam IM service
2015-08-10 13:27:27 +10:00
William A. Kennington III
6e698f9c61 Merge branch 'master.upstream' into staging.upstream 2015-08-09 13:34:18 -07:00
Michael Raskin
e346b417d3 gajim: 0.16.1 -> 0.16.3 2015-08-08 21:01:31 +03:00
Michael Raskin
081dff71be baresip: 0.4.13 -> 0.4.14 2015-08-08 21:01:31 +03:00
Nicolas B. Pierron
da74a8dc35 Merge pull request #9166 from taku0/thunderbird-38.1.0
thunderbird: 31.7.0 -> 38.1.0
2015-08-08 18:46:05 +02:00
taku0
f059656ef2 thunderbird: 31.7.0 -> 38.1.0 2015-08-08 23:25:24 +09:00
William A. Kennington III
4624985561 Merge branch 'master.upstream' into staging.upstream 2015-08-07 13:40:39 -07:00
Pascal Wittmann
590e11bc53 mesos: fix build by applying patch from review.apache.org 2015-08-07 18:14:18 +02:00
taku0
bc88e645cc firefox-bin: 39.0 -> 39.0.3 2015-08-07 22:09:25 +09:00
James Cook
9f79830345 firefox: 39.0 -> 39.0.3 2015-08-06 21:21:07 -07:00
Jan Malakhovski
9966ec4e54 notmuch: fix gpg path in notmuch-config.c
Fixes errors when attempting to decrypt an encrypted message.
I'm not sure that `crypto.c` needs to be patched after this, since this setting
should propagate there, but let's play it safe.
2015-08-06 22:11:29 +02:00
William A. Kennington III
f6c1004b2a firefox: Use more system libraries
Use system libpng with apng support.
Use the system icu which works fine in newer firefox builds.
Use jemalloc to speed up memory allocations and reduce fragmentation.
2015-08-05 23:26:34 -07:00
William A. Kennington III
5c6aa391fc chromium: Cleanup old patch and update stable 2015-08-05 19:27:29 -07:00
William A. Kennington III
370add9d80 chromium: update.sh Shouldn't use cached hashes as they often change upstream for the same version 2015-08-05 19:25:56 -07:00
William A. Kennington III
d9358f1879 Merge pull request #9117 from benley/chromium-xdg
chromium: fix opening URLs from associated mime types
2015-08-05 17:08:30 -07:00
Herwig Hochleitner
150cbd6a65 dropbox: 3.6.9 -> 3.8.5 2015-08-05 23:56:54 +02:00
William A. Kennington III
926f073f55 Merge branch 'master.upstream' into staging.upstream 2015-08-04 15:32:43 -07:00
Benjamin Staffin
501f667958 chromium: fix opening URLs from associated mime types
It helps to actually pass the URL to chromium :)

Related to #4370
2015-08-04 14:39:17 -07:00
Null is Too Long
804f0098ef thunderbird-bin: fix icon path 2015-08-04 12:23:28 -04:00
Arseniy Seroka
d649a1d88f telegram-cli: 2014-03-04 -> 2015-07-30 & add maintainer 2015-08-04 17:11:36 +03:00
Pascal Wittmann
76b5c75d48 dwb: mark it as broken, closes #7952 2015-08-04 13:04:14 +02:00
Charles Strahan
bc042fe0ff mesos: 0.22.1 -> 0.23.0 2015-08-04 06:11:32 -04:00
Benjamin Staffin
f098967293 chromium: Fix widevine ppapi plugin loading
See "Running a plugin in Chrome" section at:
https://www.chromium.org/developers/design-documents/pepper-plugin-implementation

The colon between the plugin's description and its mime type is indeed
supposed to be a semicolon, according to that design doc.
2015-08-03 20:37:35 -07:00
William A. Kennington III
a2da9cfcaf Merge branch 'master.upstream' into staging.upstream 2015-08-03 14:27:14 -07:00
Michael Raskin
b49fc96617 Use GNOME-enabled libsoup in Midori as the build fails otherwise 2015-08-03 00:31:07 +03:00
Arseniy Seroka
372e5a7dcf Merge pull request #9072 from benley/shout
Shout: new package and nixos module
2015-08-02 16:07:36 +03:00
William A. Kennington III
1dab05033f Merge branch 'master.upstream' into staging.upstream 2015-08-01 19:18:08 -07:00
William A. Kennington III
09b4a7cc1b Merge branch 'master.upstream' into staging.upstream 2015-07-31 17:26:20 -07:00
Benjamin Staffin
f4502e650b shout: init at 0.51.1
Shout is an IRC client with a nice web interface.
2015-07-31 16:08:10 -07:00
Nikolay Amiantov
47bb91194b mumble: use our celt library 2015-07-31 13:41:43 +03:00
Thomas Tuegel
ebe0befd86 Merge branch 'quassel' 2015-07-30 21:51:37 -05:00
Eelco Dolstra
55932c1bec Don't statically depend on cacert for certificates
This reverts commit cd52c04456 and
others.

Managing certificates (including revoking certificates and adding
custom certificates) becomes extremely painful if every package in the
system potentially depends on a different copy of cacert. Also, it
makes updating cacert rather expensive.
2015-07-31 01:34:58 +02:00
William A. Kennington III
7ebe164ae0 Merge branch 'master.upstream' into staging.upstream 2015-07-30 15:03:10 -07:00
William A. Kennington III
85134cc386 chromium: Updates 2015-07-30 12:12:08 -07:00
aszlig
8d34b4a46a
chromium: Add another mirror for Chrome deb.
The only mirror left which still has the .deb for 44.0.2403.89 is
http://mirror.pcbeta.com/, but that one doesn't seem to be reachable
from certain contries.

And according to @CestDiego, it doesn't seem to be reachable from within
the US.

Closes #9021, thanks to @CestDiego for reporting.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: Diego Berrocal <cestdiego@gmail.com>
Tested-by: Diego Berrocal <cestdiego@gmail.com>
2015-07-30 19:57:38 +02:00
Vladimír Čunát
862900e42e mass-replace deprecated usage of find -perm (Fixes #9044)
sed 's|-perm +0|-perm /0|g'
It's a mass-rebuild due to usage in stdenv's default setup hooks.
2015-07-30 10:30:17 +02:00
Tobias Geerinckx-Rice
936b8dc2c7 x2goclient: 4.0.4.0 -> 4.0.5.0 2015-07-29 00:19:31 +02:00
Arseniy Seroka
44b9366810 Merge pull request #9032 from devhell/canto
canto-{curses,daemon}: {0.9.4,0.9.3} -> {0.9.6,0.9.5}
2015-07-29 00:34:50 +03:00
devhell
9dbde02381 canto-{curses,daemon}: {0.9.4,0.9.3} -> {0.9.6,0.9.5}
Built and tested locally. The changelog can be found here:
http://codezen.org/canto-ng/news/
2015-07-28 21:05:14 +01:00
Thomas Tuegel
058f36aae7 quassel: add optional KF5 features
Also fixes conditional dependencies so that TLS is enabled.
2015-07-27 17:58:00 -05:00
Tobias Geerinckx-Rice
4d20fb5f44 putty: 0.64 -> 0.65 2015-07-27 01:54:08 +02:00
William A. Kennington III
6cb708c3b3 chromium: Bump 2015-07-26 12:38:34 -07:00
Artjom Vejsel
5b527968bd pidgin-mra: init at 54b2992 (close #8996)
@vcunat made pkgconfig dependency explicit.
2015-07-26 13:45:27 +02:00
Artjom Vejsel
9ca034f277 purple-vk-plugin: init at 40ddb6d (close #8996)
@vcunat simplified preConfigure.
2015-07-26 12:08:07 +02:00
Tobias Geerinckx-Rice
078ee4ac55 copy-com: 1.47.0410 -> 3.2.01.0481 + several fixes
The graphical UI (the largest part of this package) never worked; fixed.

Added myself as a maintainer.
2015-07-25 04:39:02 +02:00
lethalman
90b19534e5 Merge pull request #8972 from nathanielbaxter/dev/teamspeak_client
teamspeak_client: create .desktop file
2015-07-24 10:14:51 +02:00
lethalman
1a85b7c0c7 Merge pull request #8925 from bendlas/links2-update
links2: 2.8 -> 2.10
2015-07-24 10:02:48 +02:00
lethalman
abe5f2e634 Merge pull request #8971 from AndersonTorres/dillo
Dillo: 3.0.4.1 -> 3.0.5
2015-07-24 10:01:03 +02:00
Nathaniel Baxter
aae3bdab03 teamspeak_client: create .desktop file 2015-07-24 14:32:56 +10:00
AndersonTorres
c8629266ef Dillo: 3.0.4.1 -> 3.0.5 2015-07-23 23:05:19 -03:00
Arseniy Seroka
44fbb6856a Merge pull request #8955 from fpletz/package/mutt-kz
mutt-kz: 1.5.23.1-rc1 -> 1.5.23.1
2015-07-23 20:07:25 +03:00
Daniel Brockman
d82946b2bf sic: init at 1.2 2015-07-23 17:59:33 +02:00
Franz Pletz
6d257267ae mutt-kz: 1.5.23.1-rc1 -> 1.5.23.1 2015-07-22 23:14:52 +02:00
William A. Kennington III
551a26dad1 chromium: Update stable 43 -> 44 2015-07-21 21:59:28 -07:00
Herwig Hochleitner
53c2254aab links2: 2.8 -> 2.10
Also enable svg support, as well as libev support
2015-07-21 18:35:01 +02:00
Herwig Hochleitner
9f4936942c dropbox: 3.6.7 -> 3.6.9 2015-07-21 16:20:54 +02:00
lethalman
c235eb2ffe Merge pull request #8920 from joachifm/fix-mozplugger
mozplugger: 1.12.0 -> 2.1.6
2015-07-21 14:58:15 +02:00
Joachim Fasting
0bb1b47cc2 mozplugger: 1.12.0 -> 2.1.6
The source url for 1.12.0 returns 404, so this update fixes the build
as well.
2015-07-21 14:31:06 +02:00
Luca Bruno
cbf935f90e ekiga: fid build failure, use adwaita-icon-theme instead of gnome-icon-theme (ZHF) 2015-07-21 13:20:22 +02:00
William A. Kennington III
35f8386e78 chromium-dev: Update 2015-07-20 18:08:29 -07:00
Eelco Dolstra
bc1773fe16 Merge remote-tracking branch 'origin/staging' into systemd-219
Conflicts:
	pkgs/os-specific/linux/kernel/linux-3.4.nix
	pkgs/os-specific/linux/systemd/default.nix
2015-07-20 22:57:23 +02:00
Arseniy Seroka
6745ffb1c9 Merge pull request #8889 from ctheune/submit/syncthing-0.11.16
syncthing: 0.11.15 -> 0.11.16
2015-07-20 00:32:19 +03:00
devhell
d8a8ed12bb canto-{curses,daemon}: 0.9.{3,1} -> 0.9.{4,3}
Close #8884.
A very detailed changelog and discussion can be found here:

http://codezen.org/canto-ng/news/

This change was built locally and tested by me. There will be changes
noticable in the `canto-curses` interface since color support has been
reworked. For more details follow the hint in `canto-curses` or read the
changelog/manual liked to above. There also have been many
under-the-hood improvements which can also be found in the link above.
2015-07-19 22:13:31 +02:00
Christian Theune
79d020de49 syncthing: 0.11.15 -> 0.11.16 2015-07-19 16:02:40 +02:00
Vladimír Čunát
9a80550cc4 Merge branch 'staging', discussion #8844 2015-07-19 08:09:29 +02:00
John Chee
225ae4c5f8 tribler: strip pngs (close #8810)
This prevents libpng exceptions from being thrown.
Accepted upstream: https://github.com/Tribler/tribler/pull/1561
2015-07-18 10:11:03 +02:00
Peter Simons
c523633b09 Merge pull request #8869 from taku0/flashplayer_2.2.202.491
flashplayer: 11.2.202.481 -> 11.2.202.491
2015-07-17 18:29:23 +02:00
Luca Bruno
5ec54be235 znc: add back 1.4 because xchat does not support TLS 2015-07-17 17:51:44 +02:00
taku0
6e5308df3f flashplayer: 11.2.202.481 -> 11.2.202.491 2015-07-18 00:19:39 +09:00
Vladimír Čunát
9f37e91ec5 Merge master into staging
There are larger-rebuild changes: gnutls and samba.
2015-07-17 06:38:04 +02:00
William A. Kennington III
ec5f94fbcc chromium: Minor updates
Notably a version bump for
 Flash Player to 18.0.0.209-r1
2015-07-15 17:55:11 -07:00
William A. Kennington III
25e60feb72 Merge branch 'master.upstream' into staging.upstream 2015-07-15 02:02:46 -07:00
Christian Theune
a932d14dd9 syncthing: 0.11.13 -> 0.11.15 2015-07-14 22:46:54 +02:00
William A. Kennington III
333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
William A. Kennington III
fc7c18a992 mumble: 1.2.9 -> 1.2.10 2015-07-13 12:33:19 -07:00
Pascal Wittmann
c41809a4da Merge pull request #8754 from cheecheeo/tribler_update
Tribler update
2015-07-13 11:16:55 +02:00
Pascal Wittmann
74f4b0d27a filezilla: update from 3.11.0.2 to 3.12.0.2 2015-07-12 15:43:14 +02:00
Mateusz Kowalczyk
cd492865d6 Merge pull request #8755 from taku0/thunderbird-bin-38.1.0
thunderbird-bin: 38.0.1 -> 38.1.0
2015-07-12 12:46:51 +01:00
taku0
69364f136e flashplayer: 11.2.202.468 -> 11.2.202.481 2015-07-12 11:56:20 +09:00
taku0
7064dd1f88 thunderbird-bin: 38.0.1 -> 38.1.0 2015-07-12 11:39:09 +09:00
John Chee
962f68f390 tribler: 5.5.x-25411 -> 6.4.3 2015-07-11 15:09:46 -07:00
Pascal Wittmann
2c31cb1c36 blink: update from 1.3.0 to 1.4.0 2015-07-10 18:53:27 +02:00
Edward Tjörnhammar
036722ab7c spark: 1.1.1 -> 1.4.0 2015-07-10 01:36:47 +02:00
Christian Theune
36ce0e2876 Update syncthing 0.11.10 -> 0.11.13 2015-07-09 21:16:24 +02:00
William A. Kennington III
dae5b35463 ruby: Fixup libv8 versions 2015-07-08 15:10:50 -07:00
William A. Kennington III
7cda24c01e Merge branch 'master.upstream' into staging.upstream 2015-07-08 14:11:16 -07:00
Jaka Hudoklin
957390ecba Merge pull request #8682 from offlinehacker/pkgs/openshift/add
Add openshift
2015-07-08 12:20:01 +02:00
Jaka Hudoklin
4e33dd4e99 openshift: init at 1.0.1 2015-07-08 12:18:06 +02:00
Pascal Wittmann
3a1dc590f4 dwb: update from 2014-12-15 to 2015-07-07 2015-07-07 13:11:55 +02:00
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
Moritz Ulrich
25c7e5fafe notmuch: 0.19 -> 0.20.2 2015-07-06 17:37:15 +02:00
William A. Kennington III
fbfdc139d6 Merge branch 'master.upstream' into staging.upstream 2015-07-05 18:36:16 -07:00
William A. Kennington III
06f1e2c61e quassel: Add dependency on qca for crypto 2015-07-05 16:52:56 -07:00
William A. Kennington III
d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Michael Raskin
62da31931c Firefox: update 38.0.6 -> 39.0 2015-07-05 00:32:54 +03:00
Michael Raskin
807fbc4b57 baresip: update 0.4.12 -> 0.4.13 2015-07-05 00:32:53 +03:00
aszlig
bc5ce1f1b0
chromium: Update stable and beta channels.
Overview of the updated versions:

stable: 43.0.2357.125 -> 43.0.2357.130
beta:   44.0.2403.52  -> 44.0.2403.61

For the beta channel the following changes were necessary:

 * Drop all patches which were added in c290595 because they apply to
   44.0.2403.52 only. The shipped version of Blink was older than the
   one used for Chromium itself and thus contained just the
   cherry-picked patches from upstream Blink.

 * The ffmpegsumo library is now statically linked the same way as in
   the dev version, so let's not try to put it into the output store
   path.

All channels were built successfully on my Hydra at:

https://headcounter.org/hydra/eval/187176

VM tests did also pass and can be found at:

x86:    https://headcounter.org/hydra/build/707636
x86_64: https://headcounter.org/hydra/build/707637

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-07-04 02:31:45 +02:00
aszlig
7e6d6e034d
chromium: Disable setuid sandbox without errors.
Just silencing the error will not prevent Chromium from trying to start
up the SUID sandbox anyway, thus flooding stderr with:

LaunchProcess: failed to execvp:

After digging a bit in the source code I found out that the SUID sandbox
binary is indeed used, but only for setting oom_score_adj within the
user namespace (as "root"). So let's build the sandbox binary and of
course don't set setuid bit.

These annoying error messages were originally introduced by 0aad4b7 and
I'm deeply sorry for annoying you guys out there with them.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-07-04 02:31:45 +02:00
aszlig
a80437e236
chromium: Remove out-of-tree sandbox derivation.
Since 0aad4b7, we no longer need to have an external sandbox binary,
because the upstream implementation of the user namespace sandbox no
longer needs an external sandbox binary.

In our implementation of the user namespace sandbox, we (ab)used the
setuid sandbox to run non-setuid and set up user namespaces instead.

Because our implementation is no longer needed, we can safely drop the
external binary entirely.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-07-04 02:31:44 +02:00
aszlig
97ddd04ca9
chromium: Remove obsolete sandbox_userns_36.patch.
The file is no longer referenced since 6a8afa4 and thus can be safely
dropped.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-07-04 02:31:44 +02:00
Arseniy Seroka
b152a0b094 Merge pull request #8618 from taku0/firefox-bin-39.0
firefox-bin: 38.0.5 -> 39.0
2015-07-04 03:09:03 +03:00
taku0
443e9843eb firefox-bin: 38.0.5 -> 39.0 2015-07-04 09:06:35 +09: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
William A. Kennington III
612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
Arseniy Seroka
7e9cba3a2d qutebrowser: 0.3-pre -> 0.3 2015-06-29 19:05:51 +03:00
Pascal Wittmann
bd65e8afb4 bro: update from 2.3.2 to 2.4 2015-06-29 12:50:34 +02:00
Kirill Elagin
f49e9ce1be qutebrowser: Add @jagajaga as a maintainer 2015-06-28 02:38:01 +03:00
Kirill Elagin
e2398a2361 qutebrowser: update to git master
qutebrowser is actively developed, sticking to stable
versions doesn’t make any sense.
Also fixed formatting.
2015-06-28 02:26:59 +03:00
William A. Kennington III
ef253212f4 Merge branch 'master.upstream' into staging.upstream 2015-06-26 17:25:49 -07:00
William A. Kennington III
adeab5e815 Migrate all heimdal -> libheimdal
Also disable heimdal references in samba as it uses internal api
features not guaranteed to be stable
2015-06-26 17:23:00 -07:00
Jude Taylor
c0e1f2e34f darwin purity: weechat 2015-06-25 16:35:18 -07:00
Thomas Tuegel
a8c52d0958 Merge branch 'master' into staging 2015-06-25 09:15:05 -05:00
William A. Kennington III
c5b17670e1 firefox: 38.0.5 -> 38.0.6 2015-06-24 23:04:29 -07:00
Alexander Foremny
ba7e7e1c9a Update flashplayer-11 2015-06-24 16:08:52 +02:00
Jascha Geerds
ec222230a5 Merge pull request #8475 from ehahn/qutebrowser
qutebrowser: Fix license
2015-06-24 13:39:22 +02:00
Christian Theune
700e11dfee Update syncthing to 0.11.10 2015-06-24 13:07:34 +02:00
Pascal Wittmann
1776016bf7 filezilla: update from 3.10.3 to 3.11.0.2 2015-06-24 10:47:09 +02:00
Erik Hahn
d6acec03bb qutebrowser: fix license 2015-06-24 00:10:54 +02:00
Arseniy Seroka
2aac4c301c Merge pull request #8469 from ehahn/qutebrowser
add packages: qutebrowser + dependency pypeg2
2015-06-23 17:22:26 +03:00
Vladimír Čunát
110aabbb67 liferea: maintenance update 2015-06-23 15:10:03 +02:00
Erik Hahn
006e7ae04e qutebrowser: init at 0.2.1 2015-06-23 13:39:33 +02:00
William A. Kennington III
1e58156159 Merge branch 'master.upstream' into staging.upstream 2015-06-22 20:03:10 -07:00
aszlig
7143f34970
chromium: Drop references to version 42 and below.
Since 7d217e3 the lowest version number is 43, so all those conditionals
are no longer needed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-06-23 03:35:30 +02:00
aszlig
cadd675e7a
chromium: Disable "hotwording" by default.
There has been some recent news about that component extension on hacker
news:

https://news.ycombinator.com/item?id=9724409

Even though on our side it won't work, because we don't have NaCl
enabled by default or even working (I honestly haven't tested if it even
builds if enabled), we might get to the point where we can build with
NaCl enabled.

But until and even after that day, we want to have explicit control on
whether this extension is enabled.

Please also have a look at these two issues explaining the details
(about component extensions and the hotwording extension in particular):

https://crbug.com/491435
https://crbug.com/500922

Fixes issue #8358.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-06-23 03:35:30 +02:00
aszlig
c290595e5b
chromium: Update all channels to latest versions.
Overview of the updated versions:

stable: 43.0.2357.124 -> 43.0.2357.125
beta:   44.0.2403.39  -> 44.0.2403.52  [1]
dev:    45.0.2421.0   -> 45.0.2431.0   [2]

[1] Beta channel fixes:

    I had to fetch a patch from a newer revision of Blink (r195908), see
    https://codereview.chromium.org/1157943002/ for more information
    about the patch.

    Here is the failing build log:

    https://headcounter.org/hydra/build/704037/nixlog/2

    Another fix for Blink, was needed in order to get it to build,
    see: https://codereview.chromium.org/1156113007/

    Also I needed to revert https://codereview.chromium.org/1150543002/
    using another patch, because the build won't succeed and bail out
    with WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE not being found (it's only
    used once in the source, but isn't defined anywhere). Here are the
    trybot results:

    https://chromium-cq-status.appspot.com/patch-status/1150543002/20001

[2] Dev channel fixes:

    The "ffmpegsumo" shared library is now no longer built, because it
    is now statically linked against Chromium, for details see:

    https://codereview.chromium.org/1141703002

All channels built and tested on my Hydra at:

https://headcounter.org/hydra/eval/178458

Test reports:

x86:    https://headcounter.org/hydra/build/704908/download/1/log.html
x86_64: https://headcounter.org/hydra/build/704914/download/1/log.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-06-23 03:35:30 +02:00
William A. Kennington III
282d03befa Merge branch 'master.upstream' into staging.upstream 2015-06-22 10:57:36 -07:00
Oliver Charles
fd6600c809 bluejeans: New Mozilla plugin 2015-06-22 14:04:40 +01:00
Jascha Geerds
51fa682655 hexchat: 2.9.6.1 -> 2.10.2 2015-06-22 12:28:28 +02:00
Jascha Geerds
3f66bb7ff2 Add myself as maintainer 2015-06-22 08:26:09 +02:00
Domen Kožar
2959f193a9 update flash player
(cherry picked from commit 48b41f0e9524db37f45818f71aa7b55a9c462900)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-06-21 09:23:06 +02:00
Thomas Tuegel
a457d29def Merge pull request #8408 from bendlas/update-dropbox-unstable
dropbox: 3.4.6 -> 3.6.7
2015-06-19 07:24:03 -05:00
Eelco Dolstra
d8c9fa5043 Remove meta.license hack 2015-06-19 14:14:52 +02:00
Herwig Hochleitner
ab7c9e49c2 dropbox: 3.4.6 -> 3.6.7 2015-06-19 13:50:42 +02:00
William A. Kennington III
fe4f8903b4 Merge branch 'master.upstream' into staging.upstream 2015-06-18 22:37:00 -07:00
William A. Kennington III
c64747c44a mumble: 1.2.8 -> 1.2.9 2015-06-18 22:34:55 -07:00
Vladimír Čunát
61596bf405 Merge #8363: pure-darwin stdenv 2015-06-18 22:38:08 +02:00
Vladimír Čunát
ddeb2f5cce firefox: fix file-dialogs and icons with gtk3
There was the usual crashing and a few icons missing.
@lethalman: I think it's best to start putting $XDG_ICON_DIRS into suffix
instead of prefix (as here), so user-installed icons take precedence.

/cc #7743.
2015-06-18 14:48:41 +02:00
taku0
4e78d76c18 thunderbird-bin: update to version 38.0.1, closes #8357 2015-06-18 11:40:13 +02:00
Christian Theune
b2b7245155 Update syncthing to 0.11.9 2015-06-18 11:19:05 +02:00
lethalman
0622c4a22d Merge pull request #8350 from bobvanderlinden/drive
added drive package
2015-06-18 11:09:13 +02:00
Tobias Geerinckx-Rice
4e5e44140b dpkg, x2goclient: fix evaluation
Bed time.
2015-06-17 23:25:09 +02:00
Tobias Geerinckx-Rice
98b2d7b727 Separate nativeBuildInputs where maintainers |= nckx 2015-06-17 22:21:32 +02:00
Bob van der Linden
5093fd9cc9 added drive package 2015-06-17 20:13:48 +02:00
Luca Bruno
aa800fa0fe Merge branch 'master' into staging 2015-06-15 09:56:29 +02:00
Jascha Geerds
8ae4d0b1e1 Add mailnag package 2015-06-14 18:31:48 +02:00
Arseniy Seroka
c72bbc5b8e teamviewer: add option to accept license 2015-06-14 18:29:19 +03:00
William A. Kennington III
954801a9a8 Merge branch 'master.upstream' into staging.upstream 2015-06-12 13:47:46 -07:00
aszlig
1746140184
Merge branch 'chromium-update'.
This also merges pull request #8290 plus a few other fixes from
@ambrop72 and me.

The summary of changes is:

  * Update all channels to latest upstream.
  * Update GYP package and drop gyp_svn1977.
  * Remove ICU from buildInputs to prevent build failure.
  * Switch back to using --depth . to GYP instead of patching in the
    absolute store paths.
  * Don't symlink source code anymore, which might introduce a
    regression on high I/O load on Hydra. As this is only a temporary
    build fix, let's cross fingers and hope we don't hit it. See
    c92dbffeac for an explanation.
  * Use HTTPS for the bucket URL.
  * Fix nix_plugin_paths patch for version 44 and higher.

Tested at: https://headcounter.org/hydra/eval/169134
2015-06-12 06:05:08 +02:00
Vladimír Čunát
885808a8d9 liferea: maintenance update 2015-06-11 22:11:21 +02:00
Kirill Elagin
e5b56cdfff firefox: add option to build with GTK3 (close #7743) 2015-06-11 21:15:48 +02:00
aszlig
af54ddf8b6
chromium: Drop plugin_paths patch for old versions.
The patch was for versions prior to version 22, so we no longer need it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-06-11 19:54:11 +02:00
aszlig
6a8afa4bb3
chromium: Fix plugin_paths patch for version 44.
The pepper effects plugin has been removed and migrated to NaCl, so I'm
just dropping the hunk of that patch.

Upstream reviow URL: https://codereview.chromium.org/1085393003

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-06-11 19:54:11 +02:00
Ambroz Bizjak
58fd4f672f Chromium: Update and build fixes.
Changes included:
- Update versions.
- Use gyp package not gyp_svn1977.
- Remove icu from buildInputs, since this causes a build error due to inferference with use_system_icu=false.
- Remove the hack that inserts the absolute path into gyp files, and pass `--depth .` to gyp. This resolves the `third_party/angle` gyp error.
- Do a normal copy of the source code not a symlink copy. This resolves some link error where the symlinks interfere with relative paths (seems like because gyp resolves symlinks first). Note, this used to be worked around with the absolute path insertion hack.
- Change the bucketURL in update.nix to https (for more secure updates).
2015-06-11 18:23:58 +02:00
Eelco Dolstra
4970574409 Merge remote-tracking branch 'origin/gcc-4.9' into staging
Conflicts:
	pkgs/development/libraries/wayland/default.nix
2015-06-11 00:23:03 +02:00
Eelco Dolstra
4a57b07653 Merge remote-tracking branch 'origin/master' into staging 2015-06-11 00:18:24 +02:00
Christian Theune
8fc6185037 Update syncthing to 0.11.8
(Also should fix failing test on i686 as per its Changelog)
2015-06-10 13:33:59 +02:00
Pascal Wittmann
24a218b1cc mcabber: enable tests 2015-06-10 10:17:03 +02:00
Jaka Hudoklin
392fc849e4 Update kubernetes to 0.18.0, fix module 2015-06-08 13:10:32 +02:00
Nixpkgs Monitor
389820e798 weechat: update from 1.1.1 to 1.2, potentially fixes CVE-2012-6047, CVE-2012-6554 2015-06-07 15:43:54 +02:00
Vladimír Čunát
d57ef6b523 liferea: fix build problem hidden by #7524 2015-06-07 09:21:20 +02:00
Arseniy Seroka
433a8d766e Merge pull request #8166 from richardlarocque/firefox_icon
Fix firefox-bin icon path
2015-06-07 00:14:37 +03:00
William A. Kennington III
9d6555dc0a Merge branch 'master.upstream' into staging.upstream 2015-06-06 12:04:42 -07:00
Domen Kožar
a96f7c9e0a Merge pull request #8197 from taku0/firefox-bin-libmozgnome
firefox-bin, thunderbird-bin: update patchelf arguments
2015-06-06 21:03:16 +02:00
William A. Kennington III
c6175f8161 Revert "heimdal: Remove more references"
This reverts commit 7b1336d2f1.
2015-06-06 12:01:42 -07:00
taku0
5f890ceca1 firefox-bin, thunderbird-bin: update patchelf arguments 2015-06-06 19:05:57 +09:00
taku0
6aa10201cc flashplayer: Update from 11.2.202.457 -> 11.2.202.460 2015-06-06 18:38:18 +09: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
Tobias Geerinckx-Rice
fcee71066b rsstail -> 1.9.1 2015-06-04 18:35:44 +02:00
Richard Larocque
6214a521c9 Fix firefox-bin icon path 2015-06-03 19:33:59 -07:00
Eelco Dolstra
4564a0e5e2 firefox: Update to 38.0.5 2015-06-03 11:35:06 +02: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
taku0
def4876d41 firefox-bin: update to version 38.0.5 2015-06-03 09:32:11 +09: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
Pascal Wittmann
3838f1d490 firestr: fix build (qt5.multimedia was missing) 2015-05-31 19:13:28 +02:00
Vladimír Čunát
bba6880aa6 snort.org: switch downloads to SourceForge
On snort.org they only seem to keep the latest release, which is annoying.
Fixes #8065. /cc maintainer @aycanirican.
2015-05-31 17:11:40 +02:00
Christian Theune
fe2d66ff65 Update syncthing to 0.11.7 2015-05-31 12:42:59 +02:00
Vladimír Čunát
1f18764f47 telepathy-salut: fix build - use openssl instead of gnutls 2015-05-30 22:47:20 +02:00
Vladimír Čunát
ff2ccb2721 linssid: fix build by using qt53 2015-05-30 22:08:09 +02:00
Vladimír Čunát
643c515489 dillo: minor update to fix build (after fltk bump) 2015-05-30 17:34:25 +02:00
William A. Kennington III
7b1336d2f1 heimdal: Remove more references 2015-05-29 15:21:22 -07: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
Pascal Wittmann
c0a5ffc438 wireshark: update from 1.12.4 to 1.12.5, fixes CVE-2015-3808 2015-05-29 22:17:03 +02: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
Marko Durkovic
d917f8c7c9 cygwin: w3m 2015-05-28 10:53:35 +02:00
Tobias Geerinckx-Rice
b2d7f4b1ba Use common licence attributes from lib/licenses.nix
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
Tobias Geerinckx-Rice
661326b34c x2goclient 4.0.3.2 -> 4.0.4.0 2015-05-26 23:59:36 +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
Christian Theune
9d0bd2cd2d Update syncthing to 0.11.6 2015-05-25 10:24:02 +02:00
William A. Kennington III
5722d7c5b5 umurmur: Enable shmapi 2015-05-24 16:05:08 -07:00
Peter Simons
83096066c8 irssi: add second download mirror because irrsi.org is offline
(cherry picked from commit 79effb88a0d342ffc423b7044548c34c7f5c1aa4)
2015-05-25 00:13:52 +02:00
Peter Simons
06f3c4dba5 daq: update to version 2.0.5
Fixes https://github.com/NixOS/nixpkgs/issues/7947.
2015-05-22 20:41:59 +02:00
Eelco Dolstra
09d06f5ffd Merge remote-tracking branch 'origin/master' into systemd-219
Conflicts:
	pkgs/development/libraries/libseccomp/default.nix
2015-05-22 15:57:36 +02:00
Eelco Dolstra
99e9710348 thunderbird: Update to 31.7.0
Also enable parallel building, as it seems to work reliably for
Firefox.
2015-05-22 11:46:18 +02:00
aszlig
b26de39252
gyp: Revive old SVN version to build Chromium.
Works around regression from a305e6855d.

We're also marking it lowPrio to make sure nobody will accidentally
reference it using nix-env -i.

Until we have fixed #7402, we're going to build with the old gyp version
to prevent being affected by https://crbug.com/462153.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-22 11:37:40 +02:00
Arseniy Seroka
15faa43f13 Merge pull request #7853 from rushmorem/marathon-update
Update Mesos Library environment variable
2015-05-21 12:58:11 +03:00
Pascal Wittmann
bfc1582b81 jumanji: fix gsettings schemas, closes #7916 2015-05-21 01:10:24 +02:00
taku0
3705c62266 thunderbird-bin: update to version 31.7.0 2015-05-20 09:33:30 +09:00
Luca Bruno
1b6401fd2e More usage of gnome3.defaultIconTheme 2015-05-19 14:40:04 +02:00
Thomas Tuegel
6d52aa7e59 dropbox: install icons 2015-05-18 15:44:48 -05:00
Thomas Tuegel
feec95b437 dropbox: move updateable attributes to the top 2015-05-18 15:44:48 -05:00
Herwig Hochleitner
db4993600c dropbox: 3.4.4 -> 3.4.6 2015-05-18 15:44:47 -05:00