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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
This closes#1623, and updates _all_ channels to the corresponding
latest upstream versions.
Thanks to @wizeman for opening the pull request noted above and for
another update in between, @aristidb for fixing the patcheShebangs issue
and @shlevy for notifying me about the build failure in stdenv-updates
in the first place.
Sorry to everyone for my inactivity lately.
The following changes were needed in order to build those new releases:
* Patch out /bin/echo to allow building with all options enabled.
* Always use GN from the source tree.
* Remove import of depot_tools for version 34.
* Drop version 32 specific stuff.
With this commit, the following new upstream versions are introduced:
stable: 32.0.1700.77 -> 32.0.1700.102 (builds fine, tested)
beta: 32.0.1700.19 -> 33.0.1750.46 (builds fine, tested)
dev: 33.0.1712.4 -> 34.0.1809.0 (build broken with gnome_keyring)
The dev version requires a more recent version gnome_keyring and thus
won't build if gnomeKeyringSupport is set to true. I haven't tested this
build without gnomeKeyringSupport yet, so it might be broken and will be
fixed later.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This introduces version 31.0.1650.57 as the new version for the stable
channel.
Overview of the updated channels:
stable: 30.0.1599.114 -> 31.0.1650.57
beta: 31.0.1650.34 -> 32.0.1700.19
dev: 32.0.1671.3 -> 33.0.1712.4
This drops the sandbox_userns_30.patch as version 30 is no longer
stable. In addition, we had to patch out some references to /usr/bin/gcc
in the bundled WebKit sources.
Builds are passing and running fine.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This introduces version 32 as the new version for the development
channel.
Also, stable got a few security fixes, which are described here:
http://googlechromereleases.blogspot.de/2013/10/stable-channel-update_15.html
Overview of the updated channels:
stable: 30.0.1599.66 -> 30.0.1599.101
beta: 30.0.1599.66 -> 31.0.1650.26
dev: 31.0.1650.4 -> 32.0.1671.3
Builds are passing and running fine.
Apologies to everyone for the delayed update, real life sometimes
becomes a major distraction ;-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This removes the conditionals and obsolete cruft for version 29,
especially the old user namespaces sandbox patch.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This makes version 30 the new stable version which is now in par with
the beta channel. Overview:
stable: 29.0.1547.76 -> 30.0.1599.66
beta: 30.0.1599.59 -> 30.0.1599.66
dev: 31.0.1650.0 -> 31.0.1650.4
Here you can find the release notes for the new stable version:
http://googlechromereleases.blogspot.de/2013/10/stable-channel-update.html
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
beta: 30.0.1599.47 -> 30.0.1599.59
dev: 31.0.1636.0 -> 31.0.1650.0
All builds were tested on my machine (including stable).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
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>
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>
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>
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>
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>
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>
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>
The description now no longer contains the package name itself. Thanks
to nixpkgs-lint for noticing :-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
