Commit Graph

293275 Commits

Author SHA1 Message Date
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
Michael Weiss 9c2bdffc2a
chromiumDev: Fix build errors due to the older system FFmpeg
The final linking still fails though, even with llvm-git.
We might have to diable use_thin_lto for now:
ld.lld: error: undefined symbol: snappy::Compress(char const*, unsigned long, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >*)
>>> referenced by compression_module.cc
>>>               thinlto-cache/Thin-ed5ed5.tmp.o:(reporting::CompressionModule::CompressRecord(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, base::OnceCallback<void (std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, absl::optional<reporting::CompressionInformation>)>) const)
clang-13: error: linker command failed with exit code 1 (use -v to see invocation)

(cherry picked from commit fcdcb819362836505e059ef1c5cb33c737883400)
2021-07-25 11:10:05 +02:00
Michael Weiss d6b4569f80
chromiumBeta: 92.0.4515.59 -> 92.0.4515.70
(cherry picked from commit e829ab8d659cd9e8c574bd366dadaefbef8793e7)
2021-07-25 11:10:04 +02:00
Michael Weiss 04accba48c
chromiumDev: 93.0.4542.2 -> 93.0.4549.3
(cherry picked from commit c8fe353d8be0cb96e91fae004afb0b2d7b02c502)
2021-07-25 11:10:04 +02:00
Michael Weiss 4ee0ab1564
chromiumDev: Fix building from the release tarball
See https://bugs.chromium.org/p/chromium/issues/detail?id=1215229.
Before this the build failed with this error:
[101/47617] ACTION //build/util:chromium_git_revision(//build/toolchain/linux/unbundle:default)oaded_data.pbchain/linux/unbundle:default)
FAILED: gen/build/util/chromium_git_revision.h
python3 ../../build/util/lastchange.py --header gen/build/util/chromium_git_revision.h --revision-id-only --revision-id-prefix @ -m\ CHROMIUM_GIT_REVISION
ERROR:root:Failed to get git top directory from '/build/chromium-93.0.4542.2/build/util': Git command 'git git rev-parse --show-toplevel' in /build/chromium-93.0.4542.2/build/util failed: [Errno 2] No such file or directory: 'git'

(cherry picked from commit 8af443906d795aa562839f4968566dd58b76c0fd)
2021-07-25 11:10:03 +02:00
Michael Weiss dcf696ee71
chromiumBeta: 92.0.4515.51 -> 92.0.4515.59
(cherry picked from commit 28b48376b992a2126dfa79ddfbcc6c60d5c62438)
2021-07-25 11:10:02 +02:00
Michael Weiss 08c330473e
chromiumDev: 93.0.4535.3 -> 93.0.4542.2
(cherry picked from commit 0876f689d75ab65caee1c1ba02ca1be65732a90f)
2021-07-25 11:10:02 +02:00
Michael Weiss 385d6c0d60
chromiumBeta: 92.0.4515.40 -> 92.0.4515.51
(cherry picked from commit 558cb984de748cdf86f08c8bf5d410390d2503ec)
2021-07-25 11:10:01 +02:00
Luke Granger-Brown 2cc557dcae
Merge pull request #129171 from eduardosm/seafile
[Backport release-21.05] seafile-shared: 8.0.1 -> 8.0.3, seafile-client: 8.0.1 -> 8.0.3
2021-07-25 10:07:45 +01:00
Luke Granger-Brown 43aa33d9c2 google-chrome: avoid crash under some situations
If our Chrome derivation is Vulkan enabled, the Chrome GPU process
reliably crashes for me under M92 using the proprietary Nvidia drivers.
This is because the PCI-based GPU detection path fails, and we attempt
to use the Vulkan fallback instead, which then crashes(!!)

Including libpci allows us to use Angle's
src/gpu_info_util/SystemInfo_libpci.cpp path instead, which doesn't
crash, unlike src/gpu_info_util/SystemInfo_vulkan.cpp.

(cherry picked from commit 51d83077ffbca115265b04853e244179713c6518)
2021-07-25 09:06:09 +00:00
Luke Granger-Brown 01c8ed0ba0
Merge pull request #131438 from angustrau/backport-zoom-us-5.7.28852.0718
[21.05] zoom-us: 5.7.26030.0627 -> 5.7.28852.0718
2021-07-25 09:31:33 +01:00
Angus Trau ae6a552c88 zoom-us: 5.7.26030.0627 -> 5.7.28852.0718
(cherry picked from commit c2461f0d67efbd642d647e827c8f234f15386fa1)
2021-07-25 17:35:48 +10:00
Martin Weinelt 31f84bb17a apache-directory-studio: 2.0.0-M15 -> 2.0.0-M17
(cherry picked from commit 6d318b6585c5b12244c91b82e12c732356e4959a)
2021-07-25 07:20:10 +00:00
Daneel S. Yaitskov 973910f5c3
override ap-normalize version with 0.1.0.1 (#130946)
haskellPackages.ap-normalize: 0.1.0.0 -> 0.1.0.1

Co-authored-by: Daniil Iaitskov <daniil.iaitskov@soostone.com>
Co-authored-by: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
2021-07-24 14:56:18 +02:00
Oleksii Filonenko 9f4966b7e1
Merge pull request #131240 from NixOS/backport-129451-to-release-21.05
[Backport release-21.05] hugo: 0.84.4 -> 0.85.0
2021-07-24 13:50:53 +03:00
davidak 537678cb1e
Merge pull request #131211 from NixOS/backport-130814-to-release-21.05
[Backport release-21.05] man-pages: 5.11 -> 5.12
2021-07-24 08:14:20 +02:00
Graham Christensen 1a52f18432
Merge pull request #131287 from NixOS/backport-131266-to-release-21.05
[Backport release-21.05] webkitgtk: 2.32.1 -> 2.32.3
2021-07-23 19:29:06 -04:00
Philipp Bartsch ea8fc4327f webkitgtk: 2.32.1 -> 2.32.3
Relevant security advisory:
https://webkitgtk.org/security/WSA-2021-0004.html

CVEs:
CVE-2021-1817,  CVE-2021-1820,  CVE-2021-1825,  CVE-2021-1826,
CVE-2021-21775, CVE-2021-21779, CVE-2021-21806, CVE-2021-30661,
CVE-2021-30663, CVE-2021-30665, CVE-2021-30666, CVE-2021-30682,
CVE-2021-30689, CVE-2021-30720, CVE-2021-30734, CVE-2021-30744,
CVE-2021-30749, CVE-2021-30758, CVE-2021-30761, CVE-2021-30762,
CVE-2021-30795, CVE-2021-30797, CVE-2021-30799

(cherry picked from commit 3bb38198e94c9076acac411caae0f1c15ad1e96e)
2021-07-23 23:09:31 +00:00
Maximilian Bosch 91c154210e
Merge pull request #131251 from NixOS/backport-131215-to-release-21.05
[Backport release-21.05] grocy: 3.0.1 -> 3.1.0
2021-07-23 18:45:55 +02:00
oxalica 18f9a94bcd
tdesktop: bundle the default font
It's worth to think about setting -DDESKTOP_APP_USE_PACKAGED_FONTS=OFF
since it's impossible to install fonts as dependencies of packages with
Nix and tdesktop's widgets are developed only with Open Sans in mind (it
has a lot of hardcoded values and wide fonts like DejaVu may
even go out of widgets' bounds)

https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649
(cherry picked from commit 27585b98971f8180e12592e694d38a19c072d1bf)
2021-07-24 00:43:50 +08:00