Branch: refs/heads/release-14.12
Home: https://github.com/NixOS/nixpkgs
Commit: 02110707f691dd756a0e85c4b3da14841a4ef9d1
https://github.com/NixOS/nixpkgs/commit/02110707f691dd756a0e85c4b3da14841a4ef9d1
Author: aszlig <[email protected]>
Date: 2015-02-22 (Sun, 22 Feb 2015)
Changed paths:
M pkgs/applications/networking/browsers/chromium/browser.nix
M pkgs/applications/networking/browsers/chromium/common.nix
M pkgs/applications/networking/browsers/chromium/default.nix
M pkgs/applications/networking/browsers/chromium/source/default.nix
A
pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_42.patch
M pkgs/applications/networking/browsers/chromium/source/sources.nix
Log Message:
-----------
chromium: Update all channels to latest versions.
Overview of the updated versions:
stable: 40.0.2214.91 -> 40.0.2214.115
beta: 41.0.2272.16 -> 41.0.2272.64
dev: 41.0.2272.16 -> 42.0.2305.3
Introduces 42.0.2305.3 as the new dev version, which no longer requires
our user namespaces sandbox patch. Thanks to everyone participating in
https://crbug.com/312380 for finally having this upstream.
In the course of supporting the official namespace sandbox (that's what
the user namespace sandbox is called), a few things needed to be fixed
for version 42:
* Add an updated nix_plugin_paths.patch, because the old
one tries to patch the path for libpdf, which is now natively included
in Chromium.
* Don't copy libpdf.so to libexec path for version 42, it's no longer
needed as it's completely built-in now.
* Disable SUID sandbox directly in the source instead of going the easy
route of passing --disable-setuid-sandbox. The reason is that with
the command line flag a nasty nagbar will appear.
Signed-off-by: aszlig <[email protected]>
(cherry picked from commit 0aad4b7ee418a5a4a6aa0c2da8a590480a63562a)
Commit: ba0f957d7b4934d6d11ce8a0b719cc6b598fd1cb
https://github.com/NixOS/nixpkgs/commit/ba0f957d7b4934d6d11ce8a0b719cc6b598fd1cb
Author: aszlig <[email protected]>
Date: 2015-02-22 (Sun, 22 Feb 2015)
Changed paths:
M pkgs/applications/networking/browsers/chromium/source/default.nix
Log Message:
-----------
chromium: Split up the source tarball on the fly.
So far we've done the source code split up by using the generic
unpackPhase and copying it all over into the different outputs.
However, this had the problem of generating the I/O load of about three
times the size of the source tree: First at fetchurl of the tarball
(although it's not as much because it's compressed), second at
unpackPhase and third at installPhase.
Now we don't use installPhase anymore and directly unpack into the
output paths, which unfortunately becomes quite a bit more complex
because we need to transform the paths of the tar file on the fly.
I've also tried using GNU Tar's --to-command option to even untar *and*
patch it at the same time, but forking for every single file in the
tarball gets REALLY slow and also gets even more complex than this two
stage approach because you need to make sure that the patch file is
applied correctly, for example for files that don't yet exist but are to
be created by the patch file.
We're using --anchored and --no-wildcards-match-slash here to prevent
accidentally excluding files we don't want to exclude. One example is
something like v8/tools/gyp/v8.gyp.
So the current approach is some compromise between complexity and speed
and should hopefully get rid of the Hydra build timeouts by lowering I/O
load.
See here for examples of builds having this issue:
http://hydra.nixos.org/build/19045023
http://hydra.nixos.org/build/19044973
http://hydra.nixos.org/build/19044968
http://hydra.nixos.org/build/19045019
Signed-off-by: aszlig <[email protected]>
(cherry picked from commit c92dbffeac75afe93c05c1ef216e927f075755c5)
Commit: 8a13fb248286beb442d4e3440f41cabbe4bf1202
https://github.com/NixOS/nixpkgs/commit/8a13fb248286beb442d4e3440f41cabbe4bf1202
Author: aszlig <[email protected]>
Date: 2015-02-22 (Sun, 22 Feb 2015)
Changed paths:
M nixos/tests/chromium.nix
Log Message:
-----------
nixos/tests/chromium: Check new userns sandbox.
Since Chromium version 42, we have a new user namespaces sandbox in the
upstream project. It's more integrated so the chrome://sandbox page
reports it as "Namespace Sandbox" instead of SUID sandbox, which we were
re-using (or abusing?) in our patch.
So if either "SUID Sandbox" or "Namespace Sandbox" reports with "Yes",
it's fine on our side.
Signed-off-by: aszlig <[email protected]>
(cherry picked from commit 9de4caddc19ce97a7f3cb4af9d9e948ae335a02d)
Compare: https://github.com/NixOS/nixpkgs/compare/949adbbb22d3...8a13fb248286_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
