3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

902 commits

Author SHA1 Message Date
aszlig cad411f61d
chromium/plugins: Use Debian package from sources.
This now uses the Debian package from the sources derivation instead of
hardcoding it, so we finally should have proper PepperAPI plugin support
without crashing plugins and whatnot.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:45 +02:00
aszlig 6184ee89fe
chromium/update: Update Debian binaries as well.
This cases the Debian binaries to be fetched from Google's official APT
repository. If we aren't able to find a package from the APT repository,
it's very likely that it already got deleted upstream and we need to
fallback to mirrors instead.

Unfortunately, we can't use mirrors for updating, because Google doesn't
sign the Debian packages themselves and only the release files.

We're going to hook it into a Chromium updater soon, making the sha256
hashes publicly available, so if it is missing, we can still put the
sha256 manually into sources.nix, without risking anything by blindly
fetching from one of the provided mirrors.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:45 +02:00
aszlig 2741523926
chromium: Remove URL in sources.nix and updater.
The updater is now splitted between a shellscript and a Nix expression
file which contains helpers and lookup functions to reconstruct all
information needed in order to fetch the source tarballs.

This means, that the sources.nix now doesn't contain URLs and only
versions and the corresponding SHA256 hashes. Of course, right now this
sounds like it's unnecessary, but we're going to fetch binaries soon so
it's a good idea to not unnecessarily clutter up sources.nix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:45 +02:00
aszlig 8bc8b51375
chromium: Move source package into own subdir.
Next, we're going to refactor update.sh and the first step is to ensure
that we keep everything related to sources into its own subdirectory to
not clutter up the main directory too much.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:44 +02:00
aszlig 202755ca2f
chromium: Properly pass packageName and version.
We don't want ta have the source derivation in the runtime dependencies
of the browser itself. Also, we've broken the Firefox wrapper, because
we've no longer exposed the packageName attribute.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:44 +02:00
aszlig eadbf855b0
chromium: Revert back to copying bundled sources.
I'm giving up on this after several attempts to correctly unbundle the
largest part, namely Google's WebKit fork Blink. Right now it's so much
tied into the Chromium source it's going to be fairly hard to do if
you're not working full time on it.

Also, the intermediate steps needed to do this properly would introduce
uneccesary complexity on our side, so we really need to finish this
without leaving it in the "messy" state in order to not make Chromium
even more difficult to maintain than it is already.

However, anyone who wants to proceed on this messy step is free to
revert this commit and continue doing so. In my case I'm going to try
again once https://crbug.com/239107 and https://crbug.com/239181 are
fixed in _stable_ (I don't want to introduce *lots* of conditionals on
the version either).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:43 +02:00
aszlig c6fa73b26c
chromium: Propagate browser's meta to the wrapper.
We obviously don't want the Hydra job of nixpkgs to fail, so we need to
make sure that we have a proper meta attribute on the outermost
derivation.

For builds based on the Chromium source tree (like for example libcef),
we can still move the wrapper elsewhere when we need it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:43 +02:00
aszlig cce984b324
chromium: Correct tools path in blink_idl_parser.
This is because of our symlink mess, as Chromium's build support scripts
are trying to resolve everything based on absolute paths and we split
off the bundled sources from the main derivation.

Yes, I'm refering to this as a mess, because in the end, we're going to
patch up the gyp files and use references someday.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:43 +02:00
aszlig d8ba5b3eff
chromium: Add bundled dependencies for dev/beta.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:42 +02:00
aszlig 5021717099
chromium: Split off sandbox from the browser.
Now, we no longer tie the sandbox directly to the browser derivation but
wrap everything together into one derivation at the entry point at
default.nix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:42 +02:00
aszlig c86d376c82
chromium: Selectively link bundled libraries.
So far we just copied everything from source.* into the build directory
during the prePatch. This somewhat defeated the purpose of the source
splitup because it involved more I/O than just unpacking the entire
source tree.

Now, we're selectively *symlinking* the bundled sources into the build
directory. Even that isn't perfect because in the end we'd just
reference foreign derivations and we're done. But for now, this gets us
at least prepared for a massive reduction of compile time.

Unfortunately, gyp's behaviour when it comes to symlinks is quite
painful to come by, so we need to fix a few references to use absolute
paths.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:42 +02:00
aszlig 16af058ff9
chromium: Move plugins into its own Nix file.
We now no longer pass enablePepperFlash and enablePepperPDF to the
browser package itself and only use plugins.flagsEnabled from there.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:42 +02:00
aszlig 1ae328ba86
chromium: Factor out source into its own Nix file.
The name is a bit unfortunate, so it would make sense to rename
"sources.nix" into something else.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:41 +02:00
aszlig 88a939c2d1
chromium: Decouple browser from default.nix.
This currently only passes through the arguments and is nothing more
than the foundation of the new structure. In essence, I want to have a
really small default.nix which is then going down into the respective
subparts that are isolated from each other.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:41 +02:00
aszlig c2abe4da6c
chromium: Add support for ppapi flash and PDF.
This is hardcoded for the dev channel at the moment and we're going to
fetch it along with the main Chromium sources.

Also I'm putting this in default.nix at the moment, because we're going
to tear apart the whole Chromium package into several subparts soon.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:41 +02:00
aszlig c9c9ca38b9
chromium: Build using minizip from nixpkgs.
Well, the gyp flag mentions "zlib" but in reality, minizip is used.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:40 +02:00
aszlig 5b67290740
chromium: Build using libpng from nixpkgs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:39 +02:00
aszlig 823b72d0ad
chromium: Build with libwebp from nixpkgs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:39 +02:00
aszlig 2f23f57b28
chromium: Build beta/dev with v8 from nixpkgs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:38 +02:00
aszlig 9f45c2cbba
chromium: Prepare for building the -lite package.
We currently can't build the -lite package because beta and dev versions
aren't yet compatible with ICU version 52. But apart from that blocker,
this should get us ready for the switch.

Also, we're now correctly unbundling all dependencies which are used
from <nixpkgs>.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:37 +02:00
aszlig e2dba7c6cf
chromium: Use version 3 of libgnome_keyring.
Starting with version 35, version 2 of libgnome_keyring is no longer
supported and it's probably pretty useless to do backports to version 2,
given the assumption that most users on Nix probably don't use it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:37 +02:00
Michael Raskin d31cf5329e Merge pull request #2075 from iyzsong/webkit
get rid of old webkit packages
2014-04-18 10:10:29 -07:00
Luca Bruno 6f61f7dc0d midori: fix gsettings schemas
Could not test it because it does not compile for other reasons.
2014-04-17 13:42:50 +02:00
Ricardo M. Correia 8fdf8984d2 chromium: Update stable channel from 33.0.1750.152 -> 34.0.1847.116 2014-04-10 00:14:44 +02:00
Ricardo M. Correia 54a8e0ed0f flashplayer: Update from 11.2.202.346 -> 11.2.202.350 2014-04-08 17:45:52 +02:00
Luca Bruno 35ccaa2e52 Fix gsettings schemas usage for several packages due to #1901
Also add icons to epiphany
2014-04-06 11:02:21 +02:00
aszlig 51e449aabb
chromium: Fix build of beta and dev channels.
Okay, now this time we really broke beta and dev, because python_arch no
longer is in build/common.gypi anymore.

This just adds chrome/chrome_tests.gypi to the list of files to be
changed by sed.

Also, this time I did test at least whether gyp is running fine and
interrupted after the first 1000 build targets, so all channels *should*
now build fine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-01 09:33:04 +02:00
aszlig 1ae4db3a80
chromium: Fix build of stable channel.
Build failure on Hydra:

https://hydra.nixos.org/build/9823160

This was caused by the update of file in 5885709.

As file seems to be used for only one substition in the gyp files, we
can now drop the build dependency on file and patch out the substition
expression, as it is done before actually testing if the value has been
set by -D (gyp, y u no have lazy eval!?).

PS: Proudly untested against beta and dev channels, redeployed my own
Hydra and building on my workstation here really is ... annoying (lavg
41 on a system with nproc 8, less than 8 GB RAM and you probably will
have as much "fun" as I just had writing this commit mess...a....g

FUCK^H^H^H^H^H^H...e).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-01 04:01:58 +02:00
宋文武 6e7fe59bb1 uzbl: build with webkitgtk2, cleanup 2014-03-30 09:52:36 +08:00
宋文武 59124ddf95 vimprobable2: update to 1.4.2 2014-03-30 07:59:32 +08:00
Pascal Wittmann df2e5fc47a Updated dwb to latest revision 2014-03-28 10:30:36 +01:00
aszlig a5a5abd2fe
chromium: Fix startup of beta and dev channels.
Since version 34, ICU data files are now created separately and thus
need to be installed as well.

Closes #2016

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit f117341ff2de4b95d223b41b36942e2f60ada2a3)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-26 01:33:07 +01:00
Mathijs Kwik 149dcb2113 conkeror: upgrade to more recent snapshot
needed for scripting Downloads.jsm with Gecko >= 26
2014-03-24 10:35:51 +01:00
Ricardo M. Correia a16e1e2133 chromium: Update stable and beta channels
stable: 33.0.1750.149 -> 33.0.1750.152
beta:   34.0.1847.45  -> 34.0.1847.60
2014-03-16 13:26:01 +01:00
Ricardo M. Correia 17b473449b Add myself as maintainer of pkgs I wish to keep up-to-date 2014-03-14 21:22:09 +01:00
Eelco Dolstra 5a807eaedb flashplayer: Add license field 2014-03-14 13:24:23 +01:00
Ricardo M. Correia d83e7fbb8d chromium: Update all channels
stable: 33.0.1750.146 -> 33.0.1750.149
beta:   34.0.1847.14  -> 34.0.1847.45
dev:    35.0.1862.2   -> 35.0.1883.0
2014-03-13 02:27:14 +01:00
Ricardo M. Correia 4640a6b9db flashplayer: Update from 11.2.202.341 -> 11.2.202.346 2014-03-12 14:42:52 +01:00
Eelco Dolstra 203f4d6ec8 firefoxWrapper: Fix the name 2014-03-10 15:25:47 +01:00
Domen Kožar c616f319d3 Merge pull request #1860 from jagajaga/dwb_update
dwb: update version
2014-03-07 12:36:00 +01:00
Ricardo M. Correia fdf97c5df3 chromium: Update all channels
stable: 33.0.1750.117 -> 33.0.1750.146
beta:   33.0.1750.117 -> 34.0.1847.14
dev:    34.0.1847.3   -> 35.0.1862.2
2014-03-04 18:35:08 +01:00
Arseniy Seroka 350277d9c5 dwb: update version 2014-03-01 22:23:52 +04:00
Domen Kožar 037684283a typo 2014-02-28 16:47:15 +01:00
Eelco Dolstra 34874dac7a google-talk-plugin: Update to 5.1.5.0 2014-02-28 11:05:47 +01:00
Peter Simons ce365835d7 links2: update from 2.5 to 2.8 2014-02-24 22:04:40 +01:00
Ricardo M. Correia 92794f775a firefox: Fix hash 2014-02-21 21:23:56 +01:00
Ricardo M. Correia 2a462ff6ae firefox: Update from 27.0 -> 27.0.1 2014-02-21 21:07:59 +01:00
Ricardo M. Correia 2391129307 chromium: Update stable and beta channels
stable: 33.0.1750.115 -> 33.0.1750.117
beta:   33.0.1750.115 -> 33.0.1750.117
2014-02-21 19:35:18 +01:00
Ricardo M. Correia 96c481b8a0 flashplayer: Update from 11.2.202.336 -> 11.2.202.341 2014-02-21 19:19:01 +01:00
Domen Kožar cc2b86d133 google_talk_plugin: 4.2.1.0 -> 5.1.4.0 2014-02-21 00:10:40 +01:00