Commit Graph

58105 Commits

Author SHA1 Message Date
Luke Granger-Brown 5ea98b810c mercurial: fix patch links again
The conclusion is that Phabricator does not, in fact, generate stable
patch links. In any case, these have landed, so we can just use the
patches from Mercurial's hgweb instance instead, which should be more
stable.

(cherry picked from commit 67444f8a393846b1431cfeb936e83a9f24725e2d)
2021-07-27 07:55:52 -07:00
Sandro 1bd5157b2c
Merge pull request #130829 from NixOS/backport-130273-to-release-21.05 2021-07-27 11:37:02 +00:00
Aaron Andersen d935d519dc
Merge pull request #131575 from NixOS/backport-131209-to-release-21.05
[Backport release-21.05] hydroxide: 0.2.18 -> 0.2.19
2021-07-26 21:32:22 -04:00
R. RyanTM e1489da3b2 hydroxide: 0.2.18 -> 0.2.19
(cherry picked from commit 23e2cf23bcee0567e22a0f7dc0859f988cd7e500)
2021-07-26 12:58:24 +00:00
R. RyanTM bfd24c0bd8 feh: 3.7 -> 3.7.1
(cherry picked from commit 1493f098f819530d60f5d226dbf6a0308098833d)
2021-07-26 10:46:14 +00:00
Martin Weinelt c8569c32ba
Merge pull request #131546 from taku0/firefox-bin-90.0.2_release-21.05 2021-07-26 11:56:15 +02:00
Maximilian Bosch e6c441a5dc
Merge pull request #131524 from NixOS/backport-131217-to-release-21.05
[Backport release-21.05] element-{web,desktop}: 1.7.31 -> 1.7.33
2021-07-26 09:13:44 +02:00
Michael Weiss 4f6946867e
Merge pull request #131461 from primeos/chromium-backport
[21.05] chromium: 91.0.4472.164 -> 92.0.4515.107
2021-07-26 08:49:13 +02:00
taku0 caf1219646 firefox: 90.0.1 -> 90.0.2
(cherry picked from commit 82feb1120172e0615e1f6f4dc517a69e8c6c03f6)
2021-07-26 14:08:16 +09:00
taku0 1096ca11df firefox-bin: 90.0.1 -> 90.0.2
(cherry picked from commit b14e3171773c1791b50dc19fa6d68cc285b11741)
2021-07-26 14:08:16 +09:00
taku0 633edf7793 firefox: 90.0 -> 90.0.1
(cherry picked from commit 1ad4db95fbf0841806e488371f825ddd696d4bfa)
2021-07-26 14:08:15 +09:00
taku0 b27e930fd2 firefox-bin: 90.0 -> 90.0.1
(cherry picked from commit 928c7dbb61504d717ed356b3c6d6d26154aeea24)
2021-07-26 14:08:15 +09:00
Maximilian Bosch 0bf820521a element-desktop: try to fix localization issues
I know that the en_EN.json vs. en-us.json is a nasty hack, but I don't
really understand where this `en-us.json` is supposed to be coming from.

(cherry picked from commit b856b195409121457e7c52ad8177dc73a15c423c)
2021-07-25 22:32:51 +00:00
Maximilian Bosch a955535eae element-desktop: 1.7.31 -> 1.7.33
ChangeLogs:
* https://github.com/vector-im/element-desktop/releases/tag/v1.7.33
* https://github.com/vector-im/element-desktop/releases/tag/v1.7.32

(cherry picked from commit 07620c8697c4150ee71cfd26462d04666e781fbd)
2021-07-25 22:32:50 +00:00
Maximilian Bosch ac90c8d510 element-web: 1.7.31 -> 1.7.33
ChangeLogs:
* https://github.com/vector-im/element-web/releases/tag/v1.7.33
* https://github.com/vector-im/element-web/releases/tag/v1.7.33-rc.1
* https://github.com/vector-im/element-web/releases/tag/v1.7.32
* https://github.com/vector-im/element-web/releases/tag/v1.7.32-rc.1

(cherry picked from commit 040fabf509ed2a10098fee4a3244ff4f3daa1934)
2021-07-25 22:32:50 +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
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 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
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
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
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