Commit Graph

3921 Commits

Author SHA1 Message Date
Eelco Dolstra
930d243ea4 firefox: 45.0.2 -> 46.0
Still using GTK+ 2 for now, since apparently building with GTK+ 3
still requires GTK+ 2, increasing the closure size. (#15008)
2016-04-28 13:39:12 +02:00
Arseniy Seroka
52b64cedec Merge pull request #15016 from jagajaga/eid
open-eid
2016-04-28 13:56:09 +03:00
Tuomas Tynkkynen
b465dc202f boost: Kill unnecessary 'lib' output
This was split in somewhere pre-2014 without the current infra which
automates parts of this, in particular the output propagation.
2016-04-28 00:41:28 +03:00
Tuomas Tynkkynen
4ff8f377af Merge remote-tracking branch 'upstream/master' into staging 2016-04-28 00:13:53 +03:00
Tuomas Tynkkynen
2f6c2ecd47 eiskaltdcpp: Use pcre-cpp (fixes build)
http://hydra.nixos.org/build/34967606/nixlog/1/raw
2016-04-27 13:38:27 +03:00
Arseniy Seroka
f6d7cefa7b
esteidfirefoxplugin: init at 3.12.1.1142 2016-04-27 11:38:09 +03:00
Nikolay Amiantov
1f89dbd46b pidgin-with-plugins: use symlinkJoin 2016-04-26 15:37:43 +03:00
Nikolay Amiantov
618c75de7b tdesktop: fix build 2016-04-25 20:47:29 +03:00
Nikolay Amiantov
ab0a0c004e makeSearchPathOutputs: refactor to makeSearchPathOutput 2016-04-25 13:24:39 +03:00
Joachim Fasting
68691d31b1
rsync: fix version typo
Typo introduced at c3b4dd920b50d6fd7625ada250d042b47fbd0217; went
undetected because the checksum was not changed.

Reported by m4t__ on IRC
2016-04-24 20:48:27 +02:00
Nikolay Amiantov
75b0478ebd Merge pull request #14949 from ldesgoui/discord
discord: 0.0.1 -> 0.0.3
2016-04-24 20:48:27 +04:00
Nikolay Amiantov
73182fd328 mumble_overlay: move from mumble and more fixes 2016-04-24 18:49:33 +03:00
Nikolay Amiantov
af9fcaf910 mumble: fix mumble-overlay 2016-04-24 18:08:40 +03:00
ldesgoui
1c08aa2704 discord: 0.0.1 -> 0.0.3 2016-04-24 16:45:09 +02:00
Markus Binsteiner
83274eccf0 seafile-*: 4.4.2 -> 5.0.7
Also updated dependencies:
ccnet: 1.4.2 -> 5.0.7
libsearpc: 1.2.2 -> 3.0.7
2016-04-23 12:52:42 +12:00
Nikolay Amiantov
ae0a64cf2c mumble_git: 2015-11-08 -> 2016-04-10 2016-04-23 02:27:36 +03:00
Nikolay Amiantov
6900fdc84b mumble: 1.2.10 -> 1.2.15 2016-04-23 02:27:36 +03:00
Nikolay Amiantov
5489bc4109 mumble: fix speechd support 2016-04-23 02:27:36 +03:00
Vladimír Čunát
e9379f7416 Merge branch 'staging'
This includes a fix to closure-size regression that moved
share/doc/*/ to share/doc/
2016-04-22 16:49:09 +02:00
Alexander V. Nikolaev
2ddc17b930 skype: fix rpath broken by closure-size merge 2016-04-20 22:42:52 +03:00
Nikolay Amiantov
83406bc171 x2goclient: move to qmake4Hook 2016-04-20 18:55:47 +03:00
Nikolay Amiantov
04e1b8eac4 retroshare: move to qmake4Hook 2016-04-20 18:55:47 +03:00
Nikolay Amiantov
2f2e9b06b5 retroshare06: move to qmake4Hook 2016-04-20 18:55:47 +03:00
Nikolay Amiantov
a1fc9606f2 ostrinato: move to qmake4Hook 2016-04-20 18:55:47 +03:00
Nikolay Amiantov
3c52b4253c mumble: move to qmake{,4}Hook 2016-04-20 18:55:46 +03:00
Nikolay Amiantov
d52c326fd0 linssid: move to qmakeHook
This reverts commit cf3f891369.
2016-04-20 18:55:46 +03:00
Nikolay Amiantov
6b6768f455 communi: move to qmakeHook
This reverts commit 0fefa9939e.
2016-04-20 18:55:46 +03:00
Nikolay Amiantov
837c573f27 vacuum: move to qmake4Hook 2016-04-20 18:55:46 +03:00
Nikolay Amiantov
a6af80b421 telegram-qml: move to qmakeHook
This reverts commit c275fc610e.
2016-04-20 18:55:46 +03:00
Nikolay Amiantov
82bf15393d tdesktop: move to qmakeHook 2016-04-20 18:55:45 +03:00
Nikolay Amiantov
56b63b91b4 libqtelegram-aseman-edition: move to qmakeHook
This reverts commit 080b54d766.
2016-04-20 18:55:45 +03:00
Nikolay Amiantov
5faed29fa8 cutegram: move to qmakeHook
This reverts commit 7f4ab1cb72.
2016-04-20 18:55:45 +03:00
Nikolay Amiantov
46cf871c3d ricochet: move to qmakeHook 2016-04-20 18:55:45 +03:00
Nikolay Amiantov
87397b770c qtox: move to qmakeHook 2016-04-20 18:55:45 +03:00
Nikolay Amiantov
bab152826f arora: move to qmake4Hook 2016-04-20 18:55:45 +03:00
Nikolay Amiantov
ce47fb38d8 Merge pull request #14776 from avnik/fixes
wine && mumble -- Fixes for post multiple-output issues
2016-04-17 20:04:51 +04:00
Alexander V. Nikolaev
3ceeb22ea8 mumble: fix build after closure-size merge 2016-04-17 18:51:23 +03:00
Gabriel Ebner
4003d16d66 qutebrowser: 0.6.0 -> 0.6.1 2016-04-17 15:38:12 +02:00
Christian Lask
3053080335 neomutt: init at 20160416
With various tweaks by @cstrahan.

closes #14747
2016-04-15 23:52:29 -04:00
joachifm
001c28b63c Merge pull request #14738 from srp/irssi-description
irssi: add description
2016-04-16 05:02:48 +02:00
Pascal Wittmann
ea4f08a919 Merge pull request #14742 from mbakke/dwb
dwb: 2015-07-07 -> 2016-03-21
2016-04-15 23:12:31 +02:00
Marius Bakke
2500945b31 dwb: 2015-07-07 -> 2016-03-21 2016-04-15 21:26:17 +01:00
Scott R. Parish
31b478d692 irssi: add description
This will make it show up if people search for 'irc'
2016-04-15 11:20:14 -07:00
aszlig
cf3f891369
linssid: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of linssid
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of linssid and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
0fefa9939e
communi: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of communi
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of communi and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
7f4ab1cb72
cutegram: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of cutegram
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of cutegram and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
c275fc610e
telegram-qml: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of telegram-qml
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of telegram-qml and it now successfully compiles on
my machine.

Built it using the following command, because it wasn't exposed via the
top-level packages attribute:

nix-build -E '
  with import ./. {};
  qt55.callPackage pkgs/applications/networking/instant-messengers/telegram/telegram-qml {
    libqtelegram-aseman-edition = qt55.callPackage pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition {};
  }
'

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
080b54d766
libqtelegram-aseman-edition: Add pre/postConfigure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of
libqtelegram-aseman-edition override the whole configurePhase, so this
hook isn't run at all.

This fixes the build of libqtelegram-aseman-edition and it now
successfully compiles on my machine.

Built it using the following command, because it wasn't exposed via the
top-level packages attribute:

nix-build -E '
  with import ./. {};
  qt55.callPackage pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition {}
'

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
Moritz Ulrich
6645ae3946 google-chrome: Also add ${deps}/lib64 to $LD_LIBRARY_PATH.
...as per @abbradar's suggestion. Thanks!
2016-04-14 19:00:15 +02:00
Moritz Ulrich
0c5ed43cd4 google-chrome: Fix regression from closure-size merge.
Fixes #14695

I'm not entirely sure if including `stdenv.cc.cc` in `makeLibraryPath`
is the correct thing to do here. If it's incorrect, please feel free to
ping me.
2016-04-14 18:54:48 +02:00
zimbatm
7081325518 slack: fixes
* Fixes missing stdlib rpath
* Removes unused share/lintian
* Fixes slack.desktop paths
2016-04-14 15:50:55 +01:00
joachifm
3d5e2c5569 Merge pull request #14688 from taku0/thunderbird-bin-45.0
thunderbird-bin: 38.7.2 -> 45.0
2016-04-14 14:43:31 +02:00
Nikolay Amiantov
04c67c316c ettercap: fix gdkconfig path 2016-04-14 14:46:23 +03:00
Nikolay Amiantov
755e4633c7 mass-replace glib and gtk lib/*/include paths 2016-04-14 04:13:54 +03:00
Nikolay Amiantov
8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
taku0
eb5c4fdadf thunderbird-bin: 38.7.2 -> 45.0 2016-04-14 03:48:44 +09:00
Michael Raskin
f99a9c0679 nspluginwrapper: add missing libXt build input 2016-04-13 19:10:42 +02:00
Michael Raskin
58d2649f70 baresip: 0.4.17 -> 0.4.18 2016-04-13 14:47:04 +02:00
Eelco Dolstra
18a6403c59 firefox-esr: 45.0.1esr -> 45.0.2esr
Also, switch to upstream SHA-512 hashes.
2016-04-13 14:11:18 +02:00
Nikolay Amiantov
5e025bc9ee vivaldi: fix evaluation 2016-04-13 14:03:41 +03:00
Nikolay Amiantov
a951fba574 discord: fix evaluation 2016-04-13 14:01:17 +03:00
Vladimír Čunát
39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Thomas Tuegel
275e2c2d55 Merge pull request #14639 from bendlas/update-dropbox-master
dropbox: 3.14.7 -> 3.18.1
2016-04-12 19:39:00 -05:00
joachifm
611a042bf8 Merge pull request #14630 from NeQuissimus/slack203fix
slack: Fix 2.0.3
2016-04-13 00:46:02 +02:00
Herwig Hochleitner
9aad4c884e dropbox: 3.14.7 -> 3.18.1 2016-04-12 23:49:14 +02:00
Herwig Hochleitner
971b6729a2 Revert "dropbox-cli: minor refactoring to play nice with dropbox"
Undo changes from PR #14077

It's not acceptable to just willy-nilly rename a CLI script. Also, that
PR broke the tray icon for dropbox.

This reverts commit afa4a27a25.
2016-04-12 23:46:00 +02:00
Tim Steinbach
b6c80ee36c slack: Fix 2.0.3 2016-04-12 10:50:43 -04:00
Franz Pletz
84edf81d71 firefox: 45.0.1 -> 45.0.2 2016-04-12 15:48:13 +02:00
taku0
c98cca3614 firefox-bin: 45.0.1 -> 45.0.2 (#14626) 2016-04-12 15:47:31 +02:00
Arseniy Seroka
e02debe165 Merge pull request #14291 from otwieracz/vivaldi
vivaldi-snapshot: init at 1.0.430.3
2016-04-12 08:52:37 +03:00
Pascal Wittmann
a2aec04abc Merge pull request #14601 from NeQuissimus/slack203
slack: 2.0.1 -> 2.0.3
2016-04-11 18:25:29 +02:00
Tim Steinbach
0dfcc687be slack: 2.0.1 -> 2.0.3 2016-04-11 11:12:50 -04:00
Nicolas Petton
a65c6f4932 skype: Use a larger icon for the .desktop file (#14591) 2016-04-11 13:35:55 +01:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Arseniy Seroka
7da3bba260 Merge pull request #14545 from elitak/wraith
wraith: init at 1.4.6
2016-04-09 09:39:13 +03:00
Eric Litak
8fe327a432 wraith: init at 1.4.6 2016-04-08 14:12:13 -07:00
Nikolay Amiantov
d45ac41e87 flashplayer: cleanup, add comment to maintainers 2016-04-08 17:18:54 +03:00
taku0
28232c3746 flashplayer: fix build on 32-bit platform 2016-04-08 16:55:51 +03:00
taku0
03e74fb117 flashplayer: 11.2.202.577 -> 11.2.202.616 2016-04-08 22:11:29 +09:00
Gabriel Ebner
ab58c22d6a Merge pull request #14528 from kragniz/qutebrowser-0.6.0
qutebrowser: 0.5.1 -> 0.6.0
2016-04-08 07:09:10 +02:00
Louis Taylor
21c78411da qutebrowser: 0.5.1 -> 0.6.0 2016-04-08 05:59:05 +01:00
joachifm
30e61aa444 Merge pull request #14507 from taku0/thunderbird-bin-38.7.2
thunderbird-bin: 38.7.1 -> 38.7.2
2016-04-07 23:07:38 +02:00
Vladimír Čunát
d1df28f8e5 Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
georgewhewell
679dc0e707 putty: 0.66 -> 0.67 2016-04-07 11:38:42 +00:00
Slawomir Gonet
c6345de9f9 vivaldi: init at 1.0 2016-04-07 08:05:53 +02:00
taku0
8be8b6c713 thunderbird-bin: 38.7.1 -> 38.7.2 2016-04-06 23:37:50 +09:00
Arseniy Seroka
f059af932a Merge pull request #14491 from nico202/telegram-cli
telegram-cli: 2015-07-30 -> 2016-03-23
2016-04-06 11:41:35 +03:00
=
cfad82119b telegram-cli: 2015-07-30 -> 2016-03-23 2016-04-06 09:43:25 +02:00
joachifm
bed0ee3e26 Merge pull request #14400 from ldesgoui/master
discord: init at 0.0.1
2016-04-06 00:15:24 +02:00
Vladimír Čunát
2dd01bdeb1 liferea: maintenance update 1.10.18 -> 1.10.19 2016-04-05 23:31:48 +02:00
Arseniy Seroka
33c2134bf2 Merge pull request #14453 from markWot/fix/conkeror-update
conkeror: 1.0pre-20150730 -> 1.0pre-20160130
2016-04-05 19:33:10 +03:00
Louis Taylor
81e23c5ab1 mutt: update sidebar patch 2016-04-05 16:33:35 +02:00
Louis Taylor
14cb8a7a58 mutt: 1.5.24 -> 1.6.0 2016-04-05 16:33:35 +02:00
Markus Wotringer
90624dcf89 conkeror: 1.0pre-20150730 -> 1.0pre-20160130 2016-04-05 14:34:42 +02:00
ldesgoui
f2a88f89c6 discord: init at 0.0.1 2016-04-05 13:17:43 +02:00
Brian McKenna
b39fd4f97b hipchat: fix links being broken 2016-04-05 10:02:46 +10:00
joachifm
ad8857a81a Merge pull request #14367 from grahamc/xapian-sup-kiwix
Xapian: Remove 1.0, Upgrade 1.2, and pin bindings to php 5.6, Fix `sup`, and mark `Kiwix` as Broken
2016-04-04 22:53:47 +02:00
obadz
3a75ed4464 citrix-receiver: fix patchelf error during installPhase
Due to recent change in patchelf, it's now necessary to run chmod u+w
prior to running patchelf itself. Fixes #14440 for citrix-receiver
2016-04-04 15:44:26 +01:00
Graham Christensen
2ec1d2c738 sup: 0.20.0 -> 0.22.1 2016-04-04 07:42:38 -05:00
zimbatm
c317c8f28c Merge pull request #14423 from yokto/fix/psi
psi: fix remove psimedia and spellchecker
2016-04-03 15:05:54 +01:00
Silvio Frischknecht
4087e99886 psi: fix remove psimedia and spellchecker
spellchecker (aspell -> enchant)
2016-04-03 14:10:37 +02:00
Micxjo Funkcio
23fad46b76
owncloudclient: 1.7.1 -> 2.1.1 2016-04-02 19:02:54 -07:00
James Earl Douglas
1dae112bb0 irssi: 0.8.17 -> 0.8.19
This enables [SASL authentication][1], which was added in 0.8.18.

Tested via `nix-env -f /path/to/nixpkgs -i irssi`, followed by running
`irssi`.

[1]: https://wiki.archlinux.org/index.php/Irssi#Authenticating_with_SASL
2016-04-02 16:45:10 -06:00
joachifm
17f41a7996 Merge pull request #14336 from cstrahan/mesos-0-28
mesos: 0.27.1 -> 0.28.0
2016-04-01 16:35:54 +00:00
Eelco Dolstra
2f0195003e firefox-esr: Fix name
The Firefox wrapped called itself "firefox" rather than "firefox-esr".

Also eliminate a use of splitString which is evil and should never be
used.
2016-04-01 13:51:24 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Charles Strahan
f8f16b1a36 mesos: 0.27.1 -> 0.28.0 2016-03-31 04:17:19 -04:00
Tobias Geerinckx-Rice
57f4678bbb x2goclient: 4.0.5.0 -> 4.0.5.1 2016-03-31 02:53:31 +02:00
Nikolay Amiantov
1d24a7b6f8 tdesktop: init at 0.9.33 2016-03-30 22:22:51 +03:00
aszlig
ef753d210e
chromium: Update all channels to latest versions
Overview of the updated versions:

stable: 49.0.2623.87 -> 49.0.2623.110
beta:   50.0.2661.26 -> 50.0.2661.49
dev:    50.0.2661.18 -> 51.0.2693.2

Most notably, this includes a series of urgent security fixes:

 * CVE-2016-1646: Out-of-bounds read in V8. Credit to Wen Xu from
                  Tencent KeenLab.
 * CVE-2016-1647: Use-after-free in Navigation. Credit to anonymous.
 * CVE-2016-1648: Use-after-free in Extensions. Credit to anonymous.
 * CVE-2016-1649: Buffer overflow in libANGLE. Credit to lokihardt
                  working with HP's Zero Day Initiative / Pwn2Own.
 * CVE-2016-1650: Denial of service in PageCaptureSaveAsMHTMLFunction

The official release announcement with details about these fixes can be
found here:

http://googlechromereleases.blogspot.de/2016/03/stable-channel-update_24.html

Beta and stable could be also affected, although I didn't do a detailed
check whether that's the case.

As this introduces Chromium 51 as the dev version, I had to make the
following changes to make it build:

 * libexif got removed, so let's do that on our end as well.
   See https://codereview.chromium.org/1803883002 for details.
 * Chromium doesn't seem to compile with our version of libpng, so let's
   resort to the bundled libpng for now.
 * site_engagement_ui.cc uses isnan outside of std namespace, so
   we're fixing that in postPatch using sed.

I have successfully built all versions on i686-linux and x86_64-linux
and tested it using the VM tests.

Test reports can be found at the following evaluation of my Hydra:

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

Thanks to @grahamc for reporting this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: Graham Christensen <graham@grahamc.com>
Fixes: #14299
2016-03-30 15:24:39 +02:00
Eelco Dolstra
ca983ec20c thunderbird: 38.7.0 -> 38.7.1 2016-03-30 11:32:40 +02:00
Pascal Wittmann
51135d803a bitlbee: 3.4.1 -> 3.4.2 2016-03-29 21:17:30 +02:00
Arseniy Seroka
d4c4a81022 Merge pull request #14298 from obadz/minor-upgrades
Minor upgrades
2016-03-29 16:30:35 +03:00
obadz
b48a6fea80 google-drive-ocamlfuse: 0.5.18 -> 0.5.22 2016-03-29 14:10:00 +01:00
taku0
dc73280d19 thunderbird-bin: 38.6.0 -> 38.7.1 2016-03-29 09:19:34 +09:00
Frederik Rietdijk
2636fcf7cd fix license 2016-03-28 14:24:06 +02:00
Frederik Rietdijk
2b10296637 Merge pull request #13858 from leenaars/blinkqt
python-sipsimple: 2.6.0 -> 3.0.0 (with all dependencies)
2016-03-28 14:18:33 +02:00
aszlig
f9fff51c2a
chromium: Link using gold linker flags
I originally wanted to do this a long time (a31301d) but IIRC back then
it didn't compile. Nowadays with the splitup of the gold linking flags
and the binutils integration, it's merely just a switch to flip, so
let's do that.

Only tested it by building against the current Chromium stable version
on 64bit, because right now builds on Hydra seem to time out (because of
this?) anyway so we have nothing to lose here.

The linking time was hereby reduced from >30 minutes (I didn't measure
it exactly but looked half an hour later to the build progress and it
was *still* linking) to about a few seconds, which I guess is even
though the measurement is quite bogus a tremendous improvement
nonetheless.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-28 11:41:13 +02:00
Michael Raskin
891fa19e29 Fix Midori build 2016-03-28 00:02:10 +02:00
Nikolay Amiantov
5e985c42d6 cutegram: fix playing media files 2016-03-27 21:36:39 +03:00
Nikolay Amiantov
78b75b8ecd cutegram: fix meta information and parallel building 2016-03-27 18:53:54 +03:00
Domen Kožar
b07e7bfc7b Merge remote-tracking branch 'origin/staging' 2016-03-27 13:19:04 +01:00
Nikolay Amiantov
3819384395 skype: small cleanup 2016-03-27 11:57:46 +03:00
Vladimír Čunát
ec4685cf70 firefox-esr: fix build after 574a6d34d2
We're now using only newer versions that have ./configure in the root.
${pname} isn't the correct directory name for esr versions.
2016-03-26 09:13:58 +01:00
Eelco Dolstra
574a6d34d2 firefox-esr: 38.6.1 -> 45.0.1 2016-03-25 15:03:31 +01:00
Eelco Dolstra
79d6dc91fe firefox: 45.0 -> 45.0.1 2016-03-25 15:00:50 +01:00
Arseniy Seroka
61fc93b432 telegram-purple: init at 2016-03-17 2016-03-23 19:22:58 +03:00
Graham Christensen
aba56e7f59 vacuum: port to mkDerivation, add zlib for hydra failure 2016-03-23 09:24:55 -05:00
Greyson Fischer
7fe888e521 slack: init at 2.0.1 2016-03-23 11:29:18 +03:00
Arseniy Seroka
f809c4a8d1 Merge pull request #14077 from peterhoeg/dropbox_cli
dropbox-cli: minor refactoring to play nice with dropbox
2016-03-23 11:21:03 +03:00
Thomas Tuegel
8e3a1a8d3e Merge pull request #14118 from zimbatm/quassel-for-real
quassel: fix sources
2016-03-22 09:03:47 -05:00
joachifm
4f0324f766 Merge pull request #14116 from otwieracz/utox
utox: 0.5.0 -> 0.7.0, libtoxcore: 20160131 -> 20160319
2016-03-22 13:01:43 +00:00
zimbatm
23b9d037de quassel: fix sources
Fixes changes after #14080 where the updated hash was missing.

Put the source in a common file so there is only one place to update.
2016-03-22 12:10:22 +00:00
Slawomir Gonet
eddb7a55f8 utox: 0.5.0 -> 0.7.0, libtoxcore: 20160131 -> 20160319 2016-03-22 08:42:07 +01:00
aszlig
4d305102e0
google-chrome: Fix fetching upstream binary
Commit aa097946d2 only fixed evaluation.

Ssince 37dbd62 however, the fetchurl call is already implied so just
changing the path will still result in fetchurl (fetchurl ...), so let's
drop the outer fetchurl.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @msteen, @benley
2016-03-21 16:15:18 +01:00
Vladimír Čunát
aa097946d2 chrome: fix evaluation after 6041cfe2af 2016-03-21 12:04:33 +01:00
aszlig
96a9c23f49
Merge branch 'chromium-source-refactor'
Fixes #12794 by reverting the source tree splitup (c92dbff) to use the
source tarball directly into the main Chromium derivation and making the
whole source/ subdirectory obsolete. The reasons for this are explained
in 4f981b4f84.

This also now renames the "sources.nix" file to "upstream-info.nix",
which is a more proper name for the file, because it not only contains
"source code" but also the Chrome binaries needed for the proprietary
plugins (of course "source" could also mean "where to get it", but I
wanted to avoid this ambiguity entirely).

I have successfully built and tested this using the VM tests.

All results can be found here:

https://headcounter.org/hydra/eval/313435
2016-03-21 04:10:06 +01:00
aszlig
5ebd629c6f
chromium: Fix comment of upstream-info.nix
As of 6041cfe, the upstream-info.nix (back then it was called
sources.nix) is no longer in the source/ subdirectory, so we need to fix
that comment to say that the file is autogenerated from update.sh in the
*same* directory.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 23:10:13 +01:00
Pascal Wittmann
e5343cd9e6 bitlbee: write pid file to /var/lib/bitlbee/bitlbee.pid
Previously it was written to /var/lib/bitlbee.pid but on
NixOS the user bitlbee has no write access to /var/lib/.
2016-03-20 21:23:53 +01:00
aszlig
fb65a0048a
chromium: Revert working around --sysroot filter
This reverts commit 5979946c41.

I have tested this by building against the stable version of Chromium
and it seems to compile just fine, so it doesn't seem to be needed
anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 21:05:49 +01:00
zimbatm
3f909d8f64 Revert "quassel: 0.12.2 -> 0.12.3"
This reverts commit f2e051b29e.
2016-03-20 19:38:05 +00:00
zimbatm
f2e051b29e quassel: 0.12.2 -> 0.12.3 2016-03-20 19:33:53 +00:00
aszlig
1f497204f7
chromium: Show status about precompiling .py files
Only a aesthetics thingy, but also corrects the comment, because we're
essentially precompiling .py files, NOT the .pyc files (the latter are
the results).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 18:44:56 +01:00
aszlig
4f981b4f84
chromium: Move source/default.nix into common.nix
This addresses #12794 so that we now have only a single tarball where we
base our build on instead of splitting the source into different outputs
first and then reference the outputs.

The reason I did this in the first place is that we previously built the
sandbox as a different derivation and unpacking the whole source tree
just for building the sandbox was a bit too much.

As we now have namespaces sandbox built in by default we no longer have
that derivation anymore. It still might come up however if we want to
build NaCl as a separate derivation (see #8560), but splitting the
source code into things only NaCl might require is already too much work
and doesn't weight out the benefits.

Another issue with the source splitup is that Hydra now has an output
limit for non-fixed-output derivations which we're already hitting.

Tested the build against the stable channel and it went well, but I
haven't tested running the browser.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 17:50:17 +01:00
aszlig
37dbd62a83
chromium: Move fetchurl calls to getChannel
We always do something like "fetchurl channelProduct", so let's move it
to getChannel directly so we can avoid those fetchurl calls all over the
place.

Also, we can still access subattributes from the fetchurl call if we
need to, so there really is no need to expose the product's attributes
directly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 17:13:44 +01:00
aszlig
4984a2bf76
chromium/plugins: Break long line
Yes, I know I'm a bit nitpicky, but lines >80 chars are very ugly if you
have two windows side-by-side.

Thus no feature changes here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 17:07:28 +01:00
aszlig
985df3900d
chromium/common.nix: Remove unreferenced attrs
We're going to refactor things anyway, so let's first get rid of
everything that's not used anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 17:01:58 +01:00
zimbatm
f48cde5b74 quassel: 0.12.2 -> 0.12.3 2016-03-20 15:55:17 +00:00
aszlig
6041cfe2af
chromium/source: Move update.nix to parent dir
We now should have only the default.nix left in the source directory and
we can start to factor out the pieces into the Chromium main derivation
attributes.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 16:53:08 +01:00
aszlig
2d9a604907
chromium: Rename sources.nix to upstream-info.nix
The "sources.nix" also contains information about where to get binary
packages, so calling it "upstream-info.nix" fits better in terms of
naming.

Also, we're moving it away from the sources dir, because the latter will
soon vanish.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 16:48:54 +01:00
aszlig
d6b11ed722
chromium/source: Move patches into its own subdir
We're going to reference the patches in the Chromium main build rather
than applying it to the sources. So as a first step, this should keep
the patches away from the "source" subdirectory so we can make it flat.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 16:44:34 +01:00
leenaars
d8cae4d0cb blink: added icon and updated license 2016-03-20 15:36:03 +01:00
Peter Hoeg
afa4a27a25 dropbox-cli: minor refactoring to play nice with dropbox
We were previously getting collissions for the following
2 files with files from the dropbox package:

 - bin/dropbox
 - share/applications/dropbox.desktop

As a consequence the binary has been renamed to dropbox-cli and
the .desktop removed as it is redundant.
2016-03-20 21:16:49 +08:00
Pascal Wittmann
de8cc270c1 filezilla: 3.16.0 -> 3.16.1 2016-03-19 11:20:12 +01:00
taku0
9aa6ca99e4 firefox-bin: 45.0 -> 45.0.1 2016-03-19 14:28:10 +09:00
Tobias Geerinckx-Rice
87ca9b9629 lynx: use full version, ‘official’ URI & lib.optionals 2016-03-18 08:03:48 +01:00
joachifm
0c0ed5824a Merge pull request #13989 from puffnfresh/package/hipchat
hipchat: 2.2.1388 -> 4.0.1631
2016-03-18 00:02:41 +00:00
Brian McKenna
411b4a1df1 hipchat: 2.2.1388 -> 4.0.1631 2016-03-18 10:47:03 +11:00
Eelco Dolstra
aa6ab92d93 thunderbird: 38.6.0 -> 38.7.0
Lots of security fixes: https://www.mozilla.org/en-US/security/known-vulnerabilities/thunderbird/#thunderbird38.7
2016-03-17 13:24:39 +01:00
Tuomas Tynkkynen
13eee8e593 Merge pull request #13960 from hrdinka/fix/communi-desktop
communi: fix .desktop file's `Exec` path
2016-03-16 17:07:53 +02:00
Christoph Hrdinka
1f51e3b8af communi: fix .desktop file's Exec path
Changes `Exec` in `communi.desktop` from `/usr/bin/communi` to
`$out/bin/communi`.
2016-03-16 15:30:01 +01:00
Vladimír Čunát
9be0c7d463 firefox: disable optimization hack (i686-linux)
It seems to build fine even without it, so the original reason doesn't
hold anymore:
https://github.com/NixOS/nixpkgs/commit/f4b5671b0d9e8904a4ad6b3fd85268
2016-03-16 10:05:09 +01:00
joachifm
cdd78ce133 Merge pull request #13874 from joachifm/transmission-cli
transmission: build transmission-cli
2016-03-14 10:25:25 +00:00
Edward Tjörnhammar
7da494b8ae qtox: 1.2.4 -> 1.3.0 2016-03-13 21:36:30 +01:00
宋文武
93feb5d115 drop my maintainership (close #13881) 2016-03-13 18:39:01 +01:00
aszlig
c6834ab527
Merge pull request #13821 (update chromium)
This is just a minor upgrade, even though the commit message says it's
to major version 50. However, the CVEs listed there are for real, see
the following announcement:

http://googlechromereleases.blogspot.de/2016/03/stable-channel-update_8.html

The summary of updated packages:

stable: 49.0.2623.75 -> 49.0.2623.87
beta:   49.0.2623.75 -> 50.0.2661.26
dev:    50.0.2661.11 -> 50.0.2661.18

I've also added two commits, fixing the chdir() in the updater and
shutting up Python precompilation errors during the preBuild phase.

Tested on my Hydra at:

https://headcounter.org/hydra/eval/312166
2016-03-13 12:23:22 +01:00
aszlig
a62f100ec3
chromium/update.sh: Allow to be called out-of-tree
Changing the working directory to
pkgs/applications/networking/browsers/chromium is a bit annoying, so
let's make sure the script can be called from anywhere.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-13 12:22:18 +01:00
aszlig
f7e2171937
chromium/common: Shut up about precompiling .pyc's
The errors are completely non-fatal and only cause a particular file to
be not precompiled. Unfortunately this can lead to confusion to whether
these errors are real errors or not, so let's shut it up completely
because they're *not* real errors.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-13 12:22:18 +01:00
Joachim Fasting
4393e6f619 transmission: build transmission-cli
As of version 2.92, transmission-cli is no longer built by default (it
is deprecated).  This breaks the bittorrent vmtest.  For now, explicitly
enable the cli.
2016-03-13 07:08:01 +01:00
Michiel Leenaars
6db4b907b8 blinkqt: 1.4.1 -> 2.0.0 2016-03-12 22:33:00 +01:00
Domen Kožar
2d38f13f4c Merge pull request #13836 from kevincox/mesos-sh
mesos: Patch more executable paths.
2016-03-11 19:27:07 +00:00
Eelco Dolstra
dd53c65dcc Merge remote-tracking branch 'origin/gcc-5' into staging
Still some breakage but no blockers:

http://hydra.nixos.org/eval/1242130?filter=x86_64-linux&compare=1237852&full=#tabs-now-fail
2016-03-11 16:02:38 +01:00
Kevin Cox
8b7adf808e mesos: Patch more executable paths. 2016-03-11 09:23:48 -05:00
Vladimír Čunát
4c0125bc8f chromium: fixup plugins with multiple outputs
Chromium+flash seem to work fine now.
2016-03-11 15:10:51 +01:00
Eelco Dolstra
0d6d91739f firefox: 44.0.2 -> 45.0 2016-03-11 15:10:05 +01:00
Eelco Dolstra
d25135ff6e thunderbird: Fix hash
Commit 4a54794d18 upgraded Thunderbird's
version to 38.6.0 (accidentally?), but didn't change the hash. This
wasn't caught due to tarballs.nixos.org being keyed on hash only.
2016-03-11 13:47:37 +01:00
Eelco Dolstra
4f5d48abf5 thunderbird: Fix build on gcc 5
It was barfing due to --enable-stdcxx-compat. Not clear if/why we
still need this, so let's disable it. If necessary a fix is available
at https://bugzilla.mozilla.org/show_bug.cgi?id=1153109.
2016-03-11 13:46:27 +01:00
taku0
218901bdb6 flashplayer: 11.2.202.559 -> 11.2.202.577 2016-03-11 10:11:08 +09:00
Graham Christensen
e54434751a chromium: 49.0.2626.75 -> 50.0.2661.26 for CVE-2016-1643 CVE-2016-1644 CVE-2016-1645 2016-03-10 14:57:29 -06:00
Thomas Tuegel
f21ed7a86a Merge pull request #13814 from Profpatsch/quassel-static
quasselDaemon: option for static linking
2016-03-10 10:00:41 -06:00
Profpatsch
8871c6fabc quasselDaemon: option for static linking 2016-03-10 15:17:07 +01:00
Graham Christensen
b87ebf2b62 pidgin-otr: 4.0.1 -> 4.0.2 for CVE-2016-2851 2016-03-09 17:20:36 -06:00
Arseniy Seroka
2c8d8d83d7 Merge pull request #13773 from taku0/firefox-bin-45.0
firefox-bin: 44.0.2 -> 45.0
2016-03-09 17:21:58 +03:00
Robin Gloster
937574a206 Merge pull request #13771 from zimbatm/remove-rq
rq: package removed
2016-03-09 08:22:17 +01:00
taku0
153468aa5e firefox-bin: 44.0.2 -> 45.0 2016-03-09 09:06:42 +09:00
zimbatm
0ced8f386c rq: package removed
rq only compiles with ruby 1.8 which we don't distribute anymore.

the source is dead.

there is a 1.9 branch over https://github.com/pjotrp/rq that hasn't been
touched for 4 years.
2016-03-08 21:36:59 +00:00
Ricardo M. Correia
19b92ce265 Merge pull request #13762 from hrdinka/update/transmission
transmission: 2.90 -> 2.92
2016-03-08 16:59:54 +01:00
joachifm
236eb55b08 Merge pull request #13752 from mboes/fix-spark-hash
spark: Fix tarball hash.
2016-03-08 15:01:40 +00:00
Christoph Hrdinka
c5695bc8be transmission: 2.90 -> 2.92 2016-03-08 15:40:17 +01:00
Christoph Hrdinka
48dde66cd7 communi: fix output paths 2016-03-08 13:35:03 +01:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Mathieu Boespflug
6cf1853f29 spark: Fix tarball hash.
Maybe tarball changed upstream. Who knows.

Fixes #13703
2016-03-07 23:16:26 +01:00
joachifm
046e5011b4 Merge pull request #13691 from AndersonTorres/cutegram
Cutegram: add qtimageformats (for sticker support)
2016-03-07 14:10:08 +00:00
Christoph Hrdinka
d3e3b135ea pidgin: fix gstreamer plugin path
Closes #13722, fixes #13719 and maybe #10556.
2016-03-07 07:03:49 +01:00
joachifm
dca363b9a0 Merge pull request #13381 from kevincox/mesos-0.27.1
Mesos: 26.0 -> 27.1
2016-03-06 14:44:26 +00:00
Kevin Cox
ee9b151f5b marathon: 0.15.1 -> 0.15.3 2016-03-06 08:05:26 -05:00
Kevin Cox
2843d83905 Mesos: 26.0 -> 27.1 2016-03-05 22:49:48 -05:00
aszlig
8b97ca270e
chromium: Update all channels to latest versions
Overview of the updated versions:

stable: 48.0.2564.116 -> 49.0.2623.75
beta:   49.0.2623.63  -> 49.0.2623.75
dev:    50.0.2657.0   -> 50.0.2661.11

Stable and beta are now in par because of the release of a major stable
update.

The release addresses 26 security vulnerabilities, the following with an
assigned CVE:

 * CVE-2016-1630: Same-origin bypass in Blink. Credit to Mariusz
                  Mlynski.
 * CVE-2016-1631: Same-origin bypass in Pepper Plugin. Credit to Mariusz
                  Mlynski.
 * CVE-2016-1632: Bad cast in Extensions. Credit to anonymous.
 * CVE-2016-1633: Use-after-free in Blink. Credit to cloudfuzzer.
 * CVE-2016-1634: Use-after-free in Blink. Credit to cloudfuzzer.
 * CVE-2016-1635: Use-after-free in Blink. Credit to Rob Wu.
 * CVE-2016-1636: SRI Validation Bypass. Credit to Ryan Lester and
                  Bryant Zadegan.
 * CVE-2015-8126: Out-of-bounds access in libpng. Credit to
                  joerg.bornemann.
 * CVE-2016-1637: Information Leak in Skia. Credit to Keve Nagy.
 * CVE-2016-1638: WebAPI Bypass. Credit to Rob Wu.
 * CVE-2016-1639: Use-after-free in WebRTC. Credit to Khalil Zhani.
 * CVE-2016-1640: Origin confusion in Extensions UI. Credit to Luan
                  Herrera.
 * CVE-2016-1641: Use-after-free in Favicon. Credit to Atte Kettunen of
                  OUSPG.

The full announcement which also includes the link to the bug tracker
can be found here:

http://googlechromereleases.blogspot.de/2016/03/stable-channel-update.html

Also, the 32bit Chrome package needed for the Flash and Widevine plugins
doesn't exist anymore, because Google has dropped support for 32bit
distros, see here for the announcement:

https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/FoE6sL-p6oU

On our end, we need to fix the patch for the plugin paths to work for
the latest dev channel. The change is very minor, because the
nix_plugin_paths_46.patch only doesn't apply because of an iOS-related
ifdef.

Built and tested on my Hydra at:

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

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #13665
2016-03-05 22:53:13 +01:00
AndersonTorres
af85404412 Cutegram: add qtimageformats (for sticker support)
This commit adds preliminary sticker support for Cutegram.
2016-03-05 11:41:39 -03:00
aszlig
c3d82f0fbf
chromium/updater: Fix eval error on stdenv.is32bit
There is no stdenv.is32bit, so let's just use !stdenv.is64bit.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-05 03:16:26 +01:00
aszlig
8d5accb691
chromium/updater: Fix getting latest versions
Comparing the current version with the version in sources list and
accidentally swapping the version arguments isn't going to get very far
because every new version that will come up will then be treated as "we
already have that version".

So we're now using versionOlder and also a check whether the version is
the *same* as the one in sources.nix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-05 02:55:00 +01:00
Graham Christensen
ca6108a2a1 wireshark: 2.0.0 -> 2.0.2 for: CVE-2016-2521 CVE-2016-2522 CVE-2016-2523 CVE-2016-2524 CVE-2016-2525 CVE-2016-2526 CVE-2016-2527 CVE-2016-2528 CVE-2016-2529 CVE-2016-2531 CVE-2016-2532 2016-03-04 13:31:31 -06:00
Bruno Bzeznik Bruno.Bzeznik@imag.fr
15c4167d28 kanif: init at 1.2.2 2016-03-04 12:22:29 +01:00
Lancelot SIX
95f22a6fb5 pkgs.taktuk: fix remote url 2016-03-04 10:30:42 +01:00
Lancelot SIX
f689bc9629 Merge pull request #13656 from bzizou/taktuk
taktuk: init at 3.7.5
2016-03-04 10:27:19 +01:00
Bruno Bzeznik Bruno.Bzeznik@imag.fr
92e86f03b0 taktuk: init at 3.7.5 2016-03-04 10:11:08 +01:00
Arseniy Seroka
dfbf0b27a4 Merge pull request #13497 from AndersonTorres/cutegram
cutegram: 2.7.0 -> 2.7.1
2016-03-03 09:04:17 +03:00
AndersonTorres
14aa382f03 cutegram: 2.7.0 -> 2.7.1
And some minor changes
2016-03-03 02:21:31 -03:00
AndersonTorres
f70ba914ef telegram-qml: 0.9.1 -> 0.9.2 2016-03-03 02:19:07 -03:00
AndersonTorres
bd71f511e5 libqtelegram-aseman-edition: 6.0 -> 6.1 2016-03-03 02:18:07 -03:00
Pascal Wittmann
ba7b5ad530 filezilla: 3.15.0.2 -> 3.16.0 2016-03-02 23:14:31 +01:00
Pascal Wittmann
369ede9235 mcabber: 1.0.1 -> 1.0.2 2016-03-02 22:37:14 +01:00
Derek Gonyeo
f681ceb593 uzbl: version 20120514 -> v0.9.0 2016-03-01 23:15:26 -05:00
Luca Bruno
5f8311775c chromium: add StartupWMClass to desktop file. Fixes #12433 2016-02-29 20:42:58 +01:00
Thomas Tuegel
5947f565ed Merge pull request #13049 from bendlas/update-dropbox-master
dropbox: 3.12.6 -> 3.14.7
2016-02-29 11:16:36 -06:00
Domen Kožar
756604cc08 transmission: 2.84 -> 2.90 2016-02-29 13:08:33 +00:00
zimbatm
69ce5cb656 use the sourceforge mirrors everywhere
find pkgs -name "*.nix" -exec sed -r \
    "s|https?://downloads.sourceforge.net/|mirror://sourceforge/|g" -i {} \;
2016-02-28 12:07:42 +00:00
Graham Christensen
4a54794d18 xara: broken due to patch-tracker.debian.org being missing. 2016-02-27 16:13:47 -06:00
zimbatm
90525b718f Merge pull request #11141 from cresh/darwin-msmtp
msmtp: Enable on OS X with Keychain integration.
2016-02-27 00:02:53 +00:00
aszlig
54b4912566
chromium: Regenerate sources.nix with new updater
No changes in functionality, but to make future source updates a bit
easier on the eyes when viewing the diff.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-02-26 20:55:17 +01:00
aszlig
28b289efa6
chromium: Refactor updater entirely in Nix
The update.sh shell script now is only a call to nix-build, which does
all the hard work of updating the Chromium source channels and the
plugins. It results in a store path with the new sources.nix that
replaces the already existing sources.nix.

Along the way, this has led to a quite massive workaround, which abuses
MD5 collisions to detect whether an URL is existing, because something
like builtins.tryEval (builtins.fetchurl url) unfortunately doesn't
work. Further explanations and implementation details are documented in
the actual implementation.

The drawback of this is that we don't have nice status messages anymore,
but on the upside we have a more robust generation of the sources.nix
file, which now also should work properly on missing upstream
sources/binaries.

This also makes it much easier to implement fetching non-GNU/Linux
versions of Chromium and we have all values from omahaproxy available as
an attribute set (see the csv2nix and channels attributes in the update
attribute).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-02-26 20:55:17 +01:00
aszlig
716b79d3a5
chromium: Provide SHA256s for beta/dev plugins
As stated in the parent commit, the 32bit Chrome package is not
available upstream, so let's at least provide the SHA256 hash for the
64bit package.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-02-26 10:55:51 +01:00
aszlig
459642b8de
chromium/updater: Allow a single plugin arch
Until now, if we have a failure to fetch either the 32bit Debian package
or the 64bit Debian package, neither of these will be put into
sources.nix.

Unfortunately the beta/dev channels do not have a 32bit Debian package,
so even though there is a 64bit Debian package available we don't get
plugins *at* *all*.

This also introduces a nicer error message rather than just failing with
an assertion in fetchurl because we did not provide url/urls.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-02-26 10:55:51 +01:00
zimbatm
30891166be Merge pull request #11997 from benley/google-chrome-variants
google-chrome: add -beta and -unstable variants
2016-02-26 00:13:00 +00:00
Graham Christensen
712d59225e chromium{,Beta,Dev}: 48.0.2564.97 -> 48.0.2564.116
From the debian security mailing list:

Several vulnerabilities have been discovered in the chromium web browser.

CVE-2016-1622

    It was discovered that a maliciously crafted extension could bypass
    the Same Origin Policy.

CVE-2016-1623

    Mariusz Mlynski discovered a way to bypass the Same Origin Policy.

CVE-2016-1624

    lukezli discovered a buffer overflow issue in the Brotli library.

CVE-2016-1625

    Jann Horn discovered a way to cause the Chrome Instant feature to
    navigate to unintended destinations.

CVE-2016-1626

    An out-of-bounds read issue was discovered in the openjpeg library.

CVE-2016-1627

    It was discovered that the Developer Tools did not validate URLs.

CVE-2016-1628

    An out-of-bounds read issue was discovered in the pdfium library.

CVE-2016-1629

    A way to bypass the Same Origin Policy was discovered in Blink/WebKit,
    along with a way to escape the chromium sandbox.
2016-02-25 12:00:12 -06:00
Austin Seipp
4da1711988 nixpkgs: bittorrentSync20 2.3.0 -> 2.3.3
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-02-24 22:28:16 -06:00
Austin Seipp
a2d1cbd019 nixpkgs: bittorrentSync20 2.2.7 -> 2.3.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-02-24 22:23:49 -06:00
Arseniy Seroka
c84f56e3d3 Merge pull request #12344 from hrdinka/update/znc
Update and add new ZNC modules
2016-02-24 18:57:17 +03:00
zimbatm
fa46b448d7 Merge pull request #13019 from tg-x/qtox
qtox: 20151221 -> 1.2.4, libtoxcore-dev: 20160105 -> 20160131
2016-02-23 22:52:09 +00:00
zimbatm
7848d215f4 Merge pull request #13094 from nathan7/chromium-flash-version-jq
chromium/plugins: use jq for extracting the Flash version
2016-02-23 22:45:42 +00:00
Frederik Rietdijk
40ca841c5c Merge pull request #13124 from FRidh/buildPythonApplication
buildPythonApplication: use new function for Python applications
2016-02-23 16:02:10 +01:00
Franz Pletz
82ac1d952e Revert "gajim: Add python-axolotl for OMEMO plugin"
This reverts commit c3c5622817.
2016-02-23 00:36:43 +01:00
Franz Pletz
c3c5622817 gajim: Add python-axolotl for OMEMO plugin 2016-02-22 04:56:15 +01:00
zimbatm
a6ce937ba1 Merge pull request #13162 from taku0/thunderbird-bin-38.6.0
thunderbird-bin: 38.5.1 -> 38.6.0
2016-02-21 14:26:09 +00:00
taku0
ce763e2d66 thunderbird-bin: 38.5.1 -> 38.6.0 2016-02-21 22:16:26 +09:00
Vladimír Čunát
045164bdf8 Merge #12973: add rrsync as an individual app 2016-02-21 10:00:43 +01:00
Vladimír Čunát
b4ac8fb39b (r)rsync: simplify and don't copy maintainers
Let's keep the original rsync maintainers only on rsync,
as I haven't noticed them wanting to maintain rrsync as well.
2016-02-21 09:59:49 +01:00
Guillaume Maudoux
9eb6372c6b teamviewer: fix wrong in sed usage 2016-02-20 14:02:38 +01:00
Arnold Krille
c3b4dd920b rsync/rrsync: less code duplication
- refactor the common parts all into the base.nix
- add myself as maintainer
2016-02-20 11:59:50 +01:00
Aneesh Agrawal
17aefb1460 weechat: make language plugins optional, fixes #13092
They're still enabled by default, but now can be disabled.

Python has not been made optional due to the additional complexity of:
  - python2 vs python3
  - pync support on Darwin
Making Python support optional should be revisited at another time.
2016-02-19 22:56:29 +01:00
Pascal Wittmann
8b06e2fab1 filezilla: 3.14.1 -> 3.15.0.2 2016-02-19 22:50:28 +01:00
Arseniy Seroka
24a536f77d Merge pull request #13126 from zimbatm/ricochet-1.1.2
ricochet: 1.1.1 -> 1.1.2
2016-02-19 22:53:42 +03:00
zimbatm
883b788ab0 ricochet: 1.1.1 -> 1.1.2 2016-02-19 14:18:48 +00:00
Frederik Rietdijk
4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Nathan Zadoks
2610986991 chromium/plugins: use jshon for extracting the Flash version from JSON 2016-02-19 12:31:08 +01:00
Mathieu Boespflug
936312879c spark: 1.4 -> 1.6. 2016-02-18 18:29:44 +01:00
Herwig Hochleitner
ebe983824b dropbox: 3.14.5 -> 3.14.7 2016-02-17 16:25:01 +01:00
tg(x)
d03c73a228 utox: 7e290747 -> 0.5.0 2016-02-17 15:43:53 +01:00
Vladimír Čunát
e9520e81b3 Merge branch 'master' into staging 2016-02-17 10:06:31 +01:00
Herwig Hochleitner
a0661f84f0 dropbox: 3.12.6 -> 3.14.5
Also updates qt5 dependency to qt55, as per release notes: https://www.dropboxforum.com/hc/en-us/community/posts/205672126-Release-Candidate-3-14-5
2016-02-16 21:19:20 +01:00
Nikolay Amiantov
7fd2cc1ea8 liferea: update upstream tarball 2016-02-16 19:35:58 +03:00
zimbatm
97bbc37b6f rekonq: fix homepage url 2016-02-16 14:11:36 +00:00
Damien Cassou
1f909b51ac Merge pull request #13025 from DamienCassou/update-backintime-1.1.12
backintime: 1.1.6 -> 1.1.12
2016-02-16 13:33:43 +01:00
Damien Cassou
5bb3ac70c6 backintime: 1.1.6 -> 1.1.12 2016-02-16 13:25:46 +01:00
zimbatm
a6ac8d7915 Merge pull request #13020 from colemickens/fix-widevine
chromium/plugins: Fix widevine substitution
2016-02-16 10:14:16 +00:00
Cole Mickens
a5a5c1d9cd chromium/plugins: Fix widevine substitution
Fixes: #12840
Related to: 61042a5

61042a5 changes the replaced token from $something to @something@. This
commit repeats that change in one additional location used by the
WideVine plugin
2016-02-15 18:04:16 -08:00
Arseniy Seroka
6b205a9eba Merge pull request #12988 from colemickens/cfdyndns
cfdyndns: init at 0.0.1
2016-02-16 00:24:32 +03:00
Cole Mickens
c7571611dc cfdyndns: init at 0.0.1 2016-02-15 12:54:04 -08:00
Samuel Rivas
d72fad9ee4 spark: export the assembly to /share/java, fixes #11961
So that we can compile applications that depend on spark
2016-02-15 21:26:03 +01:00
Samuel Rivas
704e923ad5 spark: reduce default shell log verbosity 2016-02-15 21:26:03 +01:00
Samuel Rivas
d213089a25 spark: 1.4.0 -> 1.5.2 2016-02-15 21:26:03 +01:00
Pascal Wittmann
b9db5a9574 Merge pull request #12792 from kamilchm/marathon
marathon: 0.14.1 -> 0.15.1
2016-02-15 15:05:11 +01:00
Charles Strahan
8b94aaf081 Merge pull request #12572 from kevincox/mesos-upgrade
mesos: 0.23.0 -> 0.26.0
2016-02-14 20:04:01 -05:00
tg(x)
7b91d708af qtox: 20151221 -> 1.2.4, libtoxcore-dev: 20160105 -> 20160131 2016-02-15 01:15:41 +01:00
Michael Raskin
874721defa baresip: 0.4.16 -> 0.4.17 2016-02-14 21:17:07 +01:00
Kevin Cox
d5ed1637b6 mesos: 0.23.0 -> 0.26.0
Update mesos to 0.26.0 and build with SSL support.
2016-02-14 08:22:47 -05:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Franz Pletz
99b43a25dd Merge pull request #12907 from tg-x/irssi-otr
irssi-otr: 640e98c74b -> 1.0.1
2016-02-13 18:21:25 +01:00
Arnold Krille
243c336022 rsync: Add rrsync as individual app
Extract the rsync source fetching into its own expression and use that
expression to fetch the same source for rsync and rrsync.

rrsync is just copied from the support folder of rsync, no configure or build
needed. Also none of the rsync patches are needed. Only the path to rsync needs
to be patched into rrsync.
2016-02-13 17:52:54 +01:00
tg(x)
d12399f3f5 irssi-otr: 1.0.0 -> 1.0.1 2016-02-13 05:50:17 +01:00
tg(x)
0137d4c6ff irssi-otr: fetchFromGithub 2016-02-12 18:43:45 +01:00
Franz Pletz
bb55126965 Merge pull request #12933 from mayflower/pkgs_upstream/nntp-proxy
nntp-proxy: init at 2014-01-06 (0358e7a)
2016-02-12 08:26:29 +01:00
Franz Pletz
657c56678c firefox-esr: 38.5.2esr -> 38.6.1esr 2016-02-12 08:02:31 +01:00
Franz Pletz
70925f0a92 firefox: 44.0 -> 44.0.2 2016-02-12 08:02:24 +01:00
Franz Pletz
b276f4f171 Merge pull request #12945 from taku0/firefox-bin-44.0.1
firefox-bin: 44.0.1 -> 44.0.2
2016-02-12 07:55:54 +01:00
taku0
6d3f909975 firefox-bin: 44.0.1 -> 44.0.2 2016-02-12 10:15:23 +09:00
Tristan Helmich
f8d0ba7447 nntp-proxy: init at 2014-01-06 (0358e7a) 2016-02-11 16:24:48 +01:00
Arseniy Seroka
885acea1dd Merge pull request #12891 from taku0/firefox-bin-44.0.1
firefox-bin: 44.0 -> 44.0.1
2016-02-11 16:57:20 +03:00
Pascal Wittmann
2b8e9cb72e Merge pull request #12917 from dasuxullebt/fix/ssvnc-perl
Bugfix: ssvnc had a hard dependency on /usr/bin/perl which is now rep…
2016-02-10 20:42:10 +01:00
Eelco Dolstra
aea262f654 Fix misspelled meta.maintainers attributes 2016-02-10 14:59:50 +01:00
Your Name
aeee493704 Bugfix: ssvnc had a hard dependency on /usr/bin/perl which is now replaced 2016-02-10 10:48:51 +01:00
tg(x)
91ac4fc0a4 irssi-otr: 640e98c74b -> 1.0.0 2016-02-10 00:02:21 +01:00
Vladimír Čunát
177464ade9 wrapFirefox: add enableAdobeReader
So far we only have 32-bit package.
It will be silently missed on 64-bit ATM.
2016-02-09 18:21:40 +01:00
taku0
74270469db firefox-bin: 44.0 -> 44.0.1 2016-02-10 00:03:00 +09:00
Kamil Chmielewski
55b7f03e3b marathon: 0.14.1 -> 0.15.1 2016-02-09 11:45:06 +01:00
Vladimír Čunát
a115bff08c Merge branch 'master' into staging 2016-02-07 13:52:42 +01:00
Christoph Hrdinka
c737ee5aba znc: delete 1.4 2016-02-06 13:51:23 +01:00
Christoph Hrdinka
9423951609 znc-playback: init at git-2015-08-04 2016-02-06 13:51:23 +01:00
Christoph Hrdinka
bc63d669f5 znc-clientbuffer: init at git-2015-08-27 2016-02-06 13:51:23 +01:00
Christoph Hrdinka
0765936b63 znc-privmsg: c9f98690be -> git-2015-02-22 2016-02-06 13:51:23 +01:00
Christoph Hrdinka
41480ae67b znc-fish: 8e1f150fda -> git-2014-10-10 2016-02-06 13:51:23 +01:00
Christoph Hrdinka
ce4bd7bbc6 znc-push: 1.0.0 -> git-2015-12-07 2016-02-06 13:51:23 +01:00
Vladimír Čunát
54299b60c4 Merge #12779: Mass replace pkg}/bin-style strings
... to refer to correct outputs
2016-02-03 17:25:22 +01:00
Vladimír Čunát
d3a3aa8674 Merge #12740: multiple outputs for Qt 5 and KDE 5 2016-02-03 17:09:09 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Guillaume Maudoux
9f358f809d Configure a default trust store for openssl 2016-02-03 12:42:01 +01:00
Jos van den Oever
ba8b7fff6a davmail: 4.7.0 -> 4.7.1
Bugfix release, mainly for Carddav regression over EWS, also includes an NTLM support enhancement.

Enhancement:
- Improve NTLM support try to send hostname as workstation name instead of UNKNOWN
- Fix notification dialog message
- Prepare ExchangeSessionFactory refactoring
- Fix typo in french translation
- Fix broken Sourceforge link in About dialog

Carddav:
- Carddav: fix regression on contact update with empty field triggering DeleteItemField

(cherry picked from commit cf327c3dcfd442cea4368d76c59f72dcd5da6768)

[Bjørn: Cherry-picked from release-15.09 to master. (I guess merging
first to release-15.09 was a mistake.)]
2016-02-02 19:25:43 +01:00
aszlig
61042a5b6a
chromium/plugins: Use @var@ for passing variables
There is already a pull request from @colemickens, who has just reversed
the variable references $flash and $flashVersion but the fix is kinda
fragile as he points out himself in #12713.

The reason the wrong substition was made is that both variables begin
with the same name and we do a simple replace instead of a more
complicated one using builtins.match.

So staying simple but to still not raising issues with other variables
that begin with the same name I'm now using @var@ instead, like we use
in substituteAll and other substituters (like the ones in CMake or
autotools) deal with it.

Note that I'm not using $var$ here to make sure it doesn't get confused
with real shell variables.

So with this fix in place, the wrapper now has the following flags:

  --ppapi-flash-path=/nix/store/.../lib/libpepflashplayer.so
  --ppapi-flash-version=20.0.0.294

Previously we had (#12710):

  --ppapi-flash-path=/nix/store/.../lib/libpepflashplayer.so
  --ppapi-flash-version=/nix/store/...-binary-plugins-flashVersion

Thanks to @colemickens for reporting and putting up a pull request.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #12710
Fixes: #12713
2016-02-02 17:39:08 +01:00
aszlig
ff90f52375
chromium: Remove import-from-derivation again
This reverts commit f7af2272a2.

We're going to fix #12710 properly by reintroducing 38c77bb and fixing
the shell variable substitution.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-02-02 17:39:08 +01:00
Domen Kožar
0b3becb269 Merge pull request #12701 from mayflower/builder-def-cleanup
builderDefsPackage cleanup
2016-02-01 21:09:34 +00:00
Tuomas Tynkkynen
13b3f3f246 treewide: Mass replace 'openssl}/bin' to refer the 'bin' output 2016-02-01 20:46:16 +02:00
Tobias Geerinckx-Rice
c55c909e56 liferea: 1.10.17 -> 1.10.18
This is a maintenance release that brings the following changes:
- Fixes #287: media:content support broken
- Fixes #279: Rules not visible in searchdialog
- Fixes #83: Segfault when sorting feeds in folder
- Fixes #302: Broken compilation with --disable-notify
2016-02-01 19:39:18 +01:00
Franz Pletz
1026673f37 firefox: 43.0.4 -> 44.0 2016-02-01 18:10:47 +01:00
Tony White
8491d0d1ca chromium: 47.0.2526.106 - > 48.0.2564.97
- Fixes CVE-2016-1612 CVE-2016-1613 CVE-2016-1614 CVE-2016-1615
  CVE-2016-1616 CVE-2016-1617 CVE-2016-1618 CVE-2016-1619 CVE-2016-1620.
- Moves chromium stable and beta channels up one version major.
  vcunat made dev channel stay for now, as it wouldn't download otherwise.
  This is most of PR #12717.
2016-02-01 12:12:07 +01:00
Thomas Tuegel
2f4087b13d google-talk-plugin: udev -> libudev 2016-01-31 21:15:03 -06:00
Franz Pletz
8ec3bce8f8 links: Remove package & deprecate for links2
This package is deprecated and superseeded by links2 which also provides the
links binary this maintaining backwards-compatibility.

Debian removed links back in 2008:

  https://packages.qa.debian.org/l/links.html

Fixes #12623.
2016-01-31 11:46:35 +01:00
Vladimír Čunát
f7af2272a2 Revert "chromium: Do not rely on import-from-derivation"
This reverts commit 38c77bb72c.
In this form it causes problems #12710.
2016-01-31 10:03:57 +01:00
Robin Gloster
ecc580f379 carrier: deleted pidgin fork
not updated in >5 years and broken build
2016-01-30 20:31:03 +00:00
Franz Pletz
ead58a86ba clawsMail: 3.13.1 -> 3.13.2 (security fix) 2016-01-30 21:16:22 +01:00
Arseniy Seroka
f8c1d61f12 Merge pull request #12673 from kamilchm/marathon
marathon: 0.8.1 -> 0.14.1
2016-01-30 21:45:32 +03:00
Franz Pletz
562a41e696 Merge pull request #12584 from nathanielbaxter/dev/teamspeak
teamspeak client: bump 3.0.18.1 -> 3.0.18.2
2016-01-30 17:10:16 +01:00
Franz Pletz
90f987718c Merge pull request #12689 from obadz/citrix
citrix-receiver: 13.2.1 -> 13.3.0
2016-01-30 15:48:34 +01:00
Pascal Wittmann
13e13c38cd mcabber: 1.0.0 -> 1.0.1 2016-01-29 22:33:47 +01:00
Kamil Chmielewski
40eaffdc1b marathon: 0.8.1 -> 0.14.1 2016-01-29 18:31:13 +01:00
taku0
85f5394c5f firefox-bin: 43.0.4 -> 44.0 2016-01-27 23:34:42 +09:00
Nikolay Amiantov
5bc8f09b65 Merge pull request #12577 from zohl/flashplayer
Standalone flashplayers
2016-01-26 00:49:02 +03:00
Tobias Geerinckx-Rice
9fb8020e4e Add version attribute where maintainers |= nckx
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
Al Zohali
d9066cd36f flashplayer-standalone: init at 11.2.202.559 2016-01-24 19:29:02 +03:00
Tuomas Tynkkynen
d91c7347d1 treewide: Mass replace 'openssl}/lib' to refer the 'out' output 2016-01-24 10:03:38 +02:00
Tuomas Tynkkynen
dc8e939dbc treewide: Mass replace 'cups}/lib' to refer the 'out' output 2016-01-24 10:03:33 +02:00
Nathaniel Baxter
e800e5bb11 teamspeak client: bump 3.0.18.1 -> 3.0.18.2 2016-01-24 13:11:27 +11:00
Tobias Geerinckx-Rice
32d40f0f98 Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +01:00
Gabriel Ebner
889a05ea5b qutebrowser: 0.5.0 -> 0.5.1 2016-01-22 14:19:23 +01:00
Vladimír Čunát
0957359568 Merge branch 'staging' 2016-01-22 13:48:35 +01:00
Thomas Tuegel
52c0b3f33c Merge pull request #12471 from FRidh/konversation
kde5.konversation: init at 1.6
2016-01-22 06:21:24 -06:00
obadz
c6ff65ca5a citrix-receiver: 13.2.1 -> 13.3.0 2016-01-22 12:21:07 +00:00
Frederik Rietdijk
721a091fb1 kde5.konversation: init at 1.6
Currently we have `kde4.konversation` which is version 1.5 of
Konversation.
This adds `kde5.konversation` which is version 1.6 and builds
against the latest KDE Frameworks 5.
2016-01-22 11:23:24 +01:00
Arseniy Seroka
48ea0c5e45 Merge pull request #12494 from simonvandel/qbittorrent-3.3.2
qbittorrent: 3.3.1 -> 3.3.3
2016-01-21 23:47:24 +03:00
Simon Vandel Sillesen
71ab92a396 qbittorrent: 3.3.1 -> 3.3.3 2016-01-21 19:15:04 +01:00
Vladimír Čunát
3317eef084 Merge #12414: qutebrowser: fix various things 2016-01-21 11:56:50 +01:00
Domen Kožar
91dd974d7c Merge pull request #12517 from kragniz/weechat-1.4
weechat: 1.3 -> 1.4
2016-01-21 10:37:58 +01:00
Louis Taylor
fb30e5fccd weechat: 1.3 -> 1.4 2016-01-21 07:20:39 +00:00
Tobias Geerinckx-Rice
8871de95f5 fuze: remove dead package
Last maintained in 2013. Building fails due to vanished sources.
Upstream has the following to say:

  “As of February 11th 2015, Fuze will no longer support a native
   Linux-based client. This means that any customers attempting to
   install or use our previous Linux client will be unable to do
   so. There are currently no plans to create an updated version
   of the Linux client for Fuze. For Linux based customers that
   still wish to use Fuze, we recommend that you try our browser
   client.” -- https://support.fuze.com/hc/en-us/articles/201527877-Does-Fuze-Support-Linux-

Never marked as broken, but has been so for quite some time.
2016-01-19 21:36:23 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Franz Pletz
501f9166b1 Merge pull request #12407 from jgillich/chats
xmpp-client, ricochet
2016-01-18 15:15:59 +01:00
Robin Gloster
53b389327e refactor to use autoreconfHook where possible
Close #12446.
2016-01-18 10:45:31 +01:00
taku0
fba7544812 firefox-bin: wrap firefox-bin (close #12416) 2016-01-18 10:42:57 +01:00
Vladimír Čunát
620c147cce Merge branch 'master' into staging 2016-01-18 09:48:49 +01:00
aszlig
85dd89f6eb
chromium: Remove myself from maintainers
Working on Chromium really drives me nuts due to its build time, also I
really don't have quite a lot of time these days to properly maintain it
anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-18 03:35:28 +01:00
aszlig
38c77bb72c
chromium: Do not rely on import-from-derivation
This has been introduced by me in 690a845 and discovered by @vcunat in
his comment over at:

690a845de9 (commitcomment-14209868)

It's really a bit ugly to have builds running during evaluation, but
back when I made that commit the reason was to avoid having to shell
quote the hell out of it (see the comment in mkPluginInfo for the
reason).

Now we propagate plugin flags and environment variables as a list of
arguments in a plain file that's appended verbatim to makeWrapper, so
it shouldn't do any builds anymore during instantiation.

I have tested this with both just WideVine and just Flash enabled as
well as both in combination and none of the plugins and the output seems
correct. However I didn't test to run Chromium with the new
implementation.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: Vladimír Čunát <vcunat@gmail.com>
2016-01-18 03:35:28 +01:00
Nikolay Amiantov
00eeae1179 gajim: add extraPythonPackages option
For exampole, this allows to add python-axolotl to PYTHONPATH,
which is needed for OMEMO OTR messaging plugin.
2016-01-17 22:24:14 +03:00
Jakob Gillich
6a24c20744 ricochet: add desktop file, cleanups
closes #11979, #11974
2016-01-16 08:23:59 +01:00
Gabriel Ebner
23b3e6430e qutebrowser: 0.4.1 -> 0.5.0
Fixes #8568 by using the release tarballs.
2016-01-16 07:23:44 +01:00
Gabriel Ebner
dbd3a5ff20 qutebrowser: use correct plugin versions
Since PyQt uses Qt 5.5, we need to use the Qt plugins from 5.5 as well,
and gstreamer plugins from 1.0.
2016-01-16 07:23:44 +01:00
Tobias Geerinckx-Rice
4a860b8fbf copy-com: remove deprecated Nix-specific alias 2016-01-16 04:56:08 +01:00
Vladimír Čunát
2d0893088f Merge branch 'master' into staging 2016-01-15 13:43:57 +01:00
Vladimír Čunát
c29df5f8a7 firefox: fixup ${name} problems introduced in 2e78e19
Fixes #12403. I'm sorry for the problems. Thanks to @mdorman!
2016-01-15 13:32:36 +01:00
Vladimír Čunát
98218971c2 Merge #12299: make firefox-like browsers wrapped by default 2016-01-15 08:53:58 +01:00
Vladimír Čunát
2e78e19de0 firefox: put "unwrapped" into its name
I'm not certain about this, so I'm trying for firefox only.
Rationale: it might be confusing to see two firefox-${version} instances
in logs or paths, so I wanted to differentiate them.
2016-01-15 08:36:22 +01:00
Vladimír Čunát
a8f1d40c1f all-packages: browserWrapper -> browser
- I chose to keep `browser-unwrapped` attributes so that it's much
  easier to override parameters for the browser (through `packageOverrides`).
- Aliases `browserWrapper` are retained for now, as usual.
2016-01-15 08:36:08 +01:00