Commit Graph

3713 Commits

Author SHA1 Message Date
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