Commit Graph
79 Commits
Author SHA1 Message Date
Michael Weiss c20993fbc9 ungoogled-chromium: 93.0.4577.82 -> 94.0.4606.54
(cherry picked from commit afaf8d094b98f8099cf29d789d33b122af6ad1ca)
2021-09-25 00:12:59 +02:00
Michael Weiss 21edf9c42f chromium: Move the version helper functions into default.nix
Those functions can be required anywhere in the Nix expressions for
Chromium and therefore they should be defined in default.nix and
inherited where necessary.

This fixes the chromiumBeta build which failed because I forgot to
update the channel conditional when the beta channel advanced to M94.
This is exactly why the version based conditionals should be used
everywhere.

(cherry picked from commit 186315def77d62b53ad6ccdf57ec9593edbe8bc3)
2021-09-03 13:59:33 +02:00
Michael Weiss 1ec8df7a95 chromiumDev: Fix the installation phase
(cherry picked from commit dd36a7c487f03d8673bd41bd9fda72d0d8252675)
2021-09-03 13:58:05 +02:00
Michael Weiss 4dbbc50b30 chromium: Merge the installPhase command strings
This wasn't done in 97570d30c7f to allow reusing chromiumBeta builds
(without having to perform any changes) in the meantime.

(cherry picked from commit 9ac31885527059cfc150343e576216e712408d1b)
2021-09-03 11:27:04 +02:00
Michael Weiss a04e7e7ee4 chromium: 91.0.4472.164 -> 92.0.4515.107
https://chromereleases.googleblog.com/2021/07/stable-channel-update-for-desktop_20.html

This update includes 35 security fixes.

CVEs:
CVE-2021-30565 CVE-2021-30566 CVE-2021-30567 CVE-2021-30568
CVE-2021-30569 CVE-2021-30571 CVE-2021-30572 CVE-2021-30573
CVE-2021-30574 CVE-2021-30575 CVE-2021-30576 CVE-2021-30577
CVE-2021-30578 CVE-2021-30579 CVE-2021-30580 CVE-2021-30581
CVE-2021-30582 CVE-2021-30583 CVE-2021-30584 CVE-2021-30585
CVE-2021-30586 CVE-2021-30587 CVE-2021-30588 CVE-2021-30589

Note: This won't be the smoothest update. Chromium seems to be fine but
requires gtk3 in $LD_LIBRARY_PATH to find libgtk-3.so.0 (otherwise it
crashes during startup) but Google Chrome fails to initialize
("GPU process exited unexpectedly: exit_code=132") and requires
"--use-gl=angle --use-angle=swiftshader" for hardware(?) acceleration
(which seems to work work fine and performant but SwiftShader should
actually use the CPU instead of the GPU).

(cherry picked from commit 97570d30c7f632e6ca25cf8e966d2a4b7e5aa546)
2021-07-25 13:04:11 +02:00
Michael Weiss a45acbc8e3 chromium: remove bendlas as maintainer
Their last Chromium commit is a52d7674cc from 2019.
Thank you for maintaining Chromium in the past.

(cherry picked from commit d4612af2c0d5e3c220bdd37c19272a69cc16cfd0)
2021-07-25 11:12:33 +02:00
Michael Weiss 9f9708fac7 chromiumBeta: Install crashpad_handler
This executable is required to fix a startup error.
TODO: Refactor the Nix expressions to allow chromiumVersionAtLeast, etc.
"everywhere" and investigate the VM test failure.

(cherry picked from commit ef7f020ec88c6aa92f3c35a4a83cd3517533d690)
2021-07-25 11:10:07 +02:00
Michael Weiss 0312d6fcf7 chromiumDev: Install crashpad_handler
This executable is required to fix a startup error:
[990:990:0609/092114.482805:FATAL:double_fork_and_exec.cc(131)] execv /nix/store/k02xhxzn6sn2cihaal68wwsyk8cg9pkg-chromium-unwrapped-93.0.4535.3/libexec/chromium/crashpad_handler: No such file or directory (2)

Unfortunately Chromium M93 still segfaults in the VM test:
machine # [0610/100626.225850:ERROR:process_memory_range.cc(75)] read out of range
machine # [0610/100626.227312:ERROR:file_io_posix.cc(144)] open /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq: No such file or directory (2)
machine # [0610/100626.240410:ERROR:file_io_posix.cc(144)] open /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq: No such file or directory (2)
machine # [   19.810981] systemd-coredump[1015]: Process 987 (chromium) of user 1000 dumped core.

(cherry picked from commit 1d6a0d3cf24f2edcf6755fd4db1901f9e1db1ac6)
2021-06-10 19:25:42 +02:00
Samuel Gräfenstein c1150bd065 ungoogled-chromium: add meta.mainProgram (#121610) 2021-05-03 21:15:27 +02:00
Michael Weiss acf402b0c0 chromiumDev: Fix the build
Mixing Python 2 and Python 3 causes issues with the Python dependencies.
2021-04-13 13:30:54 +02:00
Michael Weiss 5d775bb2b0 chromiumBeta: Fix the build (#119087) 2021-04-11 10:43:29 +02:00
Michael Weiss 166520812e chromium{Beta,Dev}: Use LLVM 12
LLVM 12 is required but the build still fails due to other changes that
where introduced in the meantime (and Chromium 90.0.4430.51 introduced
another LLVM failure).
2021-04-02 13:32:17 +02:00
Michael Weiss 5e42fea124 chromiumBeta,chromiumDev: Mark as broken
The builds currently fail with (should work with LLVM 12 [0]):
../../base/check.h:88:3: error: 'nomerge' attribute cannot be applied to a declaration
  NOMERGE ~CheckError();
  ^       ~
../../base/compiler_specific.h:344:19: note: expanded from macro 'NOMERGE'
#define NOMERGE [[clang::nomerge]]
                  ^
1 error generated.

[0]: https://github.com/llvm/llvm-project/commit/fb0f7288051eb2745bb9211306f53ff9aa6f73e2
2021-03-17 15:04:53 +01:00
Pavol Rusnak a6ce00c50c treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
Ben Siraphob badf51221d treewide: stdenv.lib -> lib 2021-01-16 17:58:11 +07:00
Michael Weiss 240a8f746e ungoogled-chromium: Move ungoogled-src.nix into upstream-info.json
This also adds a dedicated channel for ungoogled-chromium that enables
us to update ungoogled-chromium independently of chromium.
TODO: Automate ungoogled-chromium updates via update.py (currently it
needs to be updated manually).

Note: Unfortunately this changes the ungoogled-chromium derivation
because common.nix passes the channel as an argument to
stdenv.mkDerivation (this makes it more difficult to verify this commit
but the result should remain the same).
2020-12-10 17:41:22 +01:00
Michael Weiss 2b6b434477 ungoogled-chromium: Merge back into chromium
I used nix-instantiate to verify that the derivations for chromium and
ungoogled-chromium remain unchanged (only the meta attributes change
slightly as I added myself as ungoogled-chromium to receive
notifications for PRs/issues).
2020-12-10 17:41:11 +01:00
Michael Weiss 97677fa34f chromiumDev: Unmark the build as broken
The build succeeds again as dirmd is no longer required for building.
2020-11-21 00:27:27 +01:00
Michael Weiss 7c76eafdb7 chromiumDev: Mark as broken for now 2020-10-23 19:47:43 +02:00
Michael Weiss b36db49ae7 chromium: Add some brief documentation
Wanted to do this for a long time to collect important knowledge and
make it easier to pass maintainership.
Only time will tell if this'll be useful or become outdated instead.
2020-10-23 11:39:05 +02:00
TredwellGit 757bbdd948 chromium: Fix and enable our ANGLE support
This will additionally install the following files:
libEGL.so libGLESv2.so
libVkICD_mock_icd.so libvk_swiftshader.so libvulkan.so

libEGL.so and libGLESv2.so are required to fix our ANGLE support.
The rest should help with the Vulkan support (currently an experimental
feature that is disabled by default).
2020-10-07 20:37:35 +02:00
Michael Weiss 9a96d71f71 chromiumDev: Unbreak the build by using LLVM 11 2020-08-26 22:29:07 +02:00
Michael Weiss 11fbe97810 chromium{Beta,Dev}: M84 -> M85 -> M86 (broken)
Mark chromiumDev as broken since the build requires LLVM 11 which is not
yet in Nixpkgs (due to the lack of an RC, see #93324). Build error:
clang (LLVM option parsing): Unknown command line argument '-basic-aa-recphi=0'.  Try: 'clang (LLVM option parsing) --help'
clang (LLVM option parsing): Did you mean '--basicaa-recphi=0'?
ninja: build stopped: subcommand failed.
2020-07-24 13:40:24 +02:00
Michael Reilly 84cf00f980 treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Niklas Hambüchen 015bb28ae1 chromium: Enable swiftshader by default.
This makes it possible to use chromium headless with WebGL
(e.g. for webdriver tests) without having to rebuild from source.

The upstram default is to enable, thus simply removing our disabling switch.

Also fixes #41918.
2020-03-24 22:50:49 +01:00
Michael Weiss 4ad78e64ff chromium: Add myself (@primeos) as provisional maintainer
I don't really have the hardware resources nor time to do this properly,
but I'll try to keep a watch on Chromium (updates, PRs, and issues)
until we've found a new team [0].
Testing will be performed on a best effort basis (no guarantees :o).

I've also briefly documented the current maintainer
roles/responsibilities and added `meta.longDescription`.

[0]: https://github.com/NixOS/nixpkgs/issues/78450
2020-01-28 23:08:21 +01:00
Ivan Kozik 76ab11518d treewide: Remove myself from maintainers on some packages (#78027) 2020-01-19 12:18:34 -05:00
Andrew Childs b29e3582ac chromium: add thefloweringash (myself) as maintainer
I have an interest in making Chromium available on Aarch64. I'm adding
myself here on a recommendation from @ivan [1].

[1] https://github.com/NixOS/nixpkgs/pull/74015#issuecomment-565780595
2019-12-15 21:34:22 +09:00
Julien Langlois c28eb26100 Set package to unfree when widevine is enabled. 2019-09-05 17:27:04 -04:00
Julien Langlois aeeb67bfcb Rework to avoid a full rebuild for widevine. 2019-09-05 17:20:09 -04:00
Julien Langlois 545d58a1ef chromium: fix widevine
This change allows widevine to work in chromium (it was previously
broken due to a segfault). Newer versions of chromium do not use the
libwidevinecdmadapter.so. Instead, libwidevinecdm.so should be installed
in the chromium libExec directory.
2019-09-05 17:20:06 -04:00
Silvan Mosberger 526a0b2277 Merge pull request #60499 from JohnAZoidberg/chromium-upstream-desktop-entry
chromium: Use upstream desktop entry
2019-05-27 18:28:20 +02:00
Daniel Schaefer 0f537a49e1 chromium: Use upstream desktop entry
Upstream provides a much more featureful desktop entry file. If we use
that we take advantage of all of those features and don't have to maintain it
ourselves.
2019-05-25 22:39:47 +02:00
Ivan Kozik 75d1439f8f chromium: add myself as maintainer (#60961) 2019-05-05 05:09:20 -04:00
Florian Friesdorf fbef5ab82f Remove myself as maintainer from packages
I'm currently not maintaining any packages.
2019-02-22 16:14:13 +01:00
Sarah Brofeldt 7679891e2b chromium: Increase build timout to two days 2018-07-30 12:29:58 +02:00
Sarah Brofeldt 537d14f4e2 chromium: See if Hydra obeys a 24h meta.timeout 2018-04-26 21:59:33 +02:00
Herwig Hochleitner c2339ed75a chromium: replace ninja workaround with upstream patch
https://github.com/NixOS/nixpkgs/issues/35296

This reverts workaround commit e3cb6e7772.
2018-02-27 00:08:38 +01:00
Herwig Hochleitner e3cb6e7772 chromium: build mojo_platform_bindings before chrome
this is an attempt to prevent spurious errors due to parallel make

see https://github.com/NixOS/nixpkgs/issues/35296
2018-02-25 23:56:58 +01:00
Tuomas Tynkkynen a8d0b805b1 chromium: Attempt building on aarch64
This will probably go over the 10 hour limit, but we'll see.
2018-01-22 00:42:59 +02:00
Herwig Hochleitner 30b3b5d85f announce myself as a maintainer
added maintainer entries for `cdemu` (which i've created), as well as
`wine` and `chromium` (which I regularly contribute to)
2017-10-14 11:11:49 +02:00
Herwig Hochleitner 6141d8e6fd chromium: shorten mkdir -p 2017-09-15 21:33:37 +02:00
Herwig Hochleitner 7b866fdff9 chromium: create libexec output dir in installphase 2017-09-15 17:50:18 +02:00
Herwig Hochleitner 209b9e88df chromium: remove swiftshader install dir 2017-09-15 08:59:14 +02:00
aszlig bd63daae03 chromium: Add installation of libGLESv2.so
The following errors occur when you start Chromium prior to this commit:

[2534:2534:0625/202928.673160:ERROR:gl_implementation.cc(246)] Failed to
load .../libexec/chromium/swiftshader/libGLESv2.so:
../libexec/chromium/swiftshader/libGLESv2.so: cannot open shared object
file: No such file or directory
[2534:2534:0625/202928.674434:ERROR:gpu_child_thread.cc(174)] Exiting
GPU process due to errors during initialization

While in theory we do not strictly need libGLESv2.so, in practice this
means that the GPU process isn't starting up at all which in turn leads
to crawling rendering performance on some sites.

So let's install all shared libraries in swiftshader.

I've tested this with the chromium.stable NixOS VM test and also locally
on my machine and the errors as well as the performance issues are gone.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-06-25 22:43:25 +02:00
Eelco Dolstra b4f401104d Fix big-parallel usage
requiredSystemFeatures is not a meta attribute but a derivation
attribute. So "big-parallel" was being ignored on e.g. chromium,
causing it to be built (and timing out) on slow machines.

http://hydra.nixos.org/build/45819778#tabs-buildsteps
2017-01-03 13:55:26 +01:00
aszlig d2e60d1f93 chromium: Fix building with WineVine components
Before version 54, the WideVine CDM plugin was built unconditionally and
it seems since version 54 this now is dependent upon a GYP/GN flag on
whether to include the CDM shared library or not.

Also, we now use a patch from Gentoo which should hopefully get the CDM
plugin to work properly, at least according to their bugtracker:

https://bugs.gentoo.org/show_bug.cgi?id=547630

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-11-09 00:58:29 +01:00
obadz 20f009d56d chromium: split the sandbox into a seperate output (take 2)
Fixup of 231ed9e
2016-08-06 14:42:13 +01:00
Eelco Dolstra 1f84e43239 Do some large, concurrency-capable builds on dedicated machines 2016-05-04 18:16:27 +02:00
Eelco Dolstra f2d24b9840 chromium: Disable Hydra builds of -dev and -beta
It's not the job of Nixpkgs to distribute beta versions of upstream
packages. More importantly, building these delays channel updates by
several hours, which is bad for our security fix turnaround time.
2016-05-04 18:16:27 +02:00