Commit graph

144 commits

Author SHA1 Message Date
aszlig cfb697b013
chromium: Update beta and dev release channels.
The following new versions were introduced:

beta: 28.0.1500.45 - builds fine and tested
dev:  29.0.1521.3  - builds fine and tested

Although the version from the dev release channel isn't the latest found on
omahaproxy but it's the latest one, that actually has tarballs available.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-14 17:50:37 +02:00
aszlig 777351bce4
chromium/updater: Avoid downgrading versions.
Previously we have just checked for equality. When going back in history, that
way if the history is somewhat out-of-sync, we could end up "updating" to an
older version, which we definitely don't want.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-14 17:50:36 +02:00
aszlig 872fb3e2ff
chromium/updater: Fetch more previous versions.
Omahaproxy has an URL which lists a history of the published versions, which
allows to not only go back one versions, but several. Now it is ensured, that we
always have the latest _available_ version in sources.nix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-14 17:50:36 +02:00
aszlig 5a6242a401
chromium/updater: Fall back to previous version.
This is especially annoying for the dev channel, as it happens quite frequently
that tarballs are unavailable. So if fetching the latest version doesn't work,
try the second latest version.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-14 17:50:36 +02:00
aszlig 8cf68e5645
chromium/updater: Remove workaround for <= v26.
We no longer need the tar.bz2 archives, so let's remove the switch.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-14 17:50:35 +02:00
aszlig 62176d3b4e
chromium: Update stable and beta channels.
These new versions are introduced with this commit:

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

Unfortunately the tarball for the dev version 29.0.1530.2 isn't available at the
moment, so we're going to update it later.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-07 14:39: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 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
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
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 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
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
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
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 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
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 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 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
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 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
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
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +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
Eelco Dolstra cf9275bba4 chromium: Fix build
http://hydra.nixos.org/build/3914341
2013-01-29 13:14:52 +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
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
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
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
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