Commit graph

1608 commits

Author SHA1 Message Date
Vladimír Čunát
7af694700c Merge branch 'master' into x-updates
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
2013-06-05 12:59:47 +02:00
Lluís Batlle i Rossell
2e6c1ebf42 Revert "firefox update to 21.0"
This reverts commit 971337a119.
2013-05-31 20:45:10 +02:00
Rob Vermaas
298f8fc459 Added bro 2.1 2013-05-30 18:13:50 +02:00
Rob Vermaas
7c3c250a2c Add snort-2.9.4.6 2013-05-30 15:05:39 +02:00
Domen Kozar
03d4faa703 bittorrentSync: fix hash 2013-05-30 13:30:43 +02:00
Lluís Batlle i Rossell
2599ec692b gnunet-svn: slight update
For not any special reason
2013-05-30 09:56:30 +02:00
Vladimír Čunát
25471803e4 Merge master into x-updates 2013-05-29 23:25:26 +02:00
Vladimír Čunát
b770365574 ReRevert Merge x-updates into master
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
2013-05-29 23:25:02 +02:00
Lluís Batlle i Rossell
971337a119 firefox update to 21.0 2013-05-29 21:50:02 +02:00
Lluís Batlle i Rossell
2e3f53ed27 mumble: making hydra build it 2013-05-28 08:50:44 +02:00
Moritz Ulrich
2f1ab6b21b Update bittorrent-sync to 1.0.134 2013-05-28 00:50:05 +02:00
Lluís Batlle i Rossell
bb66651d68 gnunet: removing 0.8
I don't think anyone uses it. Feel free to revert, otherwise.
2013-05-27 23:35:35 +02:00
Lluís Batlle i Rossell
42701dece8 Adding gnunet-svn and libgcrypt-git.
gnunet-svn can't interoperate with gnunet.
2013-05-27 23:35:34 +02:00
aszlig
2ad7c40a66
gajim: Optional support for notifications.
Actually, Gajim can use notifications through dbus if notification-daemon is
available. Otherwise it falls back to notify-python, which is why I disabled it
by default, especially because upstream support of that Python library isn't
especially awesome ;-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-05-27 10:18:01 +02:00
aszlig
f273e7629e
gajim: Add support for LaTeX markup.
This needed a bit of patching the paths to the latex and dvipng executables.

In addition, we also address a small bug by using sed:

tmpfd, tmppng = mkstemp(prefix='gajim_tex', suffix='.png')
tmpfd.close()

This obviously won't work, because mkstemp() actually returns a file descriptor
_number_ and not a Python file object.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-05-27 10:18:00 +02:00
aszlig
bdedaae691
gajim: Enable SRV support using drill from ldns.
Use a patch from Arch Linux to use drill instead of nslookup. The primary reason
for this is because nslookup is in bind, and we don't want to depend on the
whole bind package just for the sake of supporting SRV lookups.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-05-27 10:18:00 +02:00
aszlig
f966e5268f
chromium: Update all channels to latest versions.
This brings in Chromium 27 as the new stable version.

Specific versions of the updated channels:

stable: 26.0.1410.63 -> 27.0.1453.93 (builds fine, tested)
beta:   27.0.1453.81 -> 28.0.1500.20 (builds fine, tested)
dev:    28.0.1500.11 -> 29.0.1516.3  (builds fine, tested)

We now can finally drop the following patches:

 * glibc-2.16-use-siginfo_t.patch
 * pulseaudio_array_bounds.patch

These were for version 26 only and thus are no longer needed.

In addition, we no longer have to use the pre/post attributes, as there is just
_one_ place that uses version specific stuff (path to webcore.gyp).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-05-27 10:18:00 +02:00
aszlig
e7a57971c1
chromium: Switch build system to ninja.
Wanted to do this a long time ago, but never had a reason to do it. But with
Chromium 29 having no make target for chrome_sandbox, we now use ninja as well
as the official build and most other distributions.

The whole build/make flags cruft is now integrated into one buildPhase override
and we just call ninja there by exporting the specific variables.

And this also makes enableParallelBuilding obsolete, as we use NIX_BUILD_CORES
directly now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-05-27 10:17:59 +02:00
aszlig
bdeee9bcc4
chromium: Fix installing logo images.
Actually a "*[0-9]" wildcard isn't enough for some unrelated icons to slip into
the derivation output, so let's explicitely check again within the for loop.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-05-27 10:17:59 +02:00
aszlig
d7380bcdc7
gajim: Update gajim to version 0.15.4.
This fixes the following bugs:

 * traceback on decryption of OpenPGP-encrypted messages
 * remote_control: use GED in send_chat_message
 * gajim-0.15.3 can't connect to server without StartTLS support
 * "make check" fails with complaining on src/command_system/mapping.py
 * Account Wizard: Make text selectable
 * Gajim crashes in connect.py

Overview and details:

https://trac.gajim.org/query?status=closed&milestone=0.15.4

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-05-27 10:17:59 +02:00
aszlig
4535c0bbfe
gajim: Clean up and rewrite package expression.
This should clean up the package expression significantly by actually using
explicit input attributes and setting PYTHONPATH and GST_PLUGIN_PATH from
environment variables in the builder.

In addition, this adds a small patch from the upstream Mercurial repository to
add an index.theme to the icons, so Gajim is able to load them correctly from
the store.

With this change, I'm adding myself to the maintainers list as well, because I'm
switching over from TKabber to Gajim.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-05-27 10:17:58 +02:00
aszlig
f94d623ba8
gajim: Update to version 0.15.3.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-05-25 19:01:44 +02:00
aszlig
25b4b5aeb4
chromium: Update dev channel to v28.0.1500.11.
Build and tests successful on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-05-25 19:01:44 +02:00
Michael Raskin
4d9e7b2923 Fix NS plugin wrapper build 2013-05-23 17:32:04 +04:00
Bjørn Forsman
d6f7910722 wireshark: bump from 1.8.6 to 1.8.7 (security update) 2013-05-21 22:53:46 +02:00
Bjørn Forsman
af6503b2af wireshark: add desktop item
And fix a small "ethereal" typo.
2013-05-21 22:48:50 +02:00
Lluís Batlle i Rossell
dc28cdf721 umurmurd: update to 0.2.12
Support for 1.2.4 clients.
2013-05-21 16:15:36 +02:00
Eelco Dolstra
0979db0c19 thunderbird: Update to 17.0.6
Includes lots of security fixes.
2013-05-17 14:55:45 +02:00
aszlig
c06c636604
chromium: Add patch for user namespace sandboxing.
This patch adds support for unprivileged user namespaces found in kernel
versions 3.8.0 and later. In case of Nix, this is especially useful to prevent
having to set up setuid wrappers.

The implementation details about this patch can be found at the top of the file
"sandbox_userns.patch". My first attempt of creating this patch was by modifying
the SUID sandbox. Unfortunately this didn't work out well, because in the event
of a sandbox failure, the host zygote process waits for an answer of the inner
zygote with no timeout. Even if I'd have set a timeout, this would have been
very ugly, giving users which don't have unprivileged user namespaces a delay on
startup.

An alternative approach to the mentioned problem would be to use select() on the
host zygote, watching for changes stdout or stderr and the synchronization
socket. But even that approach isn't feasible because it requires a whole bunch
of even more patching.

Patch was tested with older kernels (3.2.x, 3.7.x) and kernels without user
namespace support enabled, where in case the feature is unavailable it reverts
back to the previous behaviour (no zygote sandbox, only seccomp BPF).

In order to support all Chromium channels, I manually changed the first hunk of
the patch to not include the starting context of the diff, because there is a
whitespace change in more recent versions of the Chromium source tree.

See SVN revision 199882 for the change (revert in this case) in detail:

http://src.chromium.org/viewvc/chrome?view=revision&revision=199882

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-05-16 21:03:07 +02:00
aszlig
0353c8225a
chromium: Don't repeat full paths in installPhase.
This is no feature change and only makes the installPhase look nicer and it now
doesn't exceed 80 characters in width anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-05-16 21:03:07 +02:00
aszlig
3fec0fed02
chromium: Update beta and dev channels.
This updates the following channels to the latest upstream versions:

beta: 27.0.1453.65 -> 27.0.1453.81 (builds fine, tested)
dev:  28.0.1485.0  -> 28.0.1500.5  (builds fine, tested)

For version 28, the reference to /usr/bin/gcc is now located in
third_party/WebKit/Source/core/core.gypi instead of the previous
third_party/WebKit/Source/core/core.gyp/core.gyp.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-05-16 21:03:06 +02:00
Eelco Dolstra
ea919f29a9 hipchat: Fix desktop item 2013-05-14 14:30:15 +02:00
Domen Kozar
f3855919f3 btsync: unredistributable 2013-05-13 00:05:06 +02:00
Evgeny Egorochkin
cef9ee5aab Merge pull request #513 from offlinehacker/firefox_libcanberra
firefoxWrapper: Add libcanberra gtk module to firefox
2013-05-11 14:29:38 -07:00
Bjørn Forsman
3b6a347bea wireshark: update homepage URL 2013-05-11 20:31:24 +02:00
Bjørn Forsman
8c108024ab wireshark: bump to version 1.8.6
Multiple vulnerabilities and many bugs have been fixed. See the release
notes for details:

  http://www.wireshark.org/docs/relnotes/wireshark-1.8.6.html
2013-05-11 20:31:13 +02:00
Domen Kozar
7044fd8e05 btsync: upgrade to 1.0.132 2013-05-11 09:31:25 +02:00
Evgeny Egorochkin
c3767704f4 KWebKitPart: new package 2013-05-10 05:03:54 +03:00
Jaka Hudoklin
09f342edc9 firefoxWrapper: Add libcanberra gtk module to firefox 2013-05-10 00:44:03 +00:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
1278859d31 Merge branch 'master' into x-updates
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Evgeny Egorochkin
083637896d Removing konq-plugins, since they have been included in kdebase in all KDE versions we have currently
packaged.
2013-05-07 10:18:35 +03:00
Phreedom
5603d11da8 Merge pull request #482 from coroa/notmuch-gpg2
notmuch: patch source to use full path of gpg2
2013-05-03 11:34:29 -07:00
Vladimír Čunát
8fc5fb6ecc Merge branch 'master' into x-updates 2013-05-01 08:14:15 +02:00
Vladimír Čunát
42f70220ef firefox20Pkgs: use system jpeg now
I was using this for a few days without a problem.
2013-05-01 07:48:35 +02:00
Domen Kozar
197ca4d677 add bittorrent sync 2013-04-27 18:43:43 +02:00
Peter Simons
00101b66fe filezilla: strip trailing whitespace 2013-04-26 22:40:40 +02:00
Peter Simons
41dc6930cd filezilla: cosmetic changes to meta section 2013-04-26 22:40:29 +02:00
Peter Simons
2451e405c2 filezilla: update build to latest version of sqlite 2013-04-26 22:39:20 +02:00
aszlig
e7b1dfdc39
chromium: Update beta and dev channels to latest.
This updates the channels to the following new versions:

beta: 27.0.1453.47 -> 27.0.1453.65 (builds fine, tested)
dev:  27.0.1453.47 -> 28.0.1485.0  (builds fine, tested)

As we now don't have any version below 26, this update drops all references to
all older versions as well.

In addition to that, the /usr/bin/gcc reference from:

third_party/WebKit/Source/core/core.gyp/core.gyp

Can now - starting at version 28 - be found in:

third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-04-26 08:10:45 +02:00
aszlig
47a14e3d36
google-talk-plugin: Update to version 3.17.0.0.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-04-26 08:10:44 +02:00
Vladimír Čunát
bde20f3e88 Merge branch 'master' into x-updates
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Jonas Hoersch
089404358d notmuch: patch source to use full path of gpg2
gets rid of the dependency on the old gnupg1. and enables decryption
even if the gpg binary is not in the users environment.

warning: i don't know whether the switch from gnupg1 to gnupg
introduces any incompatibilities. this is a works for me patch.
2013-04-22 10:39:48 +02:00
Lluís Batlle i Rossell
9d818bebd8 Fixing the startup script of freenet; I forgot the shebang 2013-04-21 10:59:20 +04:00
Vladimír Čunát
e8710f30e2 linphone: fix build via ignoring deprecations 2013-04-18 10:17:41 +02:00
Lluís Batlle i Rossell
cce9e298b8 Changing the source of skype4pidgin
This github fork works fine, while the previous (original) only segfaults.
2013-04-16 14:53:59 +02:00
Lluís Batlle i Rossell
9216b0598c Adding skype4pidgin. It crashes. 2013-04-16 14:53:59 +02:00
Lluís Batlle i Rossell
e60cb1713f pidgin: update to 2.10.7 2013-04-15 22:02:35 +02:00
Lluís Batlle i Rossell
37b1937704 pidgin-otr: update to 4.0.0 2013-04-15 21:35:26 +02:00
Michael Raskin
2974309fbd Merge pull request #461 from orbitz/bitlbee-3.2
Upgrade bitlbee to 3.2
2013-04-14 23:02:39 -07:00
Lluís Batlle i Rossell
50f3625f70 irssi-otr: updating to a fork more up to date 2013-04-13 18:27:47 +02:00
Lluís Batlle i Rossell
5f2a1806e5 Adding irssi-otr. 2013-04-13 17:17:47 +02:00
Lluís Batlle i Rossell
4837874840 gnunet: update to 0.9.5a (minor bugfixes) 2013-04-13 17:17:16 +02:00
Lluís Batlle i Rossell
9069b8152b freenet: adding a missing jar in the classpath
It was crashing while running, without it.
2013-04-13 15:24:28 +02:00
Lluís Batlle i Rossell
49d4d308d4 Adding freenet
I don't build freenet_ext or bcprov, I just take the jar.
Freenet irc people told me that freenet_ext barely changes and it's a hell to build.
2013-04-13 15:01:46 +02:00
aszlig
a3fce096af
chromium: Update all channels to latest versions.
stable:   26.0.1410.43              -> 26.0.1410.63 (builds fine, tested)
beta/dev: 27.0.1453.15/27.0.1453.12 -> 27.0.1453.47 (builds fine, tested)

This should bring beta and dev in par, as dev was older than the beta version.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-04-13 10:31:36 +02:00
Lluís Batlle i Rossell
dc50bd550a Adding fish (blowfish over irc) for irssi. 2013-04-13 01:35:16 +02:00
Lluís Batlle i Rossell
7b6a4238b1 silc-client: the irssi plugin segfaults on join, with current irssi.
I fix and make it build the standalone client.
2013-04-13 00:24:55 +02:00
Lluís Batlle i Rossell
2080202a34 silc_client: more url problems
It was harder to test, after nix-prefetch-url. Damn it.
2013-04-12 23:48:29 +02:00
Lluís Batlle i Rossell
a0bbfe59dd silc_client: error in url
I should test better before push.
2013-04-12 23:44:29 +02:00
Lluís Batlle i Rossell
acf2979d9c silc_client: Missing file 2013-04-12 23:41:09 +02:00
Lluís Batlle i Rossell
aaf0a34f2a Adding silc-client as irssi plugin
Alone, with its own irssi, doesn't build.
2013-04-12 21:39:07 +02:00
Eelco Dolstra
4adad458e7 Remove the "proprietary" license
We already had "unfree".
2013-04-12 14:37:50 +02:00
Malcolm Matalka
254b4a8a6c Upgrade bitlbee to 3.2 2013-04-12 07:39:58 +02:00
Shea Levy
1c2565a8ef Add hipchat messaging client
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-11 14:42:32 -04:00
Lluís Batlle i Rossell
57637d02da offrss: fixing crossbuilding, disabling podofo in that case 2013-04-10 18:26:42 +02:00
Eelco Dolstra
bfa358c76e firefox: Update to 20.0 2013-04-09 18:00:26 +02:00
aszlig
75e5cbde79
chromium: Update beta and dev channels.
beta: 26.0.1410.43 -> 27.0.1453.15 (builds fine and tested)
dev:  27.0.1448.0  -> 27.0.1453.12 (builds fine and tested)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-04-08 08:51:46 +02:00
Lluís Batlle i Rossell
77b62dd985 skype-call-recorder: I forgot another patch. grmbl 2013-04-05 17:53:35 +02:00
Lluís Batlle i Rossell
ad5b5bcf0a skype-call-recorder: fix expression and improve conferences
I missed a semicolon; I also add an upstream patch about
improving the hosted conferences support:
abd67f1d44
2013-04-05 16:11:03 +02:00
Lluís Batlle i Rossell
d5a036d63d Adding Skype Call Recorder. 2013-04-05 16:03:25 +02:00
Moritz Ulrich
f49becb7a6 Merge branch 'master' into dropbox-py
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>

Conflicts:
	pkgs/top-level/all-packages.nix
2013-04-04 00:18:48 +02:00
Alexander Tsamutali
e42014eb5a conkeror: Update to 1.0pre-20130401. 2013-04-03 22:48:17 +04:00
Moritz Ulrich
f071e856d3 Fix platform note in dropbox-cli
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-03-27 20:56:46 +01:00
Moritz Ulrich
ff953e211e New package: dropbox-cli
dropbox-cli, part of dropbox-nautilus is a small self-contained python
script to control the dropbox daemon.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-03-27 20:12:58 +01:00
aszlig
d5c8419823
chromium: Update all channels to latest versions.
stable: 25.0.1364.152 -> 26.0.1410.43 (builds fine, tested)
beta:   26.0.1410.28  -> 26.0.1410.43 (builds fine, tested)
dev:    26.0.1410.28  -> 27.0.1448.0  (build fixed and tested)

For version 27, this introduces a new dependency on libXtst and removes the
patch for siginfo_t and the pulseaudio array bounds error.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-27 00:26:56 +01:00
aszlig
432e0f869c
chromium: Remove patch for CLONE_DETACHED.
This patch was introduced before (7e5109a) the stdenv-updates merge and is no
longer needed, as the current C library doesn't use this flag anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-27 00:26:56 +01:00
aszlig
adfc5939a7
chromium: Fix updater for version 26 and newer.
The updater was actually getting the -lite version, which our expression won't
build with, except if we switch some bundled dependencies to those in nixpkgs.

Of course the problem with fetching version 27 was me being stupid and using a
case statement in the updater, as if there won't be any version after 26 ;-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-27 00:26:55 +01:00
Sander van der Burg
d4642465ab dropbox: add x86 support 2013-03-26 16:39:03 +01:00
Peter Simons
b08ba87b36 rsync: add meta.license attribute 2013-03-25 12:44:22 +01:00
Florian Friesdorf
9f7aef51ea Revert "chromium-25.0.1364.172, 26.0.1410.40, 27.0.1448.0"
This reverts commit 6617f5ca9e.

The old situation was definitely better. Sorry for waiting so long for
the revert.
2013-03-25 07:17:20 +01:00
Florian Friesdorf
c93aebb87e get iptraf to compile 2013-03-24 14:44:10 +01:00
Florian Friesdorf
6617f5ca9e chromium-25.0.1364.172, 26.0.1410.40, 27.0.1448.0
26.0.1410.28 was broken for me
2013-03-23 18:20:38 +01:00
Lluís Batlle i Rossell
4144141c7b Fixing the teamviewer evaluation and builds.
Now tested even the tarball, before committing.
2013-03-22 16:16:37 +01:00
Lluís Batlle i Rossell
fb7b910aa3 Fixing tarball (missed assertion) 2013-03-22 12:55:01 +01:00
Lluís Batlle i Rossell
d716731cf4 teamviewer: adding a work-in-progress lowprio version 8.
It requires root running a daemon, just to use the client. Suspicious.
2013-03-22 12:41:16 +01:00
Lluís Batlle i Rossell
6f64c0c6d6 teamviewer: fixing broken wine reference 2013-03-22 12:17:05 +01:00
Lluís Batlle i Rossell
930ace150b Adding teamviewer client for linux (www.teamviewer.com)
In fact it uses wine.
2013-03-22 12:10:50 +01:00
Lluís Batlle i Rossell
470a015950 transmission: nicer about disabling gtk 2013-03-17 22:30:42 +01:00
Lluís Batlle i Rossell
51528e61d9 transmission: update to 2.77, but leave the old 2.60 for its gtk client
The gtk client in 2.61 and above require a gtk3 we don't have in nixpkgs yet.
2013-03-17 22:27:55 +01:00
Rok Garbas
464fd741cd notmuch: update to 0.15.2 2013-03-17 15:13:53 +01:00
Lluis Batlle
8d76cf51bb elinks: allow building without guile
Guile doesn't build on armv5tel now (failing an important test),
so better if I can disable it for elinks.
2013-03-16 13:39:30 +01:00
Eelco Dolstra
098190c9dd firefox: Update to 19.0.2 2013-03-15 14:31:25 +01:00
Vladimír Čunát
9ac8a16277 vimprobable2, surf: fix the settings-schemas problem
Note that they still segfault.
2013-03-14 16:01:53 +01:00
Paolo Capriotti
03e6a6f85f Add patch to fix build for bip. 2013-03-12 18:23:55 +00:00
Rok Garbas
859c7dfae8 msmtp: Update to 1.4.30, added optional libraries as dependency and point to correct license 2013-03-10 21:17:17 +01:00
Eelco Dolstra
674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
aszlig
5ae408b618
chromium: Update all channels to latest versions.
This updates all release channels to the latest versions:

stable: 25.0.1364.97 -> 25.0.1364.152 (builds fine, untested)
beta:   26.0.1410.12 -> 26.0.1410.28  (builds fine, tested)
dev:    26.0.1410.12 -> 26.0.1410.28  (builds fine, tested)

Still, we should have version 27 already for the dev channel, so we might look
about where to find the newest tarball.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-07 10:24:18 +01:00
Vladimír Čunát
bd6165645a Merge pull request #341 from bjornfor/transmission-version-bump
transmission: bump from 2.52 to 2.60
2013-03-03 05:18:54 -08:00
Vladimír Čunát
d7abc31f5a fix the last master merge, sorry for the problems
Now I carefully re-merged all the conflicts and tested some builds.
Hopefully it's all OK now.
2013-03-02 22:34:37 +01:00
Vladimír Čunát
da71b6d579 rekonq: update
Note it won't build with kde 4.7 and newer versions even require 4.9
which we don't have yet (4.10 is the current upstream).
2013-03-02 14:44:51 +01:00
Vladimír Čunát
26af997d41 Merge branch 'master' into stdenv-updates
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
Eelco Dolstra
56d197ab0b firefox: Update to 19.0.1
And use --with-system-nss again.
2013-03-01 13:52:10 +01:00
Vladimír Čunát
4cf8fa5f8a centerim: fix from debian 2013-02-28 15:11:03 +01:00
aszlig
4f4dc40099
flashplayer-11: Add missing rpath to libnss.
This was missing in the previous update as well, and no one seemed to notice it,
including myself? Anyway, it's now fixed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:24:41 +01:00
aszlig
3423ea9e7b
chromium: Remove version 24 specific stuff.
This gets rid of the patch for newer pulseaudio library versions.

In addition, we now have protobuf and pciutils in default dependencies, as those
are required (or better: optional, but recommended and thus activated by the
default gyp options) by versions >= 25.

Also, we now no longer depend on libpng, but I'm not dropping this, as we want
to get back to libpng from nixpkgs again 'real soon'.

The stack-protector flag is now disabled by default accross all versions, and
probably didn't hurt back in version 24, but at least we're now no longer add it
dependant on a particular version.

And those pesky post/onlyXX version booleans are now pre/postXX, to ensure
better clarity.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:16:50 +01:00
aszlig
b3c3579172
chromium: Update stable channel to v25.0.1364.97.
So, after searching for days in the wrong spot, eventually discovering that
postPatch isn't run on Hydra, we're now set to move forward to version 25, YAY!

Build has been tested locally (not that this would mean anything for Hydra, as
we've seen) and the output has been actively used for browsing by me :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:16:50 +01:00
aszlig
3254c0ac29
chromium: Add /dev/null to patches list.
This is needed in order to ensure that the postPatch hook is executed, which is
not when the patches list is empty.

It is fixed by 82f94df719 in stdenv-updates.
So as soon as the branch gets merged, we can get rid of this hack as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:16:50 +01:00
aszlig
80af8871de
flashplayer-11: Update to version 11.2.202.273.
This version contains another set of security fixes, details are described here:

http://www.adobe.com/support/security/bulletins/apsb13-08.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:16:49 +01:00
aszlig
28eff71465
Revert "chromium: Force -fno-stack-protector..."
This reverts commit b7cbb4da11.

The main reason behind this - apart from looking ugly - is that it didn't really
solve anything, see:

http://hydra.nixos.org/build/4198299

So, we need a different and less hacky approach...

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:16:49 +01:00
aszlig
0a43ce41de
chromium: Update dev and beta channels.
So, chromium 25 is now stable, so we really need to get the build fixed on Hydra
as soon as possible. And let's hope without nasty workarounds.

This commits updates dev and beta channels to version 26.0.1410.12, because
version 27.0.1423.0 seems to be unavailable right now. Build is running
successfully on my machine, and the browser works as well on the sites I usually
visit.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:16:49 +01:00
Eelco Dolstra
5509f3beec wireshark: Update to 1.8.5
CVE-2013-1582, CVE-2013-1586, CVE-2013-1588, CVE-2013-1590
2013-02-27 15:07:28 +01:00
Bjørn Forsman
586a93178e transmission: bump from 2.52 to 2.60
2.60 is the newest of the gtk2-compatible versions. (Transmission >=
2.61 requires gtk3.)

* Add inotify as input to not have transmission-daemon poll the torrent
  auto-load directory.
* Add file as input to fix a small build time issue (non-fatal).
* Remove unneeded gtk configure flags (support is auto-detected).
* icon-theme.cache is only generated when building with gtk, so use
  rm -f to not error out when building without gtk.
* Use gtk ? null instead of gtkClient flag because it is simpler.

Build and runtime tested with and without gtk support.
2013-02-27 13:45:41 +01:00
Lluís Batlle i Rossell
e431ec94ad Making vimprobable2 use the default nixos ca bundle by default 2013-02-25 20:56:49 +01:00
Peter Simons
5f32207dfc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
Vladimír Čunát
c9d3702c97 telepathy-related: fix via update
Some updates were restricted by gstreamer being <1.0
2013-02-23 22:20:42 +01:00
Vladimír Čunát
aacc9a6d0d etherape: fix build 2013-02-23 15:23:18 +01:00
Vladimír Čunát
0de7b2dfd8 baresip: a minor update 2013-02-23 13:00:09 +01:00
Eelco Dolstra
95ca031be9 firefox: Update to 19.0 2013-02-21 17:45:42 +01:00
Shea Levy
acd4299e75 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
2013-02-21 11:13:30 -05:00
aszlig
b7cbb4da11
chromium: Force -fno-stack-protector for v25.
So, this is our sledgehammer, forcing -fno-stack-protector for every gcc/g++ in
the univ... Chromium build. Of course this is a somewhat nasty fix and there
should be a real fix somewhere in Chromium 26. But instead of wandering around
and picking cherries, we now go out for the slaughter until someone brings us
the damn cherries because we are FUURRRIII... no well... time for sleep :-)

May the mighty Hydra be with us!

Thanks to our great fellow @cillianderoiste, for joining the battle with his
almighty battle axe, crushing and burning some CPUs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Tested-by: Cillian de Róiste <cillian.deroiste@gmail.com>
2013-02-21 15:23:03 +01:00
aszlig
857135c59a
chromium: Use system protobuf for versien 25.
This should at least mitigate our build error to only occur in v8 anymore.
Unfortunately we can't use v8 from nixpkgs right now, so we're going to put out
our sledgehammer in the next commit. Meanwhile, it doesn't hurt to get rid of
the bundled protobuf library, so let's do it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-21 15:23:03 +01:00
aszlig
3a23e63dbf
chromium: Use system libvpx for version 25.
Unfortunately, we have build errors for version 25 in the bundled libvpx:

http://hydra.nixos.org/build/4173075
http://hydra.nixos.org/build/4173066

As I can't reproduce this on my local system (I've disabled the option
CONFIG_CC_STACKPROTECTOR here), let's just hope that libvpx is the only part
that fails during build because of this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-21 08:51:38 +01:00
aszlig
7e5109a541
chromium: Update dev channel to v26.0.1410.5.
The upgrade currently doesn't involve the -lite package, as we need to use a few
more dependencies from nixpkgs first before we can finally fully switch over to
the lite package, even though the update script will try to fetch it anyway.

In this update, one particular problem that arises in conjuction with the
seccomp BPF sandbox is caused by this commit:

https://chromiumcodereview.appspot.com/12209029

Which particularily filters flags to the clone() syscall. I've spent (wasted?) a
few hours figuring out the troublesome flag, eventually figuring it out and -
just by curiousity ("Do other distributions have the same problem?") - searched
the web for "chromium CLONE_DETACHED" and BEHOLD...

A post from our OWN mailinglist pops up with the same patch I intended to do:

http://article.gmane.org/gmane.linux.distributions.nixos/10356

So shame on me for not being subscribed to the mailing list, and big thanks to
Ian Farmer for the patch.

As a consequence I'm now subscribed.

So, back to chromium itself, version 26 builds fine and works so far without
much (more to come in later commits) trouble.

We also had to introduce three more dependencies:

 * protobuf: This one is because we don't need to use the bundled one anymore,
             so we can use the version in nixpkgs.
 * speechd: Not sure whether this was bundled or not, but let's use nixpkgs
            version as well to keep down build time.
 * libXdamage: Needed for screen capturing support.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-20 23:40:45 +01:00
aszlig
073c797444
chromium: Update stable and beta channels.
stable: 24.0.1312.69 -> 24.0.1312.70 (builds fine, tested)
beta: 25.0.1364.68 -> 25.0.1364.84 (builds fine, tested)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-20 23:40:45 +01:00
Shea Levy
aacca1902c Merge branch 'upstream-master' into stdenv-updates 2013-02-19 10:09:39 -05:00
Eelco Dolstra
2b5aff10b9 psimedia: Fix building against current kernel headers
http://hydra.nixos.org/build/4127993
2013-02-19 12:46:52 +01:00
Rok Garbas
13fcbc7baf notmuch: update from 0.14 to 0.15 2013-02-19 04:46:47 +01:00
Shea Levy
c42d77aa35 Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-02-17 08:19:40 -05:00
Vladimír Čunát
aaf607c5dc linphone: minor update and fix 2013-02-16 21:48:47 +01:00
Eelco Dolstra
2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
aszlig
ec9c096e25
flashplayer-11: Update to version 11.2.202.262.
This update contains security fixes for two vulnerabilities, for details please
have a look at:

http://www.adobe.com/support/security/bulletins/apsb13-04.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-12 10:42:19 +01:00
aszlig
265fea5788
google-talkplugin: Note how to get latest version.
This is just in order to make it easier to determine the latest upstream version
from the Packages file of Google's APT repository.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 08:45:15 +01:00
aszlig
dd832a3e8f
chromium: Update beta channel to v25.0.1364.68.
This update is a bit more problematic, as the bundled version of libpng is
version 1.2.45 and the version in nixpkgs is 1.5.13. Even if trying to run with
libpng12 from nixpkgs, it seems to collide with parts of the bundled version.

So, until this is either fixed upstream or we have a good solution, we're using
bundled libpng for chromium version 25 and higher.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 07:03:36 +01:00
aszlig
9b726e94a8
chromium: Update stable channel to v24.0.1312.69.
Let's begin with the most trivial one: The stable version.
This version just contains a few bug fixes and builds fine so far.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 07:03:36 +01:00
aszlig
01cbb17c12
chromium: Fix updater to handle versions > 26.
Starting with version 26, there is a chromium-$version-lite package and it is an
LZMA archive as well, so download size is reduced by about 44%.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 07:03:36 +01:00
Rob Vermaas
2656f1df25 Fix Firefox 13.0 URL. 13.0 is still used by selenium. 2013-02-07 22:19:09 +01:00
Eelco Dolstra
41b4931100 firefox: Update to 18.0.2 2013-02-07 13:47:41 +01:00
Eelco Dolstra
cf9275bba4 chromium: Fix build
http://hydra.nixos.org/build/3914341
2013-01-29 13:14:52 +01:00
Lluís Batlle i Rossell
3b26ba7019 Merge remote-tracking branch 'central/master' into stdenv-updates
Conflicts:
	pkgs/os-specific/linux/alsa-utils/default.nix
2013-01-27 11:32:12 +01:00
Lluís Batlle i Rossell
4f73115288 vimprobable2: updating to 1.2.0 2013-01-23 00:04:47 +01:00
Eelco Dolstra
0a47a28f1d Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-22 23:23:53 +01:00
Rok Garbas
facdbf7bef weechat: upgrade to 0.4.0 2013-01-22 12:58:18 +01:00
Eelco Dolstra
edbaa80bc1 Remove Firefox 17 2013-01-21 14:23:01 +01:00
Eelco Dolstra
123149da16 firefox: Update to 18.0.1 2013-01-21 14:22:46 +01:00
Peter Simons
c08d6e1131 dropbox: cosmetic changes 2013-01-21 11:20:30 +01:00
Rickard Nilsson
1886d1db6a Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-01-20 16:53:21 +01:00
Florian Friesdorf
ddba22fa2e chromiumBeta and Dev update
dev should be 26.0.1386.0, but its link is broken
2013-01-19 19:34:52 +01:00
Aristid Breitkreuz
ffeb15e77b update dropbox to 1.4.21 (stable) 2013-01-18 01:01:48 +01:00
Eelco Dolstra
d1c548cdd7 w3m: Disable parallel building
Possible random build failures due to parallelism.

http://hydra.nixos.org/build/3741468
2013-01-17 14:35:52 +01:00
Eelco Dolstra
5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Eelco Dolstra
f59881fc30 mplayer: Change directory name / attribute name from MPlayer to mplayer 2013-01-14 14:38:24 +01:00
aszlig
29aa4af796
tkabber: Add ${tk}/bin to wrapper's PATH.
Pesky little impurity is now fixed, as it has bitten me several times in the
last days.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-01-14 11:34:03 +01:00
aszlig
72b248b932
chromium: Update stable and beta to v24.0.1312.52.
The current beta version of chromium just became stable, which means that we are
now exactly in par with the beta channel.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-01-14 11:34:03 +01:00
aszlig
4f8314fb92
chromium: Update dev channel to 25.0.1364.29.
For this update we needed to fix a bunch of things:

 * Limit pulse_audio_fix.patch to version 24 only (fixed upstream in 25).
 * Avoid the use of -fstack-protector for version 25.

The -fstack-protector option seems to be passed to libvpx now by default, so
simply use -fno-stack-protector in every occurence of -fstack-protector in
common.gypi. At least for now this will do it, but ultimately and for the future
we may want to have support for that in general.

And if we need that support in chromium directly depends on some of the next
updates to this package, as it seems that we now can switch to quite a lot of
nixpkgs dependencies instead of bundled dependencies.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-01-14 11:34:02 +01:00
Evgeny Egorochkin
c17fa1ebf2 Quassel: version bump to 0.7.4 2013-01-14 10:10:59 +02:00
Peter Simons
b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
aszlig
abe2993c4b
chromium: Add myself to maintainers.
Might come in handy to actually know when things going to break.

In case you're wondering: Yes, "aszlig" is the name everyone uses in real life
(even my family uses it) and is my pending stage name (not _yet_ officially).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-01-10 03:33:04 +01:00
aszlig
e2a4295844
chromium: Add pulse_audio_fix.patch to nixpkgs.
The patch previously was fetched from an Arch Linux contributor but is no longer
available there anymore. So, this is only an intermediate fix until channels get
updated (very soon I hope, even though chromium 25 could get quite messy).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-01-10 03:29:44 +01:00
Lluís Batlle i Rossell
a628b4b0e4 firefox: adding 18.0
I had to disable it using some nixpkgs, because they were considered
'too old'. They are simply commented in the code.
2013-01-09 17:31:04 +01:00
Lluís Batlle i Rossell
e87d99f023 Enabling libvdpau in flashplayer
That enables hw accelerated video
2013-01-08 20:41:45 +01:00
Lluís Batlle i Rossell
91ece6f0dd gnunet: update to 0.9.5 2013-01-06 10:53:17 +01:00
Peter Simons
9e9cd7b529 Merge branch 'master' into stdenv-updates. 2013-01-04 21:00:53 +01:00
RSzibele
70fadcafcb Added FileZilla-3.6.0.2. 2012-12-31 11:59:08 +01:00
Lluís Batlle i Rossell
b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
2012-12-28 23:28:16 +01:00
Eelco Dolstra
88b11196c1 Clean up redundant "if condition then true else false" 2012-12-28 19:57:47 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
5be0a9acd7 Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Rok Garbas
60de7967da weechat: update and adding pycrypto support (for fish.py plugin) 2012-12-28 02:17:04 +01:00
Michael Raskin
a862f2abf0 Merge pull request #217 from ppietrasa/master
kadu version bump
2012-12-27 05:31:54 -08:00
Rickard Nilsson
45635e9e0f opera: Update to 12.12 2012-12-20 14:45:15 +01:00
David Guibert
7503291ff9 update freerdp to 1.0.1 and unstable version. 2012-12-18 09:57:07 +01:00
Piotr Pietraszkiewicz
45937caa2f Bumped kadu to v0.12.2 and its dependency libgadu to v1.11.2 2012-12-17 20:44:59 +01:00
Eelco Dolstra
f364619e22 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-12 17:01:20 +01:00
aszlig
9337078fde
chromium: Update stable and beta channel.
stable: 23.0.1271.95 -> 23.0.1271.97 (tested and works)
beta: 24.0.1312.27 -> 24.0.1312.35 (tested and works)

The dev version doesn't build in its newest incarnation, so we will need to fix
and/or patch it before pushing upstream.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:19 +01:00
Eelco Dolstra
a2c2d8e28a thunderbird: Disable parallel building
It's broken just as in Firefox.

http://hydra.nixos.org/build/3441371
2012-12-09 02:07:42 +01:00
Florian Friesdorf
a551d61083 skype 4.1.0.20 2012-12-06 15:40:55 +01:00
aszlig
8fd4b80bc7
chromium: Don't use the config attrset anymore.
We can still use the config attribute set from within all-packages to pass it to
the package expression, which we do in case of PulseAudio. In order to override
other stuff you can now conveniently use chromium.override without passing a
fake config attribute set.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-05 14:05:18 +01:00
aszlig
caabb8ee47
chromium: Allow package override on channels.
This allows for more flexible overrides instead of just passing a custom
configuration attrset like:

chromium.override { config.chromium.channel = "beta"; }

So you can now simply do:

chromium.override { channel = "beta"; }

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-05 14:05:18 +01:00
aszlig
e504299f94
chromium: Update channels to stable v23.0.1271.95.
This updates the beta channel as well:

stable: 23.0.1271.91 -> 23.0.1271.95
beta: 24.0.1312.25 -> 24.0.1312.27

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-05 14:05:17 +01:00
Eelco Dolstra
5e256ccc88 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-04 17:12:35 +01:00
Lluís Batlle i Rossell
6655cf6d23 firefox: update to 17.0.1
I feel lucky.
2012-12-03 17:19:56 +01:00
Rob Vermaas
6faa35a89b Update flashplayer-11 to version 11.2.202.251 2012-12-01 18:20:05 +01:00
Eelco Dolstra
012a838ea2 Remove Firefox 16 2012-11-30 11:33:44 +01:00
Eelco Dolstra
79725bb5bc Mark some packages as low priority and disambiguate some others 2012-11-29 15:26:13 +01:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Florian Friesdorf
781d9aa84c chromium 24.0.1312.25 and 23.0.1271.91 2012-11-28 17:01:52 +01:00
Baptist BENOIST
82bdf7c8d9 opera|dia|geany: remove the obsolete share/icons/hicolor/icon-theme.cache file
This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
It have no reasons to exist in a redistribuable package
2012-11-28 00:21:34 +01:00
Eelco Dolstra
9b97ceb397 firefox: Use exec in wrappers 2012-11-26 14:49:05 +01:00
Eelco Dolstra
cc4aab2025 firefox: Disable parallel building
http://hydra.nixos.org/build/3348854
2012-11-26 11:50:10 +01:00