Commit Graph

293446 Commits

Author SHA1 Message Date
Thomas Gerbet 8fea6a45a0 phpPackages.composer: 2.1.3 -> 2.1.5
https://github.com/composer/composer/releases/tag/2.1.4
https://github.com/composer/composer/releases/tag/2.1.5
(cherry picked from commit 8c59a77a04339beaced44b293db579c9aaa16aa0)
2021-07-25 18:21:48 +00:00
github-actions[bot] e6ee5601f9
Merge staging-next-21.05 into staging-21.05 2021-07-25 18:03:16 +00:00
github-actions[bot] 0693039bd8
Merge release-21.05 into staging-next-21.05 2021-07-25 18:01:59 +00:00
adisbladis ecd1adcea0
Merge pull request #130579 from NixOS/backport-127145-to-release-21.05
[Backport release-21.05] containerd: 1.5.1 -> 1.5.2
2021-07-25 12:43:16 -05:00
Robert Schütz 9317b77a1d imagemagick6: 6.9.12-17 -> 6.9.12-19
(cherry picked from commit 3bb091640bc7deb719759deab43cd2e206520b2a)
2021-07-25 16:31:55 +02:00
Luke Granger-Brown cf2e6fa8dd
Merge pull request #131456 from NixOS/backport-125946-to-release-21.05
[Backport release-21.05] docker: 20.10.6 -> 20.10.7
2021-07-25 14:02:24 +01:00
Ryan Mulligan 807a22965a
Merge pull request #130303 from NixOS/backport-128633-to-release-21.05
[Backport release-21.05] discord: fix updater script
2021-07-25 05:57:33 -07:00
github-actions[bot] 48b0dbb885
Merge staging-next-21.05 into staging-21.05 2021-07-25 12:02:56 +00:00
github-actions[bot] 46a3e2b42d
Merge release-21.05 into staging-next-21.05 2021-07-25 12:02:20 +00:00
Michael Weiss 37eae1967a
Merge pull request #131363 from oxalica/fix/tdesktop-voice-chat-backport
[21.05] tdesktop: fix calls, dlopen and bundle fonts
2021-07-25 13:21:02 +02:00
Michael Weiss 4e8d55ce61
nixos/tests/chromium: Drop the workaround for Chrome GPU crashes
This regression was fixed by 51d83077ffb.

(cherry picked from commit 4ec2b24603e6eb4a48272678c75d2518de4e2191)
2021-07-25 13:04:53 +02:00
Michael Weiss 6dbb8d5098
nixos/tests/chromium: Check the version and that it's an official build
This also prints and screenshots the output of chrome://version which
contains useful information.

Outputs (stable, beta, ungoogled, chrome-stable, chrome-beta, chrome-dev):
Chromium	92.0.4515.107 (Official Build) (64-bit)
Chromium        92.0.4515.107 (Official Build) (64-bit)
Chromium        91.0.4472.164 (Official Build, ungoogled-chromium) (64-bit)
Google Chrome   92.0.4515.107 (Official Build) (64-bit)
Google Chrome   92.0.4515.107 (Official Build) beta (64-bit)
Google Chrome   93.0.4577.8 (Official Build) dev (64-bit)

(cherry picked from commit 7b3c0545149cb5c67611945d6022b61047439d61)
2021-07-25 13:04:52 +02:00
Michael Weiss 8b75191bea
chromium: Fix the Ozone/Wayland support
The stable channel update to M92 (97570d30c7f) broke the Wayland support:
$ chromium --enable-features=UseOzonePlatform --ozone-platform=wayland
[31712:31712:0721/114725.940557:ERROR:wayland_connection.cc(137)] Failed to load wayland client libraries.
[31712:31712:0721/114725.940641:FATAL:ozone_platform_wayland.cc(177)] Failed to initialize Wayland platform
[0721/114725.947566:ERROR:process_memory_range.cc(75)] read out of range
Trace/breakpoint trap (core dumped)

(cherry picked from commit bb651d27fd86814087f54eaefda0a0fc04d4d6cf)
2021-07-25 13:04:11 +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
Mark Vainomaa ae97d0fb4d docker: add @mikroskeem to maintainers
(cherry picked from commit e2b28504ab046141e2405bebc08f5e8dfacda986)
2021-07-25 10:32:11 +00:00
Mark Vainomaa 867a90866e docker: narrow patchShebangs
(cherry picked from commit fc38adafeaae8c83997b8dcf7671da3db8bb277f)
2021-07-25 10:32:11 +00:00
Mark Vainomaa 66b051a576 docker: enable buildx support by default
(cherry picked from commit 2c7bdb05dee8d8e5e9b3bd763554618c27b50a24)
2021-07-25 10:32:11 +00:00
Mark Vainomaa 405f6e41f8 docker: improve readability, drop unneeded substitutes
(cherry picked from commit 1553e742f522da7cc4cf7e9d79c0dc53d8da86b4)
2021-07-25 10:32:10 +00:00
Mark Vainomaa 3d0968b53e docker: 20.10.6 -> 20.10.7
(cherry picked from commit ff2c16095d559ed0a89a972ed93faeb3f8e24749)
2021-07-25 10:32:10 +00:00
Michael Weiss 52e4b484ca
Merge pull request #131453 from primeos/chromium-backport
[21.05] Backport the test improvements for Chromium (+ wrapper fix)
2021-07-25 12:23:26 +02:00
Luke Granger-Brown 2a947f5987
Merge pull request #131436 from NixOS/backport-131394-to-release-21.05
[Backport release-21.05] apache-directory-studio: 2.0.0-M15 -> 2.0.0-M17
2021-07-25 10:52:16 +01:00
Luke Granger-Brown b74321f81d
Merge pull request #131451 from NixOS/backport-131377-to-release-21.05
[Backport release-21.05] lrzsz: add patch for CVE-2018-10195
2021-07-25 10:48:09 +01:00
Michael Weiss 2eaf9b409a
chromium: Check the text rendering
This should catch regressions like #131074 in the future. In that case a
glibc update caused a regression that caused most of the text to become
invisible (just not the "Web Store" we've already been checking for).

(cherry picked from commit 11400dcd65ed95292d7ac7cb30912e15ec4cf8e1)
2021-07-25 11:37:57 +02:00
Michael Weiss 24599a5ba6
nixos/tests/chromium: Print the content of chrome://{sandbox,gpu}
This can be very useful when running the test headless or e.g. when
looking at Hydra logs. Especially the chrome://gpu content contains a
lot of interesting information.
I also decided to refactor the test_new_win() function to avoid
duplicate code and rely less on xdo.

(cherry picked from commit c33015a0c94777261ef054a3d7dacd53e744ceea)
2021-07-25 11:37:57 +02:00
Michael Weiss 90e44d2f1c
nixos/tests/chromium: Refactor launching the browser process
It should now be more flexible and less error-prone.

(cherry picked from commit 8c52061b1fce2036b70836e5dcdfcf4b702dd405)
2021-07-25 11:37:57 +02:00
Michael Weiss a20f9eb0ec
nixos/tests/chromium: Fix the test for M92+
Unfortunately there are some regressions in the GPU code that cause
Chromium and Google Chrome to crash, e.g.:
machine # [0709/084047.890436:ERROR:process_memory_range.cc(75)] read out of range[   30.153484] show_signal: 20 callbacks suppressed
machine # [   30.153490] traps: chrome[1036] trap invalid opcode ip:55af03357b29 sp:7ffeaa69ad10 error:0 in chrome[55aefe7a4000+81ec000]
machine #
machine # [0709/084047.955039:ERROR:file_io_posix.cc(144)] open /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq: No such file or directory (2)
machine # [0709/084047.955078:ERROR:file_io_posix.cc(144)] open /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq: No such file or directory (2)
machine # [   30.126905] systemd[1]: Created slice system-systemd\x2dcoredump.slice.
machine # [   30.137012] systemd[1]: Started Process Core Dump (PID 1038/UID 0).
machine # [   30.571987] systemd-coredump[1039]: Process 1036 (chrome) of user 1000 dumped core.
machine # [992:1021:0709/084048.501937:ERROR:gpu_process_host.cc(995)] GPU process exited unexpectedly: exit_code=132
machine # [   30.594747] systemd[1]: systemd-coredump@0-1038-0.service: Succeeded.

Hopefully this'll be fixed upstream before the final release (there are
bug reports for it) but for the meantime we have to launch the beta and
dev versions with "--use-gl=angle --use-angle=swiftshader".

(cherry picked from commit f9645002a2d8615fd608bfdef4f924481dca391e)
2021-07-25 11:37:56 +02:00
sternenseemann 3e6648699f
chromium: move ed and makeWrapper into nativeBuildInputs
This most notably fixes cross _evaluation_ of chromium which previously
would fail because makeWrapper relies on runtimeShell which is not
available in the HostTarget package set.

I tested that the native chromium build still works, but haven't tried
cross compiling it yet. There very well may be additional errors, but at
least they will be build errors, not hard to understand evaluation
errors.

(cherry picked from commit 524aa1c87c4cb024747930cda3a3e68c68dc362c)
2021-07-25 11:37:56 +02:00
Michael Weiss 40325d6d4a
Merge pull request #131449 from primeos/chromium-backport
[21.05] Preparations for backporting Chromium M92
2021-07-25 11:37:34 +02:00
Luke Granger-Brown b3ba3fa85e
Merge pull request #131448 from NixOS/backport-130320-to-release-21.05
[Backport release-21.05] firecracker: 0.24.3 -> 0.24.4
2021-07-25 10:35:41 +01:00
Luke Granger-Brown 5122cec8cb
Merge pull request #131447 from NixOS/backport-131440-to-release-21.05
[Backport release-21.05] google-chrome: add pciutils dep to avoid GPU process crashing
2021-07-25 10:35:32 +01:00
Robert Scott edf50c4c2b lrzsz: add patch for CVE-2018-10195
provide gettext because modifying source files triggers
localization regeneration

(cherry picked from commit edc01d05a925369f518b0f3cef6f3689e561011e)
2021-07-25 09:30:22 +00:00
Luke Granger-Brown 1eafebd452
Merge pull request #125927 from NixOS/backport-125761-to-release-21.05
[Backport release-21.05] gnome.gnome-calendar: 40.1 -> 40.2
2021-07-25 10:15:46 +01:00
Luke Granger-Brown e506b846c2
Merge pull request #125928 from NixOS/backport-125752-to-release-21.05
[Backport release-21.05] epiphany: 40.1 -> 40.2
2021-07-25 10:15:36 +01:00
Luke Granger-Brown 4d03ae59fb
Merge pull request #125851 from NixOS/backport-125569-to-release-21.05
[Backport release-21.05] gupnp: apply the patch for CVE-2021-33516
2021-07-25 10:15:30 +01:00
Danielle Lancashire 507eabd549 firecracker: 0.24.3 -> 0.24.4
Updated firecracker to v0.24.4. This required updating the buildPhase to
point to new compilation result paths.

Formatting changes were performed by `nix-update --format`

(cherry picked from commit 6fc6e325e6fc6d28a3e2a862e398e773e7442179)
2021-07-25 09:15:24 +00:00
Luke Granger-Brown 31d8fc0b52
Merge pull request #125924 from NixOS/backport-125774-to-release-21.05
[Backport release-21.05] gnome.gnome-boxes: 40.1 -> 40.2
2021-07-25 10:15:13 +01:00
Luke Granger-Brown 10282fa17b
Merge pull request #125925 from NixOS/backport-125771-to-release-21.05
[Backport release-21.05] gnome.gnome-software: 40.1 -> 40.2
2021-07-25 10:15:07 +01:00
Luke Granger-Brown 2267d4b801
Merge pull request #125926 from NixOS/backport-125757-to-release-21.05
[Backport release-21.05] evolution-data-server: 3.40.1 -> 3.40.2
2021-07-25 10:14:54 +01:00
Luke Granger-Brown 17b1b28402
Merge pull request #130978 from NixOS/backport-124799-to-release-21.05
[Backport release-21.05] nixos/unbound: fix define-tag option
2021-07-25 10:14:27 +01: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 9ede7cd91b
chromiumDev: 93.0.4573.0 -> 93.0.4577.8
(cherry picked from commit 503dc62d0468e303758a720c8d650075a48956ec)
2021-07-25 11:12:32 +02:00
Michael Weiss 03f1833d1a
chromiumBeta: 92.0.4515.101 -> 92.0.4515.107
(cherry picked from commit 5c6608144f9cd108565297c7c03ec79bb0fe611f)
2021-07-25 11:12:32 +02:00
Michael Weiss 741f8416c7
chromium: get-commit-message.py: Improve the parsing
The current stable release announcement [0] uses more HTML tags which
broke the detection of "fixes" and "zero_days". Proper HTML parsing
could be done using html.parser [1] but for our purposes the naive regex
trick works well enough.

[0]: https://chromereleases.googleblog.com/2021/07/stable-channel-update-for-desktop.html
[1]: https://docs.python.org/3/library/html.parser.html

(cherry picked from commit 3e93811d93b2bc88f047e9a989b456ab3ae3291c)
2021-07-25 11:12:31 +02:00
Michael Weiss affa0971db
chromiumBeta: 92.0.4515.93 -> 92.0.4515.101
(cherry picked from commit b22b804e67e546edda690b3ae9a7d0c7cd38f37e)
2021-07-25 11:12:30 +02:00
Michael Weiss 4857d71209
chromiumDev: 93.0.4557.4 -> 93.0.4573.0
(cherry picked from commit 96a3799050f46967f4b1f0141a5965c79137c4a2)
2021-07-25 11:12:30 +02:00
Michael Weiss fe5ef8dbc0
chromiumBeta: 92.0.4515.80 -> 92.0.4515.93
(cherry picked from commit a571f3a94530f36ae1016cb74d2c861cb379ad5e)
2021-07-25 11:12:29 +02:00
Luke Granger-Brown 3af6b9cbe6
Merge pull request #130289 from NixOS/backport-123291-to-release-21.05
[Backport release-21.05] docker: 20.10.2 -> 20.10.6
2021-07-25 10:12:27 +01: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 1728c037de
chromiumBeta: 92.0.4515.70 -> 92.0.4515.80
(cherry picked from commit 11237c7d83eb87cf9b608e4917f072b8ed206b27)
2021-07-25 11:10:06 +02:00
Michael Weiss c0a0749d1c
chromiumDev: 93.0.4549.3 -> 93.0.4557.4
Would need to temporarily remove "ffmpeg" from gnSystemLibraries and
disable use_thin_lto to fix the build (theoretically).

(cherry picked from commit 5cae43456679428a675fb7074b48ceb5aa3f73e4)
2021-07-25 11:10:06 +02:00