294453 Commits

Author SHA1 Message Date
github-actions[bot]
40abc418bb
Merge staging-next-21.05 into staging-21.05 2021-09-04 00:03:39 +00:00
github-actions[bot]
3d6b9811f4
Merge release-21.05 into staging-next-21.05 2021-09-04 00:02:58 +00:00
Robert Scott
90de298d15
Merge pull request #136504 from wamserma/backport-mc-135690
[21.05] mc: 4.8.26 -> 4.8.27
2021-09-04 00:44:42 +01:00
Michael Weiss
ac663e69a3
Merge pull request #136575 from primeos/chromium-backport
[21.05] Backport the required commits for the Chromium M93 update
2021-09-03 23:04:10 +02:00
github-actions[bot]
ed81bc5bd3
Merge staging-next-21.05 into staging-21.05 2021-09-03 18:02:46 +00:00
github-actions[bot]
0780692b0e
Merge release-21.05 into staging-next-21.05 2021-09-03 18:02:13 +00:00
Patrick Hilhorst
2efd71f11f
Merge pull request #136608 from NixOS/backport-136580-to-release-21.05
[Backport release-21.05] vscode,vscodium: fix moving files to the trash
2021-09-03 18:54:15 +02:00
Naïm Favier
e67b69d9a2 vscode,vscodium: fix moving files to the trash
Put gio in PATH so that VSCode is able to move files to the trash.

(cherry picked from commit a75326417df32c0354e3244a9461700d214eab82)
2021-09-03 16:13:10 +00:00
Kim Lindberger
355b6d3675
Merge pull request #136572 from yu-re-ka/feature/gitaly-git2go-name-backport
[21.05] gitaly: Fix gitaly-git2go binary name
2021-09-03 16:28:26 +02:00
Domen Kožar
b60ccb80ad
Merge pull request #136585 from NixOS/backport-136475-to-release-21.05
[Backport release-21.05] nixos/pipewire: use absolute path for jack libs
2021-09-03 16:13:13 +02:00
Artturin
3adca1abf6 nixos/pipewire: use absolute path for jack libs
(cherry picked from commit 756e60344fd83427148d8acf416c63573404a2e9)
2021-09-03 13:40:40 +00:00
github-actions[bot]
140ea6fb03
Merge staging-next-21.05 into staging-21.05 2021-09-03 12:02:47 +00:00
github-actions[bot]
cb5d86d6ab
Merge release-21.05 into staging-next-21.05 2021-09-03 12:02:15 +00:00
Michael Weiss
b0c90ba71b
chromiumDev: 95.0.4621.4 -> 95.0.4628.3
(cherry picked from commit 79725cdc4d81395191a3603a61fdb14eb739b9cf)
2021-09-03 13:59:35 +02:00
Michael Weiss
3bfe8801e3
chromiumBeta: 94.0.4606.20 -> 94.0.4606.31
(cherry picked from commit 55e9fc96666eecd1d4fba29a37b6f474b60667c4)
2021-09-03 13:59:34 +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
dae2c39b9e
chromiumDev: 94.0.4606.20 -> 95.0.4621.4
(cherry picked from commit 04fa5e852a0c467cfa29dce74500705ed5d21e0c)
2021-09-03 13:59:32 +02:00
Michael Weiss
2af37d53bd
chromiumBeta: 93.0.4577.58 -> 94.0.4606.20
(cherry picked from commit 33a4dae995e39360da9b70024da3e1267318ff84)
2021-09-03 13:59:31 +02:00
Michael Weiss
dd2d264062
chromiumDev: 94.0.4606.12 -> 94.0.4606.20
(cherry picked from commit 5bb4a67959cebbe8b24021c0a583a614245a2e20)
2021-09-03 13:59:30 +02:00
Michael Weiss
3de9ca8a8d
chromiumBeta: 93.0.4577.51 -> 93.0.4577.58
(cherry picked from commit d0dad3f519117db63fa2f101c47c7c8e206a294a)
2021-09-03 13:59:29 +02:00
Michael Weiss
9e0211b13c
google-chrome-dev: Fix the build
crashpad_handler was renamed to chrome_crashpad_handler.

(cherry picked from commit 88336eea953611be8e7da63661000ec7eb9f6032)
2021-09-03 13:59:28 +02:00
Michael Weiss
d3e31a97e3
chromiumDev: 94.0.4603.0 -> 94.0.4606.12
I've upstreamed fix-missing-atspi2-dependency.patch.

(cherry picked from commit 6ca181b3608eba3d21325ed32c1958536fa7b7df)
2021-09-03 13:59:24 +02:00
Michael Weiss
3fa4af5d29
chromiumBeta: 93.0.4577.42 -> 93.0.4577.51
(cherry picked from commit 2834fea828e632b4152b7f14b74d729eacceec66)
2021-09-03 13:58:07 +02:00
Michael Weiss
d3f6410eff
chromium: Document the main gn build flags
(cherry picked from commit a1fdebcef0befd3c81955e5a3d11292a819f84fc)
2021-09-03 13:58:06 +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
f2e8955366
chromiumBeta: 93.0.4577.25 -> 93.0.4577.42
(cherry picked from commit badee4e70a70b126830fb3964c90e72edfafa1bc)
2021-09-03 13:58:04 +02:00
Michael Weiss
3670f55599
chromiumBeta: Build with LLVM 13
(cherry picked from commit 403ce1a9a3624e7b87606b99ea15f531fa17f8e7)
2021-09-03 13:58:01 +02:00
Michael Weiss
905b1242d8
chromiumDev: 94.0.4595.0 -> 94.0.4603.0
(cherry picked from commit 624cb8bc2b4fd38db3eff105be197d5b875bc61d)
2021-09-03 13:56:31 +02:00
Michael Weiss
4c19443f54
chromium: Restructure the code
This should make it a little bit easier to read. The (native) build
inputs and options now have a consistent order, defaultDependencies and
yasm aren't required anymore, and this adds some brief comments.
Note: The third_party/node/linux/node-linux-x64/bin/node change causes
rebuilds.

(cherry picked from commit 4a5b36725919c002751228515d518f23772f988e)
2021-09-03 13:56:30 +02:00
Michael Weiss
c803b6f93a
chromiumBeta: 93.0.4577.18 -> 93.0.4577.25
(cherry picked from commit 39d95aa8e96f5508a9ffabf96513fc17151e2e81)
2021-09-03 13:56:29 +02:00
Michael Weiss
d14b18dd69
chromiumDev: Fix the build
Note: I've only tested this with llvmPackages_git but it should work
with llvmPackages_13 as well.

fieldtrial_testing_like_official_build was renamed to
disable_fieldtrial_testing_config:
486e9d58c0

(cherry picked from commit 1e372f40047912013568d731208655bd9dab526c)
2021-09-03 13:56:28 +02:00
Kim Lindberger
9117f2a7d9
gitaly: Fix gitaly-git2go binary name (#136569)
e7f8fe4f67
changed the binary name to always end with its module version. This
makes sure gitaly's internal version references are set to the package
version and renames the binary, postfixing it with the package
version.

(cherry picked from commit d14e9188d1cd88f1b530bf860638c2de27486a6d)
2021-09-03 13:52:57 +02:00
Michael Weiss
b5d1601f7a
Merge pull request #136562 from primeos/llvm-backport
[21.05] Backport LLVM 13
2021-09-03 13:34:11 +02:00
Michael Weiss
7055f658d9
Merge pull request #136561 from primeos/chromium-backport
[21.05] Backport the first batch of Chromium patches
2021-09-03 11:52:51 +02:00
Michael Weiss
56ebee647a
llvmPackages_13: 13.0.0-rc1 -> 13.0.0-rc2
Upstream backported 5060224d9eed8b8359ed5090bb7c577b8575e9e7:
93da37dc58

(cherry picked from commit bac15390f5dbe8072b7acc77329e68a9fdfb5758)
2021-09-03 11:40:30 +02:00
Yureka
90cb748196
llvmPackages_13.libcxx: mark as broken on darwin
(cherry picked from commit f8230bb0f482e639b09d84c2ffaf2ca95c179427)
2021-09-03 11:40:29 +02:00
Yureka
373402fb6d
llvm_13: fix tests on non-x86 platforms
(cherry picked from commit 48d1e393c03cfbb9c00979a28f99f9a8bd2dac94)
2021-09-03 11:40:28 +02:00
Yureka
036e4b3df8
llvm_13: workaround for llvm bug 50611
https://bugs.llvm.org/show_bug.cgi?id=50611
(cherry picked from commit 91b15b6dcfd2d394e707fdfaa10d563bbf2f8198)
2021-09-03 11:40:27 +02:00
Michael Weiss
bcfaa8041c
pkgsi686Linux.llvmPackages_13.compiler-rt: fix build
Ported from a7c4537a729929f6670349f67d248ffb6ff800da.

(cherry picked from commit c8db49f0a939ce2219b41f8d3993268ceeef05f1)
2021-09-03 11:40:26 +02:00
Michael Weiss
81aa38b83d
llvmPackages_13.lldb: python into lib & wrap binary
Ported from cc7740ae770c52ac1f385aa25cfc143fe79c6b6e.

(cherry picked from commit a5f0733461e6937d0397e2afdef73db15f748c61)
2021-09-03 11:40:25 +02:00
Michael Weiss
11d06468b3
llvmPackages_13.lldb: fix python lldb library
Ported from e097f7efc77726a17acca7be3e6e2346331883f3.

(cherry picked from commit a6defaf953d4470a9dcf8cae3bef1c2c4d17f296)
2021-09-03 11:40:25 +02:00
Michael Weiss
80f644e0d2
llvmPackages_13.compiler-rt: fix build on darwin
Ported from cf4e1b9e62ab987552eb676f7618ea085f12a751.

(cherry picked from commit 6a1354b1fc14dfd549bd88f58aede0178f489415)
2021-09-03 11:40:24 +02:00
Michael Weiss
cb51b0e984
llvmPackages_13.clang: fix linker invocation with LLVMgold plugin
Ported from 3530837417da13076a2c8412de2c0c385dfbd648.

(cherry picked from commit c858c42002313cc5f9c837c10d8b3babddc77b32)
2021-09-03 11:40:23 +02:00
Michael Weiss
90c3f09977
llvmPackages_13: init at 13.0.0-rc1
(cherry picked from commit 2540b66ba652d68d9f1ba487d516c22f8ae69bec)
2021-09-03 11:40:19 +02:00
Michael Weiss
ebd2a830dc
llvmPackages_13: Copy from llvmPackages_git
(cherry picked from commit f3f86d47220e2c2332d60f6bd0a89b76a628529d)
2021-09-03 11:39:05 +02:00
Michael Weiss
7ab6adf608
chromium: get-commit-message.py: Support specifying a version
This makes the usage from update.py more robust.
It also adds a workaround for [0] which currently lacks a title.

[0]: https://chromereleases.googleblog.com/2021/08/the-stable-channel-has-been-updated-to.html

(cherry picked from commit 9bc2d82b55549f0786f729fdc080335d8aa4a8a8)
2021-09-03 11:30:41 +02:00
Michael Weiss
ba876b30f2
chromiumDev: 93.0.4577.18 -> 94.0.4595.0
(cherry picked from commit f9eb20c0a96c01f60a8162d228eede544f7e230e)
2021-09-03 11:30:40 +02:00
Michael Weiss
c46ea2796f
chromium: update.py: Implement automatic committing of the updates
This functionality saves some unnecessary work.

(cherry picked from commit e143dc53b23a56621a2da13cf8698bea7521f94a)
2021-09-03 11:30:39 +02:00
Felix Buehler
1361a07a95
chromium: remove phases
(cherry picked from commit 2ae5f1a6b85dbc632ad3a800b2639e633dc6d89e)
2021-09-03 11:30:38 +02:00
Michael Weiss
3ababf6d04
chromium: Drop our closure_compiler patch for Java
Hopefully the Java dependency can be dropped soon:
https://bugs.chromium.org/p/chromium/issues/detail?id=1192875#c5

(cherry picked from commit 8505750ac89a1aee154038f6ac9c30cbdd221cfe)
2021-09-03 11:28:51 +02:00