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
Michael Weiss
701cb52607
chromium: Drop two gn overrides that are not required anymore
...
The chromium and chromiumBeta builds still succeed.
(cherry picked from commit 2682531c67cefc5110adfa546bfdc66e6374e91f)
2021-09-03 11:27:08 +02:00
Michael Weiss
65b3f3f186
chromium: Restructure gnFlags
...
This doesn't cause any rebuilds because we use a set but should make it
a bit easier to understand what's going on. This also moves two flags
that where incorrectly in "optionalAttrs pulseSupport" (enabled by
default) out of there.
The native client deprecation is stated here:
https://developer.chrome.com/docs/native-client/
(cherry picked from commit 555c3afaf2b17af6ad06ae82b545ca06e252bcd1)
2021-09-03 11:27:08 +02:00
Michael Weiss
aa0e9cfd1e
chromiumBeta: 92.0.4515.107 -> 93.0.4577.18
...
(cherry picked from commit d7ab681b7aa525b4c3081473ab68dd13ae85c7b2)
2021-09-03 11:27:07 +02:00
Michael Weiss
e77d77484a
chromiumDev: 93.0.4577.15 -> 93.0.4577.18
...
(cherry picked from commit 7f8de3536ab224357110274441c209f8291a6cbd)
2021-09-03 11:27:06 +02:00
Michael Weiss
1ffa4bbbd6
chromiumDev: 93.0.4577.8 -> 93.0.4577.15
...
(cherry picked from commit 68adc7b81c4743f3314aa720c2ac2a0e6d7e44e1)
2021-09-03 11:27:05 +02:00
Michael Weiss
cb026a4a09
chromiumDev: Fix the build
...
Our system FFmpeg version is too outdated and Snappy causes a linking
failure (I didn't have time to investigate yet). Hopefully we can revert
this before the stable release of M93.
(cherry picked from commit bd22d2425cb7f14b1f98f7432e6ad38208609adb)
2021-09-03 11:27: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
81c33c7969
chromium: Minimize the diff to nixos-unstable
...
Keeping the diff minimal makes backporting updates easier.
This is basically e9e5f5f84de backported for Chromium.
2021-09-03 11:23:03 +02:00
nixpkgs-upkeep-bot
0950b449b5
vscodium: 1.59.1 -> 1.59.1
...
(cherry picked from commit 5ecadf00522c7ecbfef64a41f9402722040ccedb)
2021-09-03 16:55:08 +09:00
Mikael Heino
6647b720f7
ntfs-3g: update homepage
...
(cherry picked from commit 7ca49a701a7b6a9b90738af132f6b57e4160facd)
2021-09-03 01:48:02 +00:00
Mikael Heino
319068cc94
ntfs-3g: 2017.3.23 -> 2021.8.22
...
New version has important security fixes.
(cherry picked from commit 0c35c72ed4d85da1fa3f953aa2882716bb8d6332)
2021-09-03 01:48:01 +00:00
github-actions[bot]
a1049e285e
Merge staging-next-21.05 into staging-21.05
2021-09-03 00:03:31 +00:00
github-actions[bot]
7a5873a0dd
Merge release-21.05 into staging-next-21.05
2021-09-03 00:02:58 +00:00
adisbladis
2fe9d531d0
Merge pull request #136494 from NixOS/backport-136228-to-release-21.05
...
[Backport release-21.05] qt5.qt3d: init module
2021-09-02 17:11:13 -05:00
Sergei Trofimovich
c3798535b8
mc: 4.8.26 -> 4.8.27
...
(cherry picked from commit 326209f03708f07545c13f5970cc3ae8a42053e1)
2021-09-02 22:35:11 +02:00
adisbladis
ed77a24bb5
qt5.qt3d: init module
...
(cherry picked from commit a7432ad3115c153a901cd49da24e7b766cce1e21)
2021-09-02 19:11:00 +00:00
adisbladis
edf806cf27
Merge pull request #136490 from NixOS/backport-123011-to-staging-21.05
...
[Backport staging-21.05] bluez: Disable kernel-dependent test test-mesh-crypto
2021-09-02 14:10:33 -05:00
Robert Scott
792dba27aa
squashfsTools: add patch for CVE-2021-40153
2021-09-02 19:22:21 +01:00
github-actions[bot]
667cd91ecc
Merge staging-next-21.05 into staging-21.05
2021-09-02 18:03:02 +00:00
Josef Kemetmüller
bebbeb1918
bluez: Disable kernel dependent test-mesh-crypto
...
I'm having trouble building bluez on a CentOS 7.9 builder.
Turns out that the test-mesh-crypto test depends on the following Linux
kernel configuration items:
CONFIG_CRYPTO_[USER|USER_API|USER_API_AEAD|USER_API_HASH|AES|CCM|AEAD|CMAC]
and will fail if run wih an incompatible kernel with the following error
message:
...
IVindex = 12345678
NetworkNonce = 00800000011201000012345678
00800000011201000012345678 => PASS
PrivacyRandom = 000000000012345678b5e5bfdacbaf6c
000000000012345678fffd034b50057e => FAIL
FAIL unit/test-mesh-crypto (exit status: 1)
I found the same bug reported on Gentoo https://bugs.gentoo.org/704190 .
Their fix is to only run the test if the kernel options are available,
which we don't want to do for build reproducibility.
Instead we just want to skip the test unconditionally. As it's simpler
to completely override the test instead of patching the build system, we
opt for doing just that.
(cherry picked from commit 05c517698dcf6a989e364863cf5e7f6f548dd50a)
2021-09-02 18:02:37 +00:00
github-actions[bot]
eb8ef5940d
Merge release-21.05 into staging-next-21.05
2021-09-02 18:02:28 +00:00
Michael Weiss
6bfe71f2a4
Revert "chromium: 92.0.4515.159 -> 93.0.4577.63"
...
This reverts commit acf91fbac7
.
Reason: I didn't pay enough attention, this lacks additional backports,
sorry!
2021-09-02 17:55:10 +02:00
Michael Weiss
ea2023628b
Merge pull request #136386 from NixOS/backport-136373-to-release-21.05
...
[Backport release-21.05] chromium: 92.0.4515.159 -> 93.0.4577.63
2021-09-02 17:53:25 +02:00
Sumner Evans
7ddb48c45f
element-{web,desktop}: 1.8.1 -> 1.8.2
...
(cherry picked from commit 29c70e8b88e1f2ae25f44691d34ffdb073d575f5)
2021-09-02 09:06:19 -06:00
Anderson Torres
ec1c2a06cb
Merge pull request #136424 from NixOS/backport-136382-to-release-21.05
...
[Backport release-21.05] palemoon: 29.4.0.1 -> 29.4.0.2
2021-09-02 10:21:00 -03:00
Maximilian Bosch
2960083854
strace: 5.13 -> 5.14
...
ChangeLog: https://github.com/strace/strace/releases/tag/v5.14
(cherry picked from commit e58cba3ca4a4a29800f1780c30cbe0c46a76efdd)
2021-09-02 12:52:40 +00:00
github-actions[bot]
c48f16aef0
Merge staging-next-21.05 into staging-21.05
2021-09-02 12:02:51 +00:00
github-actions[bot]
453a47f57e
Merge release-21.05 into staging-next-21.05
2021-09-02 12:02:17 +00:00
Maximilian Bosch
796e823083
Merge pull request #134492 from NixOS/backport-134335-to-release-21.05
...
[Backport release-21.05] element-{web,desktop}: 1.7.34 -> 1.8.1
2021-09-02 13:44:14 +02:00
Martin Weinelt
b642e782d8
Merge pull request #136458 from mweinelt/21.05/fix-httplib2
2021-09-02 13:22:16 +02:00