Commit graph

79 commits

Author SHA1 Message Date
aszlig 949afcc0f2
chromium: New seccomp patch for versions >= 23.
The BPF renderer sandbox is now the default in 23. But still, it is not regarded
as "adequately sandboxed" from Google so we still need the legacy seccomp
sandbox.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-08 07:33:51 +02:00
aszlig 77d424875c
chromium: Temporarily use bundled zlib.
Well, after looking a bit more thoroughly through the zlib patch from the
Chromium team, it seams, that this really fix an issue that hasn't yet been
applied upstream. Unfortunately neither Chromium nor Zlib give more information
about that issue. Maybe they're waiting until its resolved upstream and thus the
temporary patch?

The bad news is, that the fix for the vulnerability is incomplete in Chromium
and covers only the use cases of Chromium itself, so we can't include that
patched version in nixpkgs zlib derivation.

Until the issue is fixed upstream we're hereby safer off turning it off in
Chromium and thus use the bundled and patched version.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-08 07:33:51 +02:00
aszlig d2df1ada27
chromium: Update channels to stable v22.0.1229.79.
dev: 23.0.1271.10
beta: 22.0.1229.91
stable: 22.0.1229.79

The revert for SVN revision 151720 is now obsolete in the current beta release
and is only needed for the stable version. So let's hope that >= 22.0.1229.91
will get stable soon.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-02 03:46:42 +02:00
Eelco Dolstra e6077fbc46 Remove getConfig helper function
An expression like ‘getConfig [ "cabal" "libraryProfiling" ] false’
can be written more concisely as ‘config.cabal.libraryProfiling or false’.
2012-09-19 13:56:56 -04:00
aszlig 6667ee858b
chromium: Update dev/beta channels.
beta: 22.0.1229.56
dev: 23.0.1262.0

Patch for http://crbug.com/143623 still applies and is still not fixed upstream.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-15 07:44:21 +02:00
aszlig 2347cfa4f9
chromium: Revert zlib changes for v22 and higher.
SVN revision 151720 breaks the build with system zlib, see:

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

The issue here is, that r151720 introduces changes directly in zlib, which
aren't upstream and unfortunately there is no more information stating the exact
reasons for this change, as all references to it are not publicly available:

http://crbug.com/139744
https://chromiumcodereview.appspot.com/10837057

So for the moment, we're going to add a patch, which applies to v22 and higher,
which essentially reverts r151720, until either more information on the issue is
available or it is resolved upstream.

As someone has already reported the issue, we just need to track the following
issue:

http://crbug.com/143623

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-11 04:54:26 +02:00
aszlig 20f883179e
chromium: Update channels to latest versions.
stable: 21.0.1180.89
beta: 22.0.1229.39
dev: 23.0.1255.0

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-11 04:54:25 +02:00
aszlig d5c2b35b82
chromium: Re-enable legacy sandbox for version 22.
This enables legacy seccomp sandbox by default even on chromium 22, because the
BPF sandbox is still work in progress, please see:

http://crbug.com/139872
http://crbug.com/130662

Because the BPF seccomp sandbox is used in case the legacy seccomp mode
initialization fails, we might need to patch this again, as soon as the BPF
sandbox is fully implemented to fall back to legacy seccomp and use BPF by
default.

We now have two patches for "default to seccomp" - one for Chromium 21 and one
for 22 or higher.
2012-08-27 06:50:35 +02:00
aszlig c67d8bcabe
chromium: Don't use the sandbox patch on v21.
The patch doesn't apply in version 22 and newer, because mode 1 sandboxes are
connsidered "legacy" (well, apart from the fact that I'd personally prefer BPF
anyway), for reasons I wasn't able to find, yet. But let's proceed on BPF
integration and thus gain more insight on the exact reasons.
2012-08-26 07:36:57 +02:00
aszlig b1a6a98139
chromium: Drop dependency on subversion.
Versions older than 21 needed subversion in order to build. As the oldest
version we support is 21, we no longer need this dependency.
2012-08-26 03:03:24 +02:00
aszlig 819ee63851
chromium: Update to new release channels.
If you look at what changed, you'll surely notice that version 22 is now in
beta, so we have to expect things to break. And one thing that will break for
sure is the seccomp patch, because beginning with 22 the new BPF seccomp sandbox
is going to replace the mode 1 seccomp sandbox.
2012-08-26 02:56:59 +02:00
aszlig 224098757f
chromium/update.sh: Fix spacing in cache messages.
This commit doesn't add any feature and just fixes a small annoyance which
result in messages like this:

Checking if xxx applies...no.

See that there is no whitespace between "..." and "no"? Well, the world cares
for more important things, but for me personally those minor annoyances can turn
into major annoyances.
2012-08-26 02:52:33 +02:00
Shea Levy f34225c440 Merge branch 'chromium-updater' of https://github.com/aszlig/nixpkgs
chromium: Improve update script and update to latest versions.

Previously, we had a single hash of the whole version response from
omahaproxy.

Unfortunately the dev version is released quite frequently, so the hash
is of no use at all (we could rather directly fetch rather than
executing the script, because it will fetch all channels anyway).

This pull request adds two methods of caching:

* First of all, if a perticular version/channel is already in the
previous version of the sources.nix file, don't download it again.

* And the second method is to check if the current sha256 is already
downloaded and reads the corresponding sha256 from the lookup table.

So, this should really help to avoid flooding the download servers and
to not stress impatient users too much.
2012-08-22 06:36:33 -04:00
aszlig 8b4fae76b3 chromium: Build with NSS by default.
Hurray! This is the first time chromium is working with NSS _and_ is able to
verify certificates using the root certificates built in into NSS.

Optimally it would use certs from OPENSSL_X509_CERT_FILE, but at least it's
working, so let's add that at some later point.
2012-08-22 08:29:10 +02:00
aszlig 4393fffcce chromium: Update channels to latest versions.
This removes the now obsolete VHASH line in sources.nix aswell.
2012-08-17 12:57:35 +02:00
aszlig 6968400a34 chromium: Check sha256 per channel in update.sh.
Until this commit we had a single hash of the whole version response from
omahaproxy. This worked well for not updating unnecessarily but only until one
single channel has a new version available.

Unfortunately the dev version is released quite frequently, so the hash is of no
use at all (we could rather directly fetch everything everytime we execute the
script).

This led to this commit, which adds two methods of caching:

First of all, if a perticular version/channel is already in the previous version
of the sources.nix file, don't download it again.

And the second method is to check if the current sha256 is already downloaded
and reads the corresponding sha256 from the lookup table.

So, this should really help to avoid flooding the download servers and to not
stress impatient users too much.
2012-08-17 12:57:34 +02:00
aszlig fbfd84f816 chromium: Install libffmpegsumo.so.
This caused HTML5 video to not work because this shared library is loaded at
runtime.

Unfortunately we can't use system ffmpeg yet, because upgrading would break
builds of other packages, and it would result in a copy of ffmpeg laying around
aswell, so we can defer this until we have fixed ffmpeg.

Thanks to @bluescreen303 for the bug report.
2012-08-07 19:11:58 +02:00
aszlig a898f9ce8f chromium: Update channels for stable version 21.
Version 20 doesn't seem to build with a newer version of pulse audio and as 21
is stable now anyway, let's update the channels.
2012-08-04 09:53:53 +02:00
aszlig 96b5e9795a chromium: Update to the latest release channels. 2012-07-17 12:03:13 +02:00
aszlig 950c73271a chromium: Remove obsolete source.nix.
As already promised, the old single-channel source.nix is now obsolete as we're
using Omahaproxy now and the build of the stable version finishes successful and
the browser runs fine.
2012-07-04 14:47:02 +02:00
aszlig 834d8be46e chromium: Fix build for versions older than 21.x.
The current stable version won't build if gyp can't use svnversion from the
subversion package, so let's provide it for versions below 21.x.
2012-07-04 14:47:02 +02:00
aszlig f6e063e7fc chromium: Use new channel based sources.
Switch to channel based sources and default to the "stable" channel.
2012-07-04 14:47:02 +02:00
aszlig a65ba9e083 chromium: Generate new sources.nix.
This means that we now have hashes and URLs for the latest versions of chromium
and can now work on integrating the changes into default.nix.
2012-07-04 14:47:02 +02:00
aszlig ec395a78ee chromium: Extend update script to use channels.
The previos update script just used the last version of chromium that showed up
at the bucket list at:

http://commondatastorage.googleapis.com/chromium-browser-official/

I'm not sure which channel this list actually holds, so I'm going to switch now
using the official release channels grabbed by omahaproxy. This also has the
advantage that we can provide different versions/flavors of chromium.

We now also write our data to sources.nix instead of source.nix, as we have more
than one source.
2012-07-04 14:47:02 +02:00
Lluís Batlle i Rossell c05fcf6a2b chromium: Making hydra build chromium for linux.
I think it will save quite a lot of users build time.
2012-06-28 12:56:51 +02:00
aszlig d23dcbb9a5 chromium: Enable parallel building.
Always did this manually by putting -j8 into make flags, which i didn't commit,
as it obviously doesn't make sense to hardcode. However, this flag makes more
sense and obviously we need to avoid overriding buildPhase.
2012-06-22 15:53:30 -04:00
aszlig 59f8de864f chromium: Add support for pulseaudio.
Which is enabled by default if neither pulseaudio or chromium.pulseaudio is
explicitly set. The reason is that chromium falls back to ALSA in case no
pulseaudio is available.

In addition it was necessary to patch media.gyp to ignore the array-out-of-
bounds warning.
2012-06-22 15:53:30 -04:00
aszlig a2984e3d82 chromium: Simplify names of getConfig options.
This makes it easier to remember, as so far the naming wasn't quite consistent,
sometimes "use*", sometimes "enable*". So in using just use the feature name
itself, it should be pretty clear.
2012-06-22 15:53:30 -04:00
aszlig fc24f460f1 chromium: Use bundled versions of some libraries.
These libraries are heavily patched by the chromium project itself, so let's use
the bundled versions as those won't build anyway and also don't break functional
purity.
2012-06-22 15:53:30 -04:00
aszlig d8e9536498 chromium: Cleanup dependencies.
This mostly is a code structure change, but also involves deleting some unused
dependencies and adding a few constraints on existing ones.
2012-06-22 15:53:30 -04:00
aszlig c7db5ff34d chromium: Add dependency for libselinux.
This doesn't really work at the current state of NixOS and SELinux support, but
will make it easier in case we someday support SELinux altogether.
2012-06-22 15:53:30 -04:00
aszlig a88eb35ff1 chromium: Enable proprietary codecs by default.
We now switch to using bundled ffmpeg, as this adds stuff such as support for
the H.264 codec.
2012-06-22 15:53:30 -04:00
aszlig 04ae9f288d chromium: Implement handling of enableCUPS.
We also need to patch the compilation process, so it allows deprecated
declarations when building support for the cups backend. In addition, we also
need to add libgcrypt to dependencies as it's needed by the cups implementation.
2012-06-22 15:53:29 -04:00
aszlig 8371d50836 chromium: Update source to version 21.0.1179.1. 2012-06-22 15:53:29 -04:00
aszlig 70c0af9a37 chromium: Add mesa to build dependencies.
This finally enables support for WebGL and accelerated rendering.
2012-06-22 15:53:29 -04:00
aszlig 57e127099b chromium: Add flag to disable Gnome support.
This also separates gcrypt and gconf from the basic dependencies.
Unfortunately we cannot get rid of dbus_glib altogether, but maybe we want to
work on a patch to get rid of it? On the other hand it seems to be a TODO of the
chromium project itself, so let's wait and see.
2012-06-22 15:53:29 -04:00
aszlig c2b145c32f chromium: Allow to switch off openssl support.
Currently building fails with NSS, so we're using OpenSSL by default. And that's
why we want to make this configurable so if we manage to fix that build failure,
we could switch to using NSS by default.
2012-06-22 15:53:29 -04:00
aszlig f0cdea2e99 chromium: Use patches from system OpenSSL.
This is mainly because of the patch to use OPENSSL_X509_CERT_FILE as a way to
specify the CA bundle. A browser which isn't able to verify SSL certificates
might be somewhat useless.
2012-06-22 15:53:29 -04:00
aszlig b1fdecc460 chromium: Rename "chrome" binary to "chromium".
This is to make it more consistent with the naming of the package file and also
consistent with the build, as we're not using the Google branded version.

In addition the derivation attribute set now has a packageName value which can
be used to easily switch the binary names and paths, just in case we want to
switch to using "chrome" (or something entirely different) again.
2012-06-22 15:53:29 -04:00
aszlig 22f5045bde chromium: Use system libraries whenever possible.
There are still some libraries left, which we either need to patch or provide
more recent versions. Plus we're going to use openssl, as libnss doesn't want to
do proper SSL (let's debug this later).
2012-06-22 15:53:28 -04:00
aszlig 6350706c0d chromium: Add "which" to build dependencies.
This is needed by a lot of scripts within chromium, so we're not going to patch
them using type, which is shell-specific anyway.
2012-06-22 15:53:28 -04:00
aszlig ef45195126 chromium: Enable seccomp by default.
If useSELinux is not set, enable seccomp mode by default and avoid building the
SUID helper sandbox at all. This involves a small patch which causes the
commandline arguments to be swapped: --disable-seccomp-sandbox to disable it,
while the option is active by default.
2012-06-22 15:53:28 -04:00
aszlig 2571488e6a chromium: Clean up build flags.
This also includes setting compiler architectures and paths.
2012-06-22 15:53:28 -04:00
aszlig dc32b4caef chromium: Generate the latest source.nix. 2012-06-22 15:53:28 -04:00
aszlig d342672f5a chromium: Add an update script.
It fetches the latest version based on the bucketlist XML from
commondatastorage and generates a "source.nix" which contains an attribute set
about where to fetch the latest version.

The XML is parsed in a somewhat hackish way using sed, but as this is just an
updater, its okay and we don't want to break a fly on the wheel by employing a
full XML parser.
2012-06-22 15:53:28 -04:00
aszlig b5956ec179 chromium: Add an install phase.
This tries to put pathes unte the same directory as the previous prebuilt
version of Chromium.
2012-06-22 15:53:28 -04:00
aszlig a31301dab4 chromium: Minimal build (no install) from source.
This only gets chromium to build so far, installation is missing by upstream, so
we need to manually copy the corresponding files. And I guess with nix, we also
need to patch a few paths on installation.

Another issue is that at the moment, a lot of dependencies are used from the
source tree, rather than from the system.

Also, it would be nice to build using LLVM, as it really speeds up compilation a
*LOT* and also has the side effect of resulting in smaller binaries.

Working unit tests would be nice, too. Unfortunately they're quite heavyweight
and take hours to run, so I guess "someday" would be the most appropriate time
to integrate.

Further todo's:

- Allow to disable GConf, GIO and CUPS.
- Option to disable the sandbox (for whatever reason the user might have).
- Integrate gold binutils.
- Pulseaudio support.
- Clearly separate Linux specific stuff.
2012-06-22 15:53:27 -04:00
Arie Middelkoop c2e7aa68e4 Bumb of Chromium version. I've been using this one for a while now.
svn path=/nixpkgs/trunk/; revision=33348
2012-03-22 10:29:43 +00:00
Yury G. Kudryashov 68fe867e19 Get rid of most references to gtkLibs
svn path=/nixpkgs/trunk/; revision=33088
2012-03-14 21:57:32 +00:00
Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00