Commit graph

796 commits

Author SHA1 Message Date
aszlig
27b72342ae
chromium: Split up source into multiple outputs.
This splits up the source into one base output (just the build and tools
directory), one for bundled dependencies, one for sandbox sources and
one for the sources of the main browser.

The state of this is heavily work in progress and contains a bunch of
workarounds. For example, we currently copy the entire sources into the
build directory, so a build ultimately requires even more space than
before.

Of course, it's just temporary as neither GYP nor ninja is particularly
friendly if it comes to out-of-tree builds.

Another thing which is heavily WIP is how we handle patches. Ultimately,
those patches shouldn't be applied to the source tree (at least not all)
but rather to the final build's temporary directory.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-09-27 15:23:31 +02:00
aszlig
80cb94784a
chromium: Update all channels to latest versions.
stable: 29.0.1547.65 -> 29.0.1547.76
beta:   30.0.1599.37 -> 30.0.1599.47
dev:    31.0.1626.0  -> 31.0.1636.0

Builds and tests working successfully on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-09-27 15:23:30 +02:00
aszlig
45b69d6dba
chromium: Split sandbox off the main output path.
Now the chromium derivation produces an extra output path for the
sandbox in order to be properly used as a setuid wrapper in <nixos>
without the need to include the full Chromium package.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-09-27 15:23:30 +02:00
Mathijs Kwik
8e4a53ba95 firefox: enable gstreamer support
This finally brings H.264/MP3/AAC support for HTML5 <video> to linux.
2013-09-18 14:37:39 +02:00
Mathijs Kwik
a918a0b366 firefox: use system cairo now upstream properly supports it 2013-09-18 14:37:39 +02:00
Mathijs Kwik
36b503e06a firefox: upgrade to 24.0 2013-09-18 14:37:39 +02:00
aszlig
3af40ade24
chromium: Add missing patch for version 31.
I accidentally forgot to add the new patch for version 31, sorry for the
noise and evaluation error caused by this:

http://hydra.nixos.org/jobset/nixos/trunk-combined#tabs-errors

And thanks to @iElectric for noticing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-09-17 13:05:20 +02:00
aszlig
7d10bbb4c8
chromium: Update beta and dev channels.
beta: 30.0.1599.22 -> 30.0.1599.37
dev:  31.0.1612.0  -> 31.0.1626.0 (new patch sandbox_userns_31.patch)

I've rebased the user namespace sandbox patch against current trunk for
the dev version, because it didn't apply anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-09-17 11:01:47 +02:00
aszlig
5789021b54
chromium: Update all channels to latest versions.
Overview of the updated channels:

stable: 29.0.1547.62 -> 29.0.1547.65
beta:   29.0.1547.57 -> 30.0.1599.22
dev:    30.0.1599.10 -> 31.0.1612.0

All channels build fine and are tested. Actually if you look at the
versions, the beta channel was lagging behind the stable channel,
because the download was unavailable. This is now fixed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-09-06 03:15:13 +02:00
Mathijs Kwik
17237cf8e4 firefox: upgrade to 23.0.1 2013-08-31 12:09:17 +02:00
aszlig
d8af53a28c
chromium: Update stable version to v29.0.1547.62.
Build works fine and tested on my machine as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-29 14:26:38 +02:00
aszlig
cdde887778
chromium: Drop patches for version 28.
This drops the initial version of the user namespaces sandbox patch and
the fix for NSS 3.15, which is no longer needed because it was fixed
upstream.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-22 05:45:22 +02:00
aszlig
f87a374647
chromium: Update all channels to latest versions.
Version 29 has now made it into stable, the release announcement blog
post can be found here:

http://googlechromereleases.blogspot.de/2013/08/stable-channel-update.html

Overview of the updated channels:

stable: 28.0.1500.95 -> 29.0.1547.57
beta:   29.0.1547.49 -> 29.0.1547.57
dev:    30.0.1588.0  -> 30.0.1599.10 (userns patch updated)

All channels build fine and are tested (manually at the moment, until we
can run the test suite).

The userns patch for version 30.0.1599.0 from the dev channel didn't
apply anymore and is now rebased against 30.0.1599.10.

In addition, in version 30 the gyp flag for setting the sandbox path
isn't recognized anymore, so we patch it into the source directly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-22 05:45:22 +02:00
Mathijs Kwik
80953929a9 conkeror: upgrade to 1.0pre-20130817-1 2013-08-19 07:04:18 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
aszlig
9faad8f274
chromium: Fix meta.description attribute.
The description now no longer contains the package name itself. Thanks
to nixpkgs-lint for noticing :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-15 11:11:02 +02:00
aszlig
213ff4d38c
chromium: Update beta and dev channels.
This introduces the following new versions:

beta: 29.0.1547.41 -> 29.0.1547.49 (builds fine, tested)
dev:  30.0.1581.2  -> 30.0.1588.0  (builds fine, tested)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-14 20:50:57 +02:00
aszlig
a41d0cb640
chromium: Drop cups_allow_deprecated.patch.
It's no longer needed in current Chromium/CUPS versions.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-14 20:50:56 +02:00
Michael Raskin
15637cf207 Add HTTPS support to Midori 2013-08-10 21:00:14 +04:00
aszlig
bccba58c32
chromium: Update beta channel to v29.0.1547.41.
Builds fine on my machine and tested with a bunch of web sites.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-08 03:18:00 +02:00
aszlig
a1b384783e
chromium: Fix build for version 28 and NSS 3.15.
Build failure details:

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

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-08 03:18:00 +02:00
Eelco Dolstra
e7e4551baa flashplayer: Update to 11.2.202.297 2013-08-07 17:12:33 +02:00
Eelco Dolstra
288811f5e1 firefox: Update to 23.0 2013-08-07 17:12:33 +02:00
aszlig
bcb9417c0e
chromium: Update stable and dev release channels.
This introduces the following new versions:

stable: 28.0.1500.71 -> 28.0.1500.95 (builds fine, tested)
dev:    30.0.1573.2  -> 30.0.1581.2  (builds fine, tested)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-03 09:49:08 +02:00
Cillian de Róiste
7c23a25476 google-talk-plugin: Upgrade to 4.2.10 2013-07-29 10:45:39 +02:00
aszlig
120e3fc167
chromium: Update beta and dev release channels.
Introduces the following new versions:

beta: 29.0.1547.22 -> 29.0.1547.32 (builds fine, tested)
dev:  30.0.1568.0  -> 30.0.1573.2  (builds fine, tested)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-07-26 06:18:04 +02:00
aszlig
f77de39536
chromium: Update dev channel to v30.0.1568.0.
The sha256 has changed upstream for 30.0.1566.2 and in addition there is
a new version available, so let's switch to the new version.

Unfortunately the user namespaces sandbox patch doesn't apply anymore
because of http://crbug.com/242290, so this adds a rebased version on
top of the current trunk of Chromium.

In order to build version 30, file is now needed as an additional build
input, because it is used by gyp.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-07-25 01:58:10 +02:00
aszlig
78bfe0ab5b
chromium: Update all channels to latest versions.
So, chromium 30 entered the dev release channel, so the overview of the
current versions is:

stable: 28.0.1500.52 -> 28.0.1500.71 (builds fine, tested)
beta:   28.0.1500.52 -> 29.0.1547.22 (builds fine, tested)
dev:    29.0.1547.0  -> 30.0.1566.2  (builds fine, tested)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-07-25 00:31:53 +02:00
aszlig
3c60e2ec39
chromium: Add API keys for NixOS.
As requested by some users, we finally have support for cloud sync,
spelling, geolocation and a lot more of the services that require API
keys from Google. Details about which services are involved can be found
at: http://www.chromium.org/developers/how-tos/api-keys

Thanks to Paweł Hajdan <phajdan@google.com> for giving us permission to
distribute the API keys with our build of Chromium:

> Note that the public Terms of Service do not allow distribution of the
> API keys in any form. To make this work for you, on behalf of Google
> Chrome Team I am providing you with:

> Official permission to include Google API keys in your packages and to
> distribute these packages. The remainder of the Terms of Service for
> each API applies, but at this time you are not bound by the
> requirement to only access the APIs for personal and development use,
> and Additional quota for each API in an effort to adequately support
> your users.

As noted in the source: Those keys are for use in NixOS/nixpkgs ONLY!

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-07-25 00:31:53 +02:00
aszlig
79b1f3069a
chromium: Unset -Werror in gypFlags.
Thanks to @jcumming for notifying me about this in #nixos:

03:47 < jack_c> aszlig: chromium builds with -Werror by default.
03:47 < jack_c> Putting: werror = "";
03:48 < jack_c> into gypFlags fixes that..
...
03:52 < jack_c> aszlig: agree -Werror is a good linting tool, but it should
                probably disabled for distribution.

So, I guess it makes sense in our case, especially because different GCC
versions will issue different warnings.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-07-08 14:27:44 +02:00
aszlig
bf94beff42
chromium: Update dev channel to v29.0.1547.0.
Build tested and works on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-28 07:54:12 +02:00
Mathijs Kwik
d51c01ac8e firefox 22: use system libpng 2013-06-27 21:35:22 +02:00
Mathijs Kwik
0b17251c06 libpng: keep versioning in all-packages.nix, not in individual expressions 2013-06-27 21:35:21 +02:00
Eelco Dolstra
2d521d8404 google-talk-plugin: Enable screen sharing 2013-06-27 14:27:46 +02:00
Eelco Dolstra
94d9f18e47 firefox: Update to 22.0 2013-06-25 20:58:25 +02:00
Eelco Dolstra
9da4ccaf3d firefox: Rename 21.0.nix to default.nix 2013-06-25 20:58:25 +02:00
Eelco Dolstra
1802152e93 Remove Firefox 20.0 2013-06-25 20:58:25 +02:00
aszlig
b0601f6d6f
chromium: Update all channels to latest versions.
Chromium 28.0.1500.52 finally is stable, so the release channels are now:

stable: 28.0.1500.52 (builds fine, tested)
beta:   28.0.1500.52 (same as stable)
dev:    29.0.1541.2  (patch rebased, builds fine, tested)

The user namespace patch doesn't apply for version 29, so I had to rebase it
against the current trunk (revision 207742).

And as version 27 is outdated, we no longer need to distinguish versions for
patching the hardcoded gcc path in core/core.gypi.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:55 +02:00
Michael Raskin
81b7f5fe63 Merge remote-tracking branch 'upstream/master' into x-updates 2013-06-15 17:15:32 +04:00
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
Mathijs Kwik
0813e7b748 firefox-21: make "use system cairo" optional, defaulting to false 2013-06-13 10:21:47 +02:00
Vladimír Čunát
6b433019fa libvpx: update
Also set the shared-vpx for firefox, just to be sure.
Firefox, Chromium, and other seem to work fine.
2013-06-11 18:03:48 +02:00
Mathijs Kwik
c1bec6fb5b firefox-21: use more system libraries
Conflicts:
	pkgs/applications/networking/browsers/firefox/21.0.nix
2013-06-11 14:05:15 +02:00
Michael Raskin
1a45886454 Merge branch 'master' into x-updates 2013-06-11 15:46:10 +04:00
Mathijs Kwik
1fb979b4f5 firefox-21: fix search box not working when built on xulrunner 2013-06-11 09:32:39 +02:00
Mathijs Kwik
ad5970b680 firefox-21: fix building with system cairo 2013-06-11 09:32:38 +02:00