Commit Graph

369 Commits

Author SHA1 Message Date
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
Florian Friesdorf
0c01cddb03 chromium 18.0.975.0-pre114925
svn path=/nixpkgs/trunk/; revision=31759
2012-01-21 18:28:44 +00:00
Florian Friesdorf
98613aa43d chromium, added myself as maintainer
svn path=/nixpkgs/trunk/; revision=31758
2012-01-21 18:28:39 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Rob Vermaas
a456047fc1 update chrome
svn path=/nixpkgs/trunk/; revision=30462
2011-11-18 02:40:33 +00:00
Eelco Dolstra
6a73467eac * Chromium updated to the latest version. Because Chromium now used
Gold, this requires a new patchelf.
* Changed the package name from ‘chrome’ to ‘chromium’.

svn path=/nixpkgs/trunk/; revision=29197
2011-09-11 20:48:02 +00:00
Eelco Dolstra
fa1433ec8b * Fix SSL support in Chrome. It dynamically tries to open
libnssckbi.so (which contains the root certificates), so that
  library has to be in LD_LIBRARY_PATH.

svn path=/nixpkgs/trunk/; revision=28519
2011-08-12 16:45:17 +00:00
Florian Friesdorf
3de8406dd3 chrome 88807 - 64bit install works, i686 untested
svn path=/nixpkgs/trunk/; revision=27437
2011-06-13 20:42:09 +00:00
Cillian de Roiste
300456b2c8 Updating the revision to get a working download url
svn path=/nixpkgs/trunk/; revision=27031
2011-04-28 13:12:26 +00:00
Eelco Dolstra
daff9c4bbf * Add gdk_pixbuf and pam to Chrome's library path.
svn path=/nixpkgs/trunk/; revision=26445
2011-03-21 14:49:36 +00:00
David Guibert
67dae3543f update chrome
svn path=/nixpkgs/trunk/; revision=26106
2011-02-24 22:19:32 +00:00
Cillian de Roiste
36c45a06dd Updating chromium, I've added myself as a maintainer since I'm happy to keep it updated in the future
svn path=/nixpkgs/trunk/; revision=25921
2011-02-12 18:47:28 +00:00
Evgeny Egorochkin
0de601dc7a chromium: bump. Patch by Cillian de Róiste.
svn path=/nixpkgs/trunk/; revision=25356
2011-01-03 00:33:14 +00:00
Evgeny Egorochkin
a729c92721 Chromium: fix deps and clean up. Patch by Cillian de Róiste.
svn path=/nixpkgs/trunk/; revision=24898
2010-11-28 09:27:45 +00:00
Rob Vermaas
a4ab931719 applied patch by Cillian de Róiste
svn path=/nixpkgs/trunk/; revision=24598
2010-11-04 12:09:40 +00:00
Rob Vermaas
ee7826f71f update chromium
svn path=/nixpkgs/trunk/; revision=24237
2010-10-12 08:09:57 +00:00
Lluís Batlle i Rossell
75d326e697 Committing the chromium patch by Cillian de Róiste
svn path=/nixpkgs/trunk/; revision=24177
2010-10-08 09:25:54 +00:00
Eelco Dolstra
bf7c353ad1 * Updated Chromium.
svn path=/nixpkgs/trunk/; revision=23736
2010-09-11 14:20:46 +00:00
David Guibert
829f6c2108 update chrome to available snapshots.
svn path=/nixpkgs/trunk/; revision=23135
2010-08-12 06:01:21 +00:00
Eelco Dolstra
a1e834e85a * Get rid of the ugly `useFromStdenv' hack in all-packages.nix.
Instead, use the generic package override mechanism to use packages
  from earlier bootstrap phases.
* Don't rely on the existence of attributes such as
  `stdenv.coreutils'.

svn path=/nixpkgs/trunk/; revision=22991
2010-08-06 10:34:34 +00:00
Rob Vermaas
ac26c3bee1 new version of chrome with new deps
svn path=/nixpkgs/trunk/; revision=22486
2010-07-06 08:18:14 +00:00
Rob Vermaas
a07cdd3b23 * added patchelf pre-release 0.6 until it gets stable
* updated chrome to latest version


svn path=/nixpkgs/trunk/; revision=21836
2010-05-18 12:36:23 +00:00
Michael Raskin
a45255dee9 Fix Chromium
svn path=/nixpkgs/trunk/; revision=20251
2010-02-25 13:22:51 +00:00
Rob Vermaas
c5157f7d9d re-added libjpeg62 for chrome, updated chrome
svn path=/nixpkgs/trunk/; revision=19199
2010-01-04 07:47:32 +00:00
Rob Vermaas
132a1db1ee newer version of chrome (32599)
svn path=/nixpkgs/trunk/; revision=18520
2009-11-22 14:41:38 +00:00
Rob Vermaas
b325a34361 chrome 31663
svn path=/nixpkgs/trunk/; revision=18328
2009-11-11 15:34:21 +00:00
Rob Vermaas
efe661ab0e update chrome to version 31662 to let dropdownlists work properly again
svn path=/nixpkgs/trunk/; revision=18326
2009-11-11 14:06:57 +00:00
Rob Vermaas
724d21e3b0 updated version of chrome
svn path=/nixpkgs/trunk/; revision=18131
2009-11-05 10:50:57 +00:00
Rob Vermaas
a73cef1057 added chromeWrapper, like firefoxWrapper, to allow plugins to work, added previously undefined dependencies on flash plugin
svn path=/nixpkgs/trunk/; revision=18050
2009-10-30 12:28:44 +00:00
Rob Vermaas
d025709a8a chrome 20565
svn path=/nixpkgs/trunk/; revision=18046
2009-10-30 08:45:58 +00:00