Commit graph

3687 commits

Author SHA1 Message Date
Vladimír Čunát
3e387c3e00 Merge branch 'staging'
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
2016-05-13 10:14:53 +02:00
Arseniy Seroka
21747ef768 Merge pull request #15407 from taku0/thunderbird-bin-45.1.0
thunderbird-bin: 45.0 -> 45.1.0
2016-05-13 01:27:13 +03:00
taku0
cade2f36e5 flashplayer: 11.2.202.616 -> 11.2.202.621 2016-05-12 21:58:26 +09:00
taku0
eb4e6b821b thunderbird-bin: 45.0 -> 45.1.0 2016-05-12 21:42:54 +09:00
Arseniy Seroka
fd12b1149e Merge pull request #15398 from Shados/maintain-opensteamworks
Allow plugins to work for Finch (CLI Pidgin)
2016-05-12 15:00:37 +03:00
Joachim Fasting
639dcffa0b Merge pull request #15403 from Shados/maintain-teamspeak-server
teamspeak-server package & module maintenance
2016-05-12 13:01:38 +02:00
Domen Kožar
323cd39016 thunderbird: set requiredSystemFeatures to big-parallel 2016-05-12 10:11:03 +01:00
Alexei Robyn
b874447eef teamspeak-server: 3.0.10.3 -> 3.0.12.4, also
tsdnsserver binary now in output
2016-05-12 15:46:45 +10:00
Vladimír Čunát
6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Alexei Robyn
9d9a20e98b pidgin-opensteamworks: Change install location to work with Finch as well as Pidgin. 2016-05-12 10:22:52 +10:00
Alexei Robyn
e634488cc3 pidgin-with-plugins: Add plugin support for Finch, the CLI version of Pidgin. 2016-05-12 10:22:52 +10:00
namore
13c2bd4d7c thunderbird: fix out-of-date hash (#15390) 2016-05-11 20:34:23 +01:00
Thomas Tuegel
6521529c23 quassel: fix SSL detection with Qt 5.6 2016-05-11 13:20:57 -05:00
Eelco Dolstra
86c45ba50d google-talk-plugin: 5.4.2.0 -> 5.41.0.0 2016-05-11 20:18:30 +02:00
Kranium Gikos Mendoza
a36f721630 bluejeans: 2.125.24.5 -> 2.155.17.5 2016-05-11 21:47:12 +08:00
Joachim Fasting
a0e8d542c7 Merge pull request #15377 from womfoo/sniproxy
sniproxy: init at 0.4.0 with dependency udns: init at 0.4
2016-05-11 15:14:33 +02:00
Kranium Gikos Mendoza
59f71829a3 sniproxy: init at 0.4.0 2016-05-11 13:27:28 +08:00
Thomas Tuegel
f64eaa7b14 quassel: remove qtwebkit input 2016-05-10 20:07:55 -05:00
Eelco Dolstra
cb37ab146b Add mirror://mozilla scheme 2016-05-09 19:37:22 +02:00
Thomas Tuegel
cf63f2dde9 dropbox: use makeQtWrapper 2016-05-09 10:07:54 -05:00
Thomas Tuegel
e60eb28873 firestr: mark broken 2016-05-09 10:01:46 -05:00
Eelco Dolstra
de22402f85 firefox-esr: 45.0.2 -> 45.1.1 2016-05-09 15:28:13 +02:00
Eelco Dolstra
02d01dc7c5 firefox: 46.0 -> 46.0.1 2016-05-09 15:27:06 +02:00
Robin Gloster
aceecb82c8 Merge pull request #15319 from romildo/upd.hexchat
hexchat: 2.10.2 -> 2.12.1
2016-05-09 14:46:00 +02:00
José Romildo Malaquias
35fe868c29 hexchat: 2.10.2 -> 2.12.1 2016-05-09 07:38:31 -03:00
Vladimír Čunát
65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
zimbatm
9c47b07bc3 Merge pull request #15302 from taku0/firefox-bin-icon
firefox-bin: fixed missing icon
2016-05-08 13:30:44 +01:00
taku0
07a83f226e firefox-bin: fixed missing icon 2016-05-08 17:06:08 +09:00
Wei Tang
4d15758984 firefox: Fix build due to commit #ab0a0c 2016-05-08 05:58:02 +02:00
Joachim Fasting
cac498b522 Merge pull request #15282 from nathanielbaxter/dev/teamspeak
teamspeak_client: 3.0.18.2 -> 3.0.19.1
2016-05-07 18:51:28 +02:00
Nikolay Amiantov
62c41cc539 dropbox: meta.licenses -> meta.license 2016-05-07 15:13:28 +03:00
Nikolay Amiantov
41ced9f100 dropbox: mark as unfree 2016-05-07 15:12:07 +03:00
Thomas Tuegel
f2ec142847 quassel: 0.12.3 -> 0.12.4
Security update for CVE-2016-4414 (denial of service).
2016-05-07 06:00:09 -05:00
Nathaniel Baxter
24ffbfde1d teamspeak_client: 3.0.18.2 -> 3.0.19.1 2016-05-07 09:52:49 +10:00
Joachim Fasting
aa478b5021
bittorrentSync: factor out common parts 2016-05-06 01:03:04 +02:00
Joachim Fasting
e4bd66c8f0
bittorrentSync20: 2.3.6 -> 2.3.7 2016-05-06 00:42:31 +02:00
Joachim Fasting
debc317066 Merge pull request #15242 from kragniz/weechat-1.5
weechat: 1.4 -> 1.5
2016-05-05 20:59:04 +02:00
Louis Taylor
393bde55f9 weechat: 1.4 -> 1.5 2016-05-05 18:52:35 +01:00
Joachim Fasting
6d2625a940
bittorrentSync14: 1.4.110 -> 1.4.111 2016-05-05 18:35:20 +02:00
Vladimír Čunát
ee2fbda77a Merge #15218: thunderbird: 38.7.1 -> 45.0 2016-05-05 17:14:06 +02:00
Vladimír Čunát
1dc36904d8 Merge #14920: windows improvements, mainly mingw 2016-05-05 08:30:19 +02:00
Tobias Geerinckx-Rice
2dc8975bc4
thunderbird: 38.7.1 -> 45.0
Changes: https://www.mozilla.org/en-US/thunderbird/45.0/releasenotes/
2016-05-05 02:14:19 +02:00
Rok Garbas
2eac1070ad Merge pull request #15229 from DamienCassou/notmuch-0.22
notmuch: 0.21 -> 0.22
2016-05-05 00:16:04 +02:00
aszlig
3f7735fe65
chromium+chrome: Don't import update.nix directly
Regression introduced by f28b71023c.

Let's now expose and use the upstream-info attribute via the main
Chromium derivation, so that other packages like the google-chrome
package doesn't need to rely on internals of the Chromium
implementation.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-05-04 23:12:33 +02:00
aszlig
f28b71023c
chromium/updater: Don't import <nixpkgs> again
This effectively resets the attributes given at the point the main
<nixpkgs> is imported and thus for example is also reading in stuff like
~/.nixpkgs/config.nix again, which might lead to unexpected results.

We now only import <nixpkgs> now if the updater is auto-called (like in
update.sh), otherwise the required attributes are passed by callPackage
within the Chromium scope.

I remember noting about this a while ago either on IRC or on GitHub, but
I can't find it right now, so thanks to @obadz for reminding me about
this in #15225.

Tested this by running the updater and also using:

NIXPKGS_CONFIG=$(pwd)/broken.nix nix-instantiate --arg config {} -A chromium

The contents of broken.nix were:

EVALERR{

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #15225
2016-05-04 22:35:24 +02:00
Damien Cassou
d122556a2f notmuch: 0.21 -> 0.22 2016-05-04 21:49:08 +02:00
Arseniy Seroka
9cb8abe846 Merge pull request #15208 from taku0/firefox-bin-46.0.1
firefox-bin: 45.0.2 -> 46.0.1
2016-05-04 21:38:47 +03:00
Eelco Dolstra
1f84e43239 Do some large, concurrency-capable builds on dedicated machines 2016-05-04 18:16:27 +02:00
Eelco Dolstra
f2d24b9840 chromium: Disable Hydra builds of -dev and -beta
It's not the job of Nixpkgs to distribute beta versions of upstream
packages. More importantly, building these delays channel updates by
several hours, which is bad for our security fix turnaround time.
2016-05-04 18:16:27 +02:00
taku0
90f5be3133 firefox-bin: 45.0.2 -> 46.0.1 2016-05-04 14:50:17 +09:00