mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-06-05 21:03:40 +00:00
Compare commits
494 Commits
25f5383063
...
535f3e6942
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
535f3e6942 | ||
|
|
b767740ece | ||
|
|
ac844dee3d | ||
|
|
822abaebdc | ||
|
|
4213d10b97 | ||
|
|
1153239470 | ||
|
|
5dbbfa03ab | ||
|
|
f796bb2132 | ||
|
|
1be122754c | ||
|
|
3f18fe3583 | ||
|
|
b1fcd8f90a | ||
|
|
57b257efd9 | ||
|
|
90adaa1297 | ||
|
|
946326142c | ||
|
|
d62c968d66 | ||
|
|
e648a594e0 | ||
|
|
f8a3a373b4 | ||
|
|
261b732e2c | ||
|
|
3935611d08 | ||
|
|
1e20d7f402 | ||
|
|
0e025b4d83 | ||
|
|
410231c20d | ||
|
|
2ba362dfb5 | ||
|
|
5eae24458e | ||
|
|
256e5262d5 | ||
|
|
cd623f2f29 | ||
|
|
2dc1cbbc64 | ||
|
|
65a6cd2e13 | ||
|
|
73fc61d9db | ||
|
|
393474d770 | ||
|
|
a726d3b031 | ||
|
|
54546d7b8a | ||
|
|
699d477829 | ||
|
|
8f90cfc8c4 | ||
|
|
682e09c77f | ||
|
|
700d889afa | ||
|
|
3bf746dabd | ||
|
|
55ed1ecfcb | ||
|
|
a48b101022 | ||
|
|
93bfd38a3a | ||
|
|
af55bff895 | ||
|
|
ea82b7d4bd | ||
|
|
9fc81eb9f9 | ||
|
|
b976e96772 | ||
|
|
5c20bb2cdf | ||
|
|
2cc0f52aec | ||
|
|
4bd12adb8e | ||
|
|
12cd75cee7 | ||
|
|
e10dd798a3 | ||
|
|
0e568375fb | ||
|
|
8260e760f3 | ||
|
|
3d43ef28ed | ||
|
|
010411ad77 | ||
|
|
b669759f0a | ||
|
|
5d22877451 | ||
|
|
3196d31f4e | ||
|
|
b28b6a2fe0 | ||
|
|
19cf2b1b02 | ||
|
|
82cef6098a | ||
|
|
a0949484b0 | ||
|
|
8534b2360f | ||
|
|
c1ca1e9fb8 | ||
|
|
1bf4245a9b | ||
|
|
3b2730cdfa | ||
|
|
fdd22a3513 | ||
|
|
05c97eddbe | ||
|
|
a430b4f7ab | ||
|
|
d87275b816 | ||
|
|
935feb016c | ||
|
|
067966c13d | ||
|
|
831ec04251 | ||
|
|
191a89a79b | ||
|
|
fb1c79923b | ||
|
|
758214ba77 | ||
|
|
304362d4eb | ||
|
|
5bc0c937fb | ||
|
|
2b79d0759a | ||
|
|
26c310a50f | ||
|
|
38f6fc995a | ||
|
|
f611502e2f | ||
|
|
d95a002e88 | ||
|
|
840ebf4210 | ||
|
|
896a73396c | ||
|
|
312b6ceed4 | ||
|
|
22025f1c13 | ||
|
|
d439513fc9 | ||
|
|
c1bbe8cbd9 | ||
|
|
c8e67061b4 | ||
|
|
526bd2be40 | ||
|
|
6dbd353b4b | ||
|
|
86ef5a5a6a | ||
|
|
60f1ae9506 | ||
|
|
ea0558b776 | ||
|
|
63896ab50c | ||
|
|
b303c09720 | ||
|
|
d5fc381de9 | ||
|
|
7661034fcd | ||
|
|
7f1cb65362 | ||
|
|
d9d1646abd | ||
|
|
99e9082f4b | ||
|
|
ae3c552a65 | ||
|
|
531bd22213 | ||
|
|
7f4474a7ff | ||
|
|
546f933f3f | ||
|
|
50b587a43d | ||
|
|
1275163323 | ||
|
|
8427cc5113 | ||
|
|
67bdd6a166 | ||
|
|
6d9ca5abec | ||
|
|
73bc112497 | ||
|
|
a9edb9a1b7 | ||
|
|
3be2e83ad9 | ||
|
|
52191decc2 | ||
|
|
4f55285eb3 | ||
|
|
659328a69e | ||
|
|
2dd9907c64 | ||
|
|
513fcef15f | ||
|
|
32b4c6794b | ||
|
|
248b7eb0e4 | ||
|
|
014a8b9fa8 | ||
|
|
9f154c7406 | ||
|
|
255d527f84 | ||
|
|
c38d7fd90f | ||
|
|
466c2dafa1 | ||
|
|
d0b6083313 | ||
|
|
03b8e77dc8 | ||
|
|
3511a83f14 | ||
|
|
d3b76b0e57 | ||
|
|
0aade16ba3 | ||
|
|
a9f3d1316d | ||
|
|
fb0c0997d5 | ||
|
|
4ae4ff0d4b | ||
|
|
3d9e724087 | ||
|
|
facbf606f2 | ||
|
|
542d69f82d | ||
|
|
4b311a8f13 | ||
|
|
bd60ed1ecf | ||
|
|
9b896f2069 | ||
|
|
27479a8fb2 | ||
|
|
ec4c83ded2 | ||
|
|
cea0435403 | ||
|
|
23cbcb1ea6 | ||
|
|
a42ac8173b | ||
|
|
dc72a273ad | ||
|
|
8caf2151df | ||
|
|
3b13be97f5 | ||
|
|
a94a0df2bf | ||
|
|
91a8535b36 | ||
|
|
4a2cd0b1ca | ||
|
|
39bcf29882 | ||
|
|
550819149b | ||
|
|
4a108076b5 | ||
|
|
4a9dbd0960 | ||
|
|
6f6a558f57 | ||
|
|
73835e7043 | ||
|
|
62bda76a3d | ||
|
|
811855cc81 | ||
|
|
0ed5630715 | ||
|
|
1fdb9d7afe | ||
|
|
5ed65836ec | ||
|
|
d405a4bc77 | ||
|
|
dcd47467d8 | ||
|
|
d241506fb8 | ||
|
|
bde5f284aa | ||
|
|
7ac7ef494e | ||
|
|
b1c8fb0bf7 | ||
|
|
3da513231e | ||
|
|
5e00562ac3 | ||
|
|
7264508d49 | ||
|
|
1a210cb135 | ||
|
|
3231d00405 | ||
|
|
421f2b6fd6 | ||
|
|
3b2fcb8440 | ||
|
|
6ff2707e67 | ||
|
|
d6912e493c | ||
|
|
440cdc801b | ||
|
|
291a247dec | ||
|
|
cca9aae27d | ||
|
|
df9f92e18e | ||
|
|
61ce030aac | ||
|
|
478e9b24d1 | ||
|
|
51fe9dbe19 | ||
|
|
1a0997010c | ||
|
|
14c5d82a66 | ||
|
|
db84109f4c | ||
|
|
c49b47e88b | ||
|
|
0f749800cd | ||
|
|
28bb283f0c | ||
|
|
63f5f0cc5a | ||
|
|
e4417221ad | ||
|
|
9b13fccc93 | ||
|
|
d73e6d6015 | ||
|
|
c171c7e29b | ||
|
|
c1a577a526 | ||
|
|
168bfc1046 | ||
|
|
ce2d2d94bc | ||
|
|
5fc22307ff | ||
|
|
6583af8c67 | ||
|
|
a762478177 | ||
|
|
ba14f8964c | ||
|
|
260f6d3429 | ||
|
|
353c774912 | ||
|
|
1e108cb439 | ||
|
|
fb55d4c723 | ||
|
|
cfb6193746 | ||
|
|
31e9aeaf5d | ||
|
|
9ccbaff36b | ||
|
|
6a56c55837 | ||
|
|
523fd44e8f | ||
|
|
978ec369f9 | ||
|
|
469854aaee | ||
|
|
70c7050959 | ||
|
|
7a6be6d3fc | ||
|
|
e617fb6cbd | ||
|
|
d213feb387 | ||
|
|
676db8c61e | ||
|
|
0ab3ce4fa9 | ||
|
|
52b29907ab | ||
|
|
cbbbe031c1 | ||
|
|
c9251f7ac6 | ||
|
|
1e1060e768 | ||
|
|
8307f11899 | ||
|
|
def9342bd4 | ||
|
|
641a095745 | ||
|
|
780a0c1f84 | ||
|
|
9c08d0c349 | ||
|
|
14b2e1f2ae | ||
|
|
96ad8c92c1 | ||
|
|
908cadcb32 | ||
|
|
bb6c2fc65d | ||
|
|
19bbb48fdf | ||
|
|
3e45202cfe | ||
|
|
335a142912 | ||
|
|
14c799ab61 | ||
|
|
7ec241eecf | ||
|
|
4d66785aca | ||
|
|
7632d65175 | ||
|
|
c1c813b80d | ||
|
|
ca49d349d8 | ||
|
|
d3de62524a | ||
|
|
2f31d1a645 | ||
|
|
982bae1fbe | ||
|
|
29f7f59f23 | ||
|
|
b7cde3237b | ||
|
|
67b1d435f3 | ||
|
|
f5190b6928 | ||
|
|
a8d0e22201 | ||
|
|
f52c223fcf | ||
|
|
85ca4154fd | ||
|
|
0269512e78 | ||
|
|
11c8668ea4 | ||
|
|
8ce8853ff1 | ||
|
|
bd623dbb5e | ||
|
|
d954bef262 | ||
|
|
c33441ba73 | ||
|
|
848cbe5f0a | ||
|
|
2dc04799ed | ||
|
|
d3b4bee0a5 | ||
|
|
89eeb0b04b | ||
|
|
ee26e2beae | ||
|
|
1929b51983 | ||
|
|
955fb8ebd2 | ||
|
|
8742b7d8e2 | ||
|
|
37c00e907b | ||
|
|
88298d6346 | ||
|
|
193351585c | ||
|
|
287d3dc160 | ||
|
|
25ad439d4e | ||
|
|
ed94b9f746 | ||
|
|
c767db50e2 | ||
|
|
7218b61388 | ||
|
|
5e44c82aee | ||
|
|
72e4093b08 | ||
|
|
662e5a54f7 | ||
|
|
dd796aa746 | ||
|
|
317248efcd | ||
|
|
dec6653a77 | ||
|
|
3f11b9c009 | ||
|
|
88d3a55756 | ||
|
|
e9651e2fd4 | ||
|
|
9d72afdcad | ||
|
|
5bc7529fb8 | ||
|
|
259d2614a3 | ||
|
|
eb3960b0fa | ||
|
|
b933b0d074 | ||
|
|
d5f7e7ee98 | ||
|
|
78071a3fbc | ||
|
|
15fec05bfd | ||
|
|
e60871b207 | ||
|
|
ac6e1fae6e | ||
|
|
1e31450425 | ||
|
|
e19a38a2cc | ||
|
|
fe6a949cd0 | ||
|
|
1f1acd5f23 | ||
|
|
32cf083116 | ||
|
|
726e534b73 | ||
|
|
809ac9decc | ||
|
|
ecadfebb38 | ||
|
|
8bcdbf7529 | ||
|
|
532adf42f4 | ||
|
|
a4060a48e9 | ||
|
|
ad59befbf3 | ||
|
|
3eba1dac2e | ||
|
|
43f2881438 | ||
|
|
42b31385aa | ||
|
|
6c41d212d9 | ||
|
|
283ec1093a | ||
|
|
bcd7933568 | ||
|
|
916604a40a | ||
|
|
8e90818e9b | ||
|
|
4a57010a0e | ||
|
|
589ed37c8a | ||
|
|
2d22bf589e | ||
|
|
f11f08c9cf | ||
|
|
5b7d65ffb4 | ||
|
|
6194a5a600 | ||
|
|
9ca5a2521c | ||
|
|
51e34cde89 | ||
|
|
b9f1a50bca | ||
|
|
0e1896634a | ||
|
|
adf81faa49 | ||
|
|
e55cbd9bbe | ||
|
|
b509419c9c | ||
|
|
1b6f0c5288 | ||
|
|
0c76ded5a7 | ||
|
|
766f7b4ce7 | ||
|
|
a5faf00626 | ||
|
|
fbd30e7ba2 | ||
|
|
a66ddc746b | ||
|
|
f6bbb81fca | ||
|
|
fb1b76421f | ||
|
|
c0ec54b02e | ||
|
|
73861f9f97 | ||
|
|
813c022783 | ||
|
|
c2bb084f18 | ||
|
|
6bb1cc107b | ||
|
|
0a9d566022 | ||
|
|
1128331166 | ||
|
|
511547908a | ||
|
|
33ea111a4b | ||
|
|
cdc0133d24 | ||
|
|
b09f589ee8 | ||
|
|
bc24af9845 | ||
|
|
1d34b217e7 | ||
|
|
6b94682eb1 | ||
|
|
e132563d47 | ||
|
|
a7a4825dbe | ||
|
|
e4140c3b75 | ||
|
|
9093dfbe48 | ||
|
|
47ec808e48 | ||
|
|
79619413b0 | ||
|
|
0494f347f0 | ||
|
|
a88809b315 | ||
|
|
d2414a45a6 | ||
|
|
ab55872df1 | ||
|
|
eb4e24f399 | ||
|
|
03e39b1d21 | ||
|
|
8232c5e995 | ||
|
|
9464e94996 | ||
|
|
e73f023996 | ||
|
|
cfbd5b34b7 | ||
|
|
a916c01d87 | ||
|
|
de7bf40d5a | ||
|
|
415e480954 | ||
|
|
f8008bc34c | ||
|
|
a583540970 | ||
|
|
88f5dc5018 | ||
|
|
eec76e8e63 | ||
|
|
a4a102eb1d | ||
|
|
0db27d3ae2 | ||
|
|
fd27b0b3d6 | ||
|
|
e4daa0d7be | ||
|
|
0c62b61977 | ||
|
|
1b3233fed8 | ||
|
|
01bbbb86b3 | ||
|
|
7fb249c2e5 | ||
|
|
a583e8f2cd | ||
|
|
2f5f2e133e | ||
|
|
1eab645e09 | ||
|
|
7e2458914f | ||
|
|
dadb75397f | ||
|
|
06a1169376 | ||
|
|
e6f68cc730 | ||
|
|
0e2f80987d | ||
|
|
458411a524 | ||
|
|
0b80d02bb8 | ||
|
|
df29340d76 | ||
|
|
5d932572c9 | ||
|
|
3005e23cb6 | ||
|
|
486ad9698a | ||
|
|
67636f20db | ||
|
|
5507841456 | ||
|
|
f8b0de7a84 | ||
|
|
85c164d37d | ||
|
|
26e28b700e | ||
|
|
056ed86b2b | ||
|
|
f44c29b9e9 | ||
|
|
e8e159ccce | ||
|
|
9546b85d8d | ||
|
|
851f84c181 | ||
|
|
11766bd191 | ||
|
|
666e0ae694 | ||
|
|
529e3d138b | ||
|
|
bdf639b56d | ||
|
|
74af5f26f3 | ||
|
|
ce3d984572 | ||
|
|
479d0f0bf3 | ||
|
|
dc9083b394 | ||
|
|
2de580d1cc | ||
|
|
cb9fc28b63 | ||
|
|
7b7687447f | ||
|
|
f815274612 | ||
|
|
5fdb21835f | ||
|
|
3b62b9e096 | ||
|
|
2585ca174e | ||
|
|
5c44c8f042 | ||
|
|
5ba129c0a9 | ||
|
|
ad3214aeac | ||
|
|
eb9edd8e6e | ||
|
|
e9477add37 | ||
|
|
5abe9ab5d0 | ||
|
|
4bbff5482d | ||
|
|
e358291e43 | ||
|
|
9f5a200d8e | ||
|
|
8682084c63 | ||
|
|
c2188c3cc3 | ||
|
|
00e253ce03 | ||
|
|
3035ba57a7 | ||
|
|
4060887978 | ||
|
|
1f8c5882e0 | ||
|
|
1a87dbf18b | ||
|
|
96bb97ed89 | ||
|
|
137eab00ea | ||
|
|
f400a0edf7 | ||
|
|
bed8efdf7f | ||
|
|
8fa4ed8a1e | ||
|
|
4df146be55 | ||
|
|
e5e41bd398 | ||
|
|
a724290159 | ||
|
|
e7b971c59a | ||
|
|
bdefa25dca | ||
|
|
fa4e519c39 | ||
|
|
3acc21a473 | ||
|
|
1712c9beba | ||
|
|
f76befec4d | ||
|
|
9319c20a70 | ||
|
|
53f04eda3b | ||
|
|
30454d0a85 | ||
|
|
932e11300d | ||
|
|
b91c8ba179 | ||
|
|
238424aefa | ||
|
|
113894b496 | ||
|
|
50b848d952 | ||
|
|
e9fe3f1abb | ||
|
|
84f7c0e3a3 | ||
|
|
d0f98b6468 | ||
|
|
c50a721491 | ||
|
|
688950d191 | ||
|
|
268214d29e | ||
|
|
715332bfd1 | ||
|
|
17d7cc2d4d | ||
|
|
a89cf9d4ab | ||
|
|
119d48583e | ||
|
|
93774eaf4c | ||
|
|
5a79f0d8df | ||
|
|
542d764478 | ||
|
|
85f705e6f6 | ||
|
|
0b8fa1050c | ||
|
|
8906001234 | ||
|
|
63b2b54734 | ||
|
|
b08a90504d | ||
|
|
5ec6a18fa1 | ||
|
|
136e5cd77a | ||
|
|
6baeefee8a | ||
|
|
4d0d9109d9 | ||
|
|
78f8e67d6f | ||
|
|
c580f776d8 | ||
|
|
1270df7b52 | ||
|
|
4a7536ac65 | ||
|
|
6a72380fd8 | ||
|
|
ab89719f1d | ||
|
|
491c28c019 | ||
|
|
4bdfb53187 | ||
|
|
eacbc39040 | ||
|
|
2e431ef194 | ||
|
|
ca8c801ec5 | ||
|
|
3a97689966 | ||
|
|
c8823d3aa7 | ||
|
|
5568b8b2c5 | ||
|
|
bcf602ced2 | ||
|
|
1c88628d57 | ||
|
|
7900c8248c | ||
|
|
f39a87c786 | ||
|
|
2011838f76 |
1
.github/labeler.yml
vendored
1
.github/labeler.yml
vendored
@@ -9,6 +9,7 @@
|
||||
- '^release-'
|
||||
- '^staging-\d'
|
||||
- '^staging-next-\d'
|
||||
- '^staging-nixos-\d'
|
||||
|
||||
# NOTE: bsd, darwin and cross-compilation labels are handled by ofborg
|
||||
"6.topic: agda":
|
||||
|
||||
4
.github/workflows/periodic-merge-24h.yml
vendored
4
.github/workflows/periodic-merge-24h.yml
vendored
@@ -35,10 +35,14 @@ jobs:
|
||||
into: staging-next-25.11
|
||||
- from: staging-next-25.11
|
||||
into: staging-25.11
|
||||
- from: release-25.11
|
||||
into: staging-nixos-25.11
|
||||
- from: release-26.05
|
||||
into: staging-next-26.05
|
||||
- from: staging-next-26.05
|
||||
into: staging-26.05
|
||||
- from: release-26.05
|
||||
into: staging-nixos-26.05
|
||||
- name: merge-base(master,staging) → haskell-updates
|
||||
from: master staging
|
||||
into: haskell-updates
|
||||
|
||||
@@ -443,6 +443,7 @@ The staging workflow is used for all stable branches with corresponding names:
|
||||
- `master`/`release-YY.MM`
|
||||
- `staging`/`staging-YY.MM`
|
||||
- `staging-next`/`staging-next-YY.MM`
|
||||
- `staging-nixos`/`staging-nixos-YY.MM`
|
||||
|
||||
[^1]: Except changes that cause no more rebuilds than kernel updates
|
||||
|
||||
@@ -506,7 +507,7 @@ These PRs go to `staging-nixos`, see [the next section for more context](#change
|
||||
Changes causing a rebuild of all NixOS tests get a special [`10.rebuild-nixos-tests`](https://github.com/NixOS/nixpkgs/issues?q=state%3Aopen%20label%3A10.rebuild-nixos-tests) label.
|
||||
These changes pose a significant impact on the build infrastructure.
|
||||
|
||||
Hence, these PRs should either target a `staging`-branch or `staging-nixos`, provided one of following conditions applies:
|
||||
Hence, these PRs should either target a `staging`-branch or `staging-nixos`-branch, provided one of following conditions applies:
|
||||
|
||||
* The label `10.rebuild-nixos-tests` is set, or
|
||||
* The PR is a change affecting the Linux kernel.
|
||||
|
||||
@@ -101,9 +101,8 @@ async function checkTargetBranch({ github, context, core, dry }) {
|
||||
const rebuildsAllTests =
|
||||
changed.attrdiff.changed.includes('nixosTests.simple')
|
||||
|
||||
// https://github.com/NixOS/nixpkgs/pull/481205#issuecomment-3790123921
|
||||
// These should go to staging-nixos instead of master,
|
||||
// but release-xx.xx (not staging-xx.xx) when backported
|
||||
// https://github.com/NixOS/nixpkgs/pull/521157
|
||||
// These should go to master and release-xx.xx when backported
|
||||
let isExemptKernelUpdate = false
|
||||
if (prInfo.changed_files === 1) {
|
||||
const changedFiles = (
|
||||
@@ -114,11 +113,8 @@ async function checkTargetBranch({ github, context, core, dry }) {
|
||||
).data
|
||||
isExemptKernelUpdate =
|
||||
changedFiles.length === 1 &&
|
||||
(changedFiles[0].filename ===
|
||||
'pkgs/os-specific/linux/kernel/xanmod-kernels.nix' ||
|
||||
(base.startsWith('release-') &&
|
||||
changedFiles[0].filename ===
|
||||
'pkgs/os-specific/linux/kernel/kernels-org.json'))
|
||||
changedFiles[0].filename ===
|
||||
'pkgs/os-specific/linux/kernel/xanmod-kernels.nix'
|
||||
}
|
||||
|
||||
// https://github.com/NixOS/nixpkgs/pull/483194#issuecomment-3793393218
|
||||
@@ -163,8 +159,10 @@ async function checkTargetBranch({ github, context, core, dry }) {
|
||||
branchText = '(probably either `staging-nixos` or `staging`)'
|
||||
} else if (base === 'master') {
|
||||
branchText = '(probably `staging-nixos`)'
|
||||
} else if (maxRebuildCount >= 500) {
|
||||
branchText = `(probably either \`staging-nixos-${split(base).version}\` or \`staging-${split(base).version}\`)`
|
||||
} else {
|
||||
branchText = `(probably \`staging-${split(base).version}\`)`
|
||||
branchText = `(probably \`staging-nixos-${split(base).version}\`)`
|
||||
}
|
||||
const body = [
|
||||
`The PR's base branch is set to \`${base}\`, but this PR rebuilds all NixOS tests.`,
|
||||
|
||||
@@ -119,11 +119,10 @@ $ pkgs/os-specific/linux/kernel/update.sh
|
||||
The change gets submitted like this:
|
||||
|
||||
* File a PR against `staging-nixos`.
|
||||
* Add a `backport release-XX.XX` label for an automated backport.
|
||||
We don't expect many other changes on that branch to require a backport, hence there's no such branch for stable.
|
||||
* Add a `backport staging-nixos-XX.XX` label for an automated backport.
|
||||
By using an additional PR, we get the automatic backport against stable without manual cherry-picks.
|
||||
* Merge into `staging-nixos`.
|
||||
* File as PR from `staging-nixos` against `master`.
|
||||
* Merge into `staging-nixos` or `staging-nixos-XX.XX`.
|
||||
* File as PR from `staging-nixos` against `master` or `staging-nixos-XX.XX` against `release-xx.xx`.
|
||||
* When all status checks are green, merge.
|
||||
|
||||
### Add a new (major) version of the Linux kernel {#sec-linux-add-new-kernel-version}
|
||||
|
||||
@@ -309,8 +309,7 @@
|
||||
"members": {
|
||||
"AndersonTorres": 5954806,
|
||||
"adisbladis": 63286,
|
||||
"panchoh": 471059,
|
||||
"ttuegel": 563054
|
||||
"panchoh": 471059
|
||||
},
|
||||
"name": "emacs"
|
||||
},
|
||||
@@ -407,12 +406,13 @@
|
||||
"gnome": {
|
||||
"description": "Maintain GNOME desktop environment and platform.",
|
||||
"id": 3806133,
|
||||
"maintainers": {},
|
||||
"maintainers": {
|
||||
"jtojnar": 705123
|
||||
},
|
||||
"members": {
|
||||
"bobby285271": 20080233,
|
||||
"dasj19": 7589338,
|
||||
"hedning": 71978,
|
||||
"jtojnar": 705123
|
||||
"hedning": 71978
|
||||
},
|
||||
"name": "GNOME"
|
||||
},
|
||||
@@ -702,6 +702,7 @@
|
||||
"Mic92": 96200,
|
||||
"Radvendii": 1239929,
|
||||
"edolstra": 1148549,
|
||||
"lisanna-dettwyler": 72424138,
|
||||
"lovesegfault": 7243783,
|
||||
"xokdvium": 145775305
|
||||
},
|
||||
@@ -819,14 +820,13 @@
|
||||
"description": "Maintain the Qt framework, KDE application suite, Plasma desktop environment and related projects",
|
||||
"id": 4341481,
|
||||
"maintainers": {
|
||||
"ttuegel": 563054
|
||||
"K900": 386765,
|
||||
"NickCao": 15247171,
|
||||
"SuperSandro2000": 7258858
|
||||
},
|
||||
"members": {
|
||||
"FRidh": 2129135,
|
||||
"K900": 386765,
|
||||
"LunNova": 782440,
|
||||
"NickCao": 15247171,
|
||||
"SuperSandro2000": 7258858,
|
||||
"bkchr": 5718007,
|
||||
"ilya-fedin": 17829319,
|
||||
"mjm": 1181,
|
||||
@@ -896,8 +896,7 @@
|
||||
"id": 7304571,
|
||||
"maintainers": {
|
||||
"Mic92": 96200,
|
||||
"winterqt": 78392041,
|
||||
"zowoq": 59103226
|
||||
"winterqt": 78392041
|
||||
},
|
||||
"members": {},
|
||||
"name": "rust"
|
||||
@@ -936,6 +935,7 @@
|
||||
"infinisil": 20525370
|
||||
},
|
||||
"members": {
|
||||
"andir": 638836,
|
||||
"pyrox0": 35778371
|
||||
},
|
||||
"name": "Security review"
|
||||
|
||||
@@ -20436,6 +20436,12 @@
|
||||
githubId = 7420227;
|
||||
name = "Peter Tri Ho";
|
||||
};
|
||||
peterwaller-arm = {
|
||||
email = "peter.waller@arm.com";
|
||||
github = "peterwaller-arm";
|
||||
githubId = 52030119;
|
||||
name = "Peter Waller";
|
||||
};
|
||||
peterwilli = {
|
||||
email = "peter@codebuffet.co";
|
||||
github = "peterwilli";
|
||||
@@ -25528,12 +25534,6 @@
|
||||
githubId = 127287939;
|
||||
name = "Syed Sumairul Hasan";
|
||||
};
|
||||
syberant = {
|
||||
email = "sybrand@neuralcoding.com";
|
||||
github = "syberant";
|
||||
githubId = 20063502;
|
||||
name = "Sybrand Aarnoutse";
|
||||
};
|
||||
syboxez = {
|
||||
email = "syboxez@gmail.com";
|
||||
matrix = "@syboxez:matrix.org";
|
||||
|
||||
@@ -676,6 +676,7 @@
|
||||
./services/hardware/nvidia-optimus.nix
|
||||
./services/hardware/openrgb.nix
|
||||
./services/hardware/pcscd.nix
|
||||
./services/hardware/pdudaemon.nix
|
||||
./services/hardware/pid-fan-controller.nix
|
||||
./services/hardware/pommed.nix
|
||||
./services/hardware/power-profiles-daemon.nix
|
||||
|
||||
@@ -120,16 +120,7 @@ in
|
||||
};
|
||||
|
||||
defaultSession = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str // {
|
||||
description = "session name";
|
||||
check =
|
||||
d:
|
||||
lib.assertMsg (d != null -> (lib.types.str.check d && lib.elem d cfg.sessionData.sessionNames)) ''
|
||||
Default graphical session, '${d}', not found.
|
||||
Valid names for 'services.displayManager.defaultSession' are:
|
||||
${lib.concatStringsSep "\n " cfg.sessionData.sessionNames}
|
||||
'';
|
||||
};
|
||||
type = lib.types.nullOr (lib.types.str // { description = "session name"; });
|
||||
default = null;
|
||||
example = "gnome";
|
||||
description = ''
|
||||
@@ -149,26 +140,12 @@ in
|
||||
|
||||
sessionPackages = lib.mkOption {
|
||||
type = lib.types.listOf (
|
||||
lib.types.package
|
||||
lib.types.addCheck lib.types.package (
|
||||
p: p ? providedSessions && p.providedSessions != [ ] && lib.all lib.isString p.providedSessions
|
||||
)
|
||||
// {
|
||||
description = "package with provided sessions";
|
||||
check =
|
||||
p:
|
||||
lib.assertMsg
|
||||
(
|
||||
lib.types.package.check p
|
||||
&& p ? providedSessions
|
||||
&& p.providedSessions != [ ]
|
||||
&& lib.all lib.isString p.providedSessions
|
||||
)
|
||||
''
|
||||
Package, '${p.name}', did not specify any session names, as strings, in
|
||||
'passthru.providedSessions'. This is required when used as a session package.
|
||||
|
||||
The session names can be looked up in:
|
||||
${p}/share/xsessions
|
||||
${p}/share/wayland-sessions
|
||||
'';
|
||||
descriptionClass = "composite";
|
||||
}
|
||||
);
|
||||
default = [ ];
|
||||
@@ -230,6 +207,14 @@ in
|
||||
services.displayManager.autoLogin.enable requires services.displayManager.autoLogin.user to be set
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = cfg.defaultSession == null || lib.elem cfg.defaultSession cfg.sessionData.sessionNames;
|
||||
message = ''
|
||||
Default graphical session, '${toString cfg.defaultSession}', not found.
|
||||
Valid names for 'services.displayManager.defaultSession' are:
|
||||
${lib.concatStringsSep "\n " cfg.sessionData.sessionNames}
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
# Make xsessions and wayland sessions available in XDG_DATA_DIRS
|
||||
|
||||
146
nixos/modules/services/hardware/pdudaemon.nix
Normal file
146
nixos/modules/services/hardware/pdudaemon.nix
Normal file
@@ -0,0 +1,146 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.pdudaemon;
|
||||
configFile = pkgs.writeText "pdudaemon.conf" (
|
||||
lib.generators.toJSON { } {
|
||||
daemon = {
|
||||
hostname = cfg.bindAddress;
|
||||
port = cfg.port;
|
||||
logging_level = cfg.logLevel;
|
||||
listener = cfg.listener;
|
||||
};
|
||||
pdus = cfg.pdus;
|
||||
}
|
||||
);
|
||||
in
|
||||
{
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [
|
||||
aiyion
|
||||
emantor
|
||||
];
|
||||
};
|
||||
|
||||
options = {
|
||||
services.pdudaemon = {
|
||||
enable = lib.mkEnableOption "PDUDaemon";
|
||||
|
||||
package = lib.mkPackageOption pkgs "pdudaemon" { };
|
||||
|
||||
bindAddress = lib.mkOption {
|
||||
default = "0.0.0.0";
|
||||
type = lib.types.str;
|
||||
description = "Bind address for the PDUDaemon.";
|
||||
};
|
||||
|
||||
port = lib.mkOption {
|
||||
default = 16421;
|
||||
type = lib.types.port;
|
||||
description = "Port to bind to.";
|
||||
};
|
||||
|
||||
openFirewall = lib.mkOption {
|
||||
default = false;
|
||||
type = lib.types.bool;
|
||||
description = ''
|
||||
Whether to automatically open the PDUDaemon listen port in the firewall.
|
||||
'';
|
||||
};
|
||||
|
||||
listener = lib.mkOption {
|
||||
default = "http";
|
||||
type = lib.types.enum [
|
||||
"http"
|
||||
"tcp"
|
||||
];
|
||||
description = "Which kind of listener to provide.";
|
||||
};
|
||||
|
||||
logLevel = lib.mkOption {
|
||||
default = "error";
|
||||
type = lib.types.enum [
|
||||
"debug"
|
||||
"info"
|
||||
"warning"
|
||||
"error"
|
||||
];
|
||||
description = "PDUDaemon log level.";
|
||||
};
|
||||
|
||||
pdus = lib.mkOption {
|
||||
type = with lib.types; attrsOf anything;
|
||||
default = { };
|
||||
description = ''
|
||||
Structural pdus section of PDUDaemon's pdudaemon.conf.
|
||||
Refer to <https://github.com/pdudaemon/pdudaemon/blob/main/share/pdudaemon.conf>
|
||||
for more examples.
|
||||
'';
|
||||
example = lib.literalExpression ''
|
||||
{
|
||||
cbs350-poe-switch = {
|
||||
driver = "snmpv1";
|
||||
community = "private";
|
||||
oid = ".1.3.6.1.2.1.105.1.1.1.3.1.*;
|
||||
onsetting = 1;
|
||||
offsetting = 2;
|
||||
};
|
||||
energenie = {
|
||||
driver = "EG-PMS";
|
||||
device = "aa:bb:cc:xx:yy";
|
||||
};
|
||||
local = {
|
||||
driver = "localcmdline";
|
||||
};
|
||||
};
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.port ];
|
||||
|
||||
systemd.services.pdudaemon = {
|
||||
after = [ "network-online.target" ];
|
||||
description = "Control and Queueing daemon for PDUs";
|
||||
serviceConfig = {
|
||||
ExecStart = "${lib.getExe cfg.package} --conf ${configFile}";
|
||||
Type = "simple";
|
||||
DynamicUser = "yes";
|
||||
StateDirectory = "pdudaemon";
|
||||
ProtectHome = true;
|
||||
Restart = "on-failure";
|
||||
CapabilityBoundingSet = "";
|
||||
PrivateDevices = true;
|
||||
ProtectClock = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectKernelModules = true;
|
||||
SystemCallArchitectures = "native";
|
||||
MemoryDenyWriteExecute = true;
|
||||
RestrictNamespaces = true;
|
||||
ProtectHostname = true;
|
||||
LockPersonality = true;
|
||||
ProtectKernelTunables = true;
|
||||
RestrictRealtime = true;
|
||||
ProtectProc = "invisible";
|
||||
ProcSubset = "pid";
|
||||
PrivateUsers = true;
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@privileged"
|
||||
"~@resources"
|
||||
];
|
||||
};
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -91,9 +91,9 @@ let
|
||||
# files required to exist also won't be present, so missingok is forced.
|
||||
user=$(${pkgs.buildPackages.coreutils}/bin/id -un)
|
||||
group=$(${pkgs.buildPackages.coreutils}/bin/id -gn)
|
||||
sed -e "s/\bsu\s.*/su $user $group/" \
|
||||
-e "s/\b\(create\s\+[0-9]*\s*\|createolddir\s\+[0-9]*\s\+\).*/\1$user $group/" \
|
||||
-e "1imissingok" -e "s/\bnomissingok\b//" \
|
||||
sed -E -e "s/\bsu\s.*/su $user $group/" \
|
||||
-e "s/\b((create|createolddir)\b(\s+[0-9]+)?).*/\1 $user $group/" \
|
||||
-e "1imissingok" -e "s/\bnomissingok\b//" \
|
||||
$out > logrotate.conf
|
||||
# Since this makes for very verbose builds only show real error.
|
||||
# There is no way to control log level, but logrotate hardcodes
|
||||
|
||||
@@ -207,6 +207,10 @@ in
|
||||
AmbientCapabilities = "cap_net_bind_service";
|
||||
};
|
||||
};
|
||||
|
||||
services.fastnetmon-advanced.hostgroups = {
|
||||
global = { };
|
||||
};
|
||||
})
|
||||
|
||||
(lib.mkIf (cfg.enable && cfg.enableAdvancedTrafficPersistence) {
|
||||
|
||||
@@ -51,7 +51,10 @@ in
|
||||
freeformType = yaml.type;
|
||||
options = {
|
||||
sso_providers = mkOption {
|
||||
description = "Configure OIDC single sign-on providers.";
|
||||
description = ''
|
||||
Configure OIDC single sign-on providers.
|
||||
Main documentation can be found [here](https://warpgate.null.page/sso).
|
||||
'';
|
||||
default = [ ];
|
||||
type = listOf (submodule {
|
||||
freeformType = yaml.type;
|
||||
@@ -62,12 +65,40 @@ in
|
||||
};
|
||||
label = mkOption {
|
||||
description = "SSO provider name displayed on login page.";
|
||||
type = str;
|
||||
default = null;
|
||||
type = nullOr str;
|
||||
};
|
||||
auto_create_users = mkOption {
|
||||
description = "Whether to create user automatically at first SSO login.";
|
||||
default = false;
|
||||
type = bool;
|
||||
};
|
||||
provider = mkOption {
|
||||
description = "SSO provider configurations.";
|
||||
description = ''
|
||||
SSO provider configurations.
|
||||
See [here](https://github.com/warp-tech/warpgate/blob/ffc755f0137944bd39cf4cbce90f4279da500943/config-schema.json#L430) for all acceptable options.
|
||||
'';
|
||||
type = attrsOf yaml.type;
|
||||
};
|
||||
return_domain_whitelist = mkOption {
|
||||
description = ''
|
||||
Controls the SSO return URL supplied to SSO provider.
|
||||
This will also required you to connect to this instance via whitelisted domain when doing SSO login.
|
||||
'';
|
||||
default = null;
|
||||
type = nullOr (listOf str);
|
||||
};
|
||||
return_url_prefix = mkOption {
|
||||
description = ''
|
||||
Controls the SSO return URL supplied to SSO provider.
|
||||
Useful for providers that do not allow the @ sign in the URL (e.g. Azure).
|
||||
'';
|
||||
default = "@";
|
||||
type = enum [
|
||||
"@"
|
||||
"_"
|
||||
];
|
||||
};
|
||||
};
|
||||
});
|
||||
example = literalExpression ''
|
||||
@@ -105,6 +136,7 @@ in
|
||||
description = ''
|
||||
Configure the domain name of this Warpgate instance.
|
||||
See [HTTP domain binding](https://warpgate.null.page/http-domain-binding/).
|
||||
This option is considered legacy, please use protocol specific `external_host` instead.
|
||||
'';
|
||||
default = null;
|
||||
type = nullOr str;
|
||||
@@ -128,6 +160,11 @@ in
|
||||
default = "[::]:2222";
|
||||
type = str;
|
||||
};
|
||||
external_host = mkOption {
|
||||
description = "The SSH listener is reachable via this domain name externally.";
|
||||
default = null;
|
||||
type = nullOr str;
|
||||
};
|
||||
external_port = mkOption {
|
||||
description = "The SSH listener is reachable via this port externally.";
|
||||
default = null;
|
||||
@@ -164,6 +201,11 @@ in
|
||||
default = "[::]:8888";
|
||||
type = str;
|
||||
};
|
||||
external_host = mkOption {
|
||||
description = "The HTTP listener is reachable via this domain name externally.";
|
||||
default = null;
|
||||
type = nullOr str;
|
||||
};
|
||||
external_port = mkOption {
|
||||
description = "The HTTP listener is reachable via this port externally.";
|
||||
default = null;
|
||||
@@ -239,6 +281,11 @@ in
|
||||
default = "[::]:33306";
|
||||
type = str;
|
||||
};
|
||||
external_host = mkOption {
|
||||
description = "The MySQL listener is reachable via this domain name externally.";
|
||||
default = null;
|
||||
type = nullOr str;
|
||||
};
|
||||
external_port = mkOption {
|
||||
description = "The MySQL listener is reachable via this port externally.";
|
||||
default = null;
|
||||
@@ -266,6 +313,11 @@ in
|
||||
default = "[::]:55432";
|
||||
type = str;
|
||||
};
|
||||
external_host = mkOption {
|
||||
description = "The PostgreSQL listener is reachable via this domain name externally.";
|
||||
default = null;
|
||||
type = nullOr str;
|
||||
};
|
||||
external_port = mkOption {
|
||||
description = "The PostgreSQL listener is reachable via this port externally.";
|
||||
default = null;
|
||||
@@ -282,9 +334,59 @@ in
|
||||
type = str;
|
||||
};
|
||||
};
|
||||
kubernetes = {
|
||||
enable = mkOption {
|
||||
description = "Whether to enable Kubernetes listener.";
|
||||
default = false;
|
||||
type = bool;
|
||||
};
|
||||
listen = mkOption {
|
||||
description = "Listen endpoint of Kubernetes listener.";
|
||||
default = "[::]:8443";
|
||||
type = str;
|
||||
};
|
||||
external_host = mkOption {
|
||||
description = "The Kubernetes listener is reachable via this domain name externally.";
|
||||
default = null;
|
||||
type = nullOr str;
|
||||
};
|
||||
external_port = mkOption {
|
||||
description = "The Kubernetes listener is reachable via this port externally.";
|
||||
default = null;
|
||||
type = nullOr str;
|
||||
};
|
||||
certificate = mkOption {
|
||||
description = "Path to Kubernetes listener certificate.";
|
||||
default = "/var/lib/warpgate/tls.certificate.pem";
|
||||
type = str;
|
||||
};
|
||||
key = mkOption {
|
||||
description = "Path to Kubernetes listener private key.";
|
||||
default = "/var/lib/warpgate/tls.key.pem";
|
||||
type = str;
|
||||
};
|
||||
session_max_age = mkOption {
|
||||
description = "How long until a logged in session expires.";
|
||||
default = "30m";
|
||||
type = str;
|
||||
};
|
||||
};
|
||||
log = {
|
||||
format = mkOption {
|
||||
description = "The format Warpgate emits logs in.";
|
||||
default = "text";
|
||||
type = enum [
|
||||
"text"
|
||||
"json"
|
||||
];
|
||||
};
|
||||
audit_retention = mkOption {
|
||||
description = "How long Warpgate keeps its audit logs.";
|
||||
default = "1year";
|
||||
type = str;
|
||||
};
|
||||
retention = mkOption {
|
||||
description = "How long Warpgate keep its logs.";
|
||||
description = "How long Warpgate keeps its non-audit logs and session recordings.";
|
||||
default = "7days";
|
||||
type = str;
|
||||
};
|
||||
@@ -297,17 +399,6 @@ in
|
||||
type = nullOr str;
|
||||
};
|
||||
};
|
||||
config_provider = mkOption {
|
||||
description = ''
|
||||
Source of truth of users.
|
||||
DO NOT change this, Warpgate only implemented database provider.
|
||||
'';
|
||||
default = "database";
|
||||
type = enum [
|
||||
"file"
|
||||
"database"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
@@ -372,6 +463,10 @@ in
|
||||
assertion = !((cfg.databaseUrlFile == null) && (cfg.settings.database_url == null));
|
||||
message = "Either databaseUrlFile or settings.database_url must be set; Set the other to null.";
|
||||
}
|
||||
{
|
||||
assertion = !(lib.hasAttr "config_provider" cfg.settings);
|
||||
message = "`services.warpgate.settings.config_provider` is a legacy option that has been removed since 0.14.0. Please do not set this option.";
|
||||
}
|
||||
];
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
@@ -29,9 +29,7 @@ let
|
||||
};
|
||||
|
||||
freeform = mkOption {
|
||||
type = types.nullOr types.str // {
|
||||
merge = mergeEqualOption;
|
||||
};
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
example = ''MMC_BLOCK_MINORS.freeform = "32";'';
|
||||
description = ''
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
|
||||
let
|
||||
cfg = config.virtualisation.incus.agent;
|
||||
|
||||
package = pkgs.incus;
|
||||
in
|
||||
{
|
||||
meta = {
|
||||
@@ -18,8 +20,8 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.udev.packages = [ config.virtualisation.incus.package.agent_loader ];
|
||||
systemd.packages = [ config.virtualisation.incus.package.agent_loader ];
|
||||
services.udev.packages = [ package.agent_loader ];
|
||||
systemd.packages = [ package.agent_loader ];
|
||||
|
||||
systemd.services.incus-agent = {
|
||||
enable = true;
|
||||
|
||||
@@ -405,6 +405,7 @@ in
|
||||
containers-tmpfs = runTest ./containers-tmpfs.nix;
|
||||
containers-unified-hierarchy = runTest ./containers-unified-hierarchy.nix;
|
||||
convos = runTest ./convos.nix;
|
||||
coredns = runTest ./coredns.nix;
|
||||
corerad = runTest ./corerad.nix;
|
||||
corteza = runTest ./corteza.nix;
|
||||
cosmic = runTest {
|
||||
@@ -1207,6 +1208,7 @@ in
|
||||
password-option-override-ordering = runTest ./password-option-override-ordering.nix;
|
||||
patroni = handleTestOn [ "x86_64-linux" ] ./patroni.nix { };
|
||||
pdns-recursor = runTest ./pdns-recursor.nix;
|
||||
pdudaemon = runTest ./pdudaemon.nix;
|
||||
peerflix = runTest ./peerflix.nix;
|
||||
peering-manager = runTest ./web-apps/peering-manager.nix;
|
||||
peertube = handleTestOn [ "x86_64-linux" ] ./web-apps/peertube.nix { };
|
||||
|
||||
42
nixos/tests/coredns.nix
Normal file
42
nixos/tests/coredns.nix
Normal file
@@ -0,0 +1,42 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
name = "coredns";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ johanot ];
|
||||
};
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [ pkgs.dnsutils ];
|
||||
services.coredns = {
|
||||
enable = true;
|
||||
config = ''
|
||||
.:10053 {
|
||||
ipecho {
|
||||
domain test.nixos.org
|
||||
ttl 2629800
|
||||
}
|
||||
}
|
||||
'';
|
||||
package = pkgs.coredns.override {
|
||||
externalPlugins = [
|
||||
{
|
||||
name = "ipecho";
|
||||
repo = "github.com/Eun/coredns-ipecho";
|
||||
version = "224170ebca45cc59c6b071d280a18f42d1ff130c";
|
||||
position = "start-of-file";
|
||||
}
|
||||
];
|
||||
vendorHash = "sha256-66WNU+t/frHfbxexYdiXzgXKLxPyLnN6JuKnlG/kSQY=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.start()
|
||||
machine.wait_for_unit("coredns.service")
|
||||
machine.wait_for_open_port(10053)
|
||||
machine.succeed("dig @127.0.0.1 -p 10053 127.0.0.2.test.nixos.org A +short | grep 127.0.0.2")
|
||||
'';
|
||||
}
|
||||
@@ -15,7 +15,7 @@
|
||||
{
|
||||
virtualisation.docker.enable = true;
|
||||
virtualisation.docker.autoPrune.enable = true;
|
||||
virtualisation.docker.package = pkgs.docker;
|
||||
virtualisation.docker.package = pkgs.docker_29;
|
||||
|
||||
users.users = {
|
||||
noprivs = {
|
||||
@@ -48,7 +48,7 @@
|
||||
docker.succeed("docker stop sleeping")
|
||||
|
||||
# Must match version 4 times to ensure client and server git commits and versions are correct
|
||||
docker.succeed('[ $(docker version | grep ${pkgs.docker.version} | wc -l) = "4" ]')
|
||||
docker.succeed('[ $(docker version | grep ${pkgs.docker_29.version} | wc -l) = "4" ]')
|
||||
docker.succeed("systemctl restart systemd-sysctl")
|
||||
docker.succeed("grep 1 /proc/sys/net/ipv4/conf/all/forwarding")
|
||||
docker.succeed("grep 1 /proc/sys/net/ipv4/conf/default/forwarding")
|
||||
|
||||
@@ -62,7 +62,7 @@
|
||||
bird.wait_for_unit("bird.service")
|
||||
|
||||
fnm.wait_until_succeeds('journalctl -eu fastnetmon.service | grep "BGP daemon restarted correctly"')
|
||||
fnm.wait_until_succeeds("journalctl -eu gobgp.service | grep BGP_FSM_OPENCONFIRM")
|
||||
fnm.wait_until_succeeds('journalctl -eu gobgp.service | grep "Peer Up"')
|
||||
bird.wait_until_succeeds("birdc show protocol fnm | grep Estab")
|
||||
fnm.wait_until_succeeds('journalctl -eu fastnetmon.service | grep "API server listening"')
|
||||
fnm.succeed("fcli set blackhole 172.23.42.123")
|
||||
|
||||
@@ -66,8 +66,10 @@ in
|
||||
checkConf = {
|
||||
su = "root utmp";
|
||||
createolddir = "0750 root utmp";
|
||||
"createolddir " = "0750";
|
||||
create = "root utmp";
|
||||
"create " = "0750 root utmp";
|
||||
"create " = "0750";
|
||||
};
|
||||
# multiple paths should be aggregated
|
||||
multipath = {
|
||||
|
||||
@@ -40,6 +40,8 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
virtualisation.docker.package = lib.mkIf (backend == "docker") pkgs.docker_29;
|
||||
|
||||
# Stop systemd from killing remaining processes if ExecStop script
|
||||
# doesn't work, so that proper stopping can be tested.
|
||||
systemd.services.${serviceName}.serviceConfig.KillSignal = "SIGCONT";
|
||||
|
||||
50
nixos/tests/pdudaemon.nix
Normal file
50
nixos/tests/pdudaemon.nix
Normal file
@@ -0,0 +1,50 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
name = "PDUDaemon";
|
||||
meta.maintainers = with pkgs.lib.maintainers; [
|
||||
aiyion
|
||||
emantor
|
||||
];
|
||||
|
||||
nodes.pdudaemonhost =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [ pkgs.curl ];
|
||||
services.pdudaemon.enable = true;
|
||||
services.pdudaemon.openFirewall = true;
|
||||
services.pdudaemon.pdus = {
|
||||
testpduhost = {
|
||||
driver = "localcmdline";
|
||||
cmd_on = "echo '%s on' >> /tmp/pdu";
|
||||
cmd_off = "echo '%s off' >> /tmp/pdu";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
nodes.clienthost =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [ pkgs.curl ];
|
||||
};
|
||||
|
||||
testScript =
|
||||
{ nodes, ... }:
|
||||
#python
|
||||
''
|
||||
with subtest("Wait for pdudaemon startup"):
|
||||
pdudaemonhost.start()
|
||||
pdudaemonhost.wait_for_unit("pdudaemon.service")
|
||||
pdudaemonhost.wait_for_open_port(16421)
|
||||
print(pdudaemonhost.succeed("curl 'http://localhost:16421/power/control/on?hostname=testpduhost&port=1'"))
|
||||
|
||||
with subtest("Connect from client"):
|
||||
clienthost.start()
|
||||
clienthost.wait_until_succeeds("curl 'http://pdudaemonhost:16421/power/control/off?hostname=testpduhost&port=1'")
|
||||
|
||||
with subtest("Check systemd hardening does not degrade unnoticed"):
|
||||
exact_threshold = 15
|
||||
service_name = "pdudaemon"
|
||||
pdudaemonhost.fail(f"systemd-analyze security {service_name}.service --threshold={exact_threshold-1}")
|
||||
pdudaemonhost.succeed(f"systemd-analyze security {service_name}.service --threshold={exact_threshold}")
|
||||
'';
|
||||
}
|
||||
@@ -62,7 +62,8 @@ import ../make-test-python.nix (
|
||||
virtualisation.podman.dockerSocket.enable = true;
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.docker-client
|
||||
# docker-client for docker 29
|
||||
(pkgs.docker_29.override { clientOnly = true; })
|
||||
];
|
||||
|
||||
users.users.alice = {
|
||||
|
||||
@@ -85,13 +85,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.2-19";
|
||||
version = "7.1.2-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-4uASM+GRTe0ES6FdshUMMkVof4IlLV+CMm2l+v5qZN0=";
|
||||
hash = "sha256-zYk75q+EyWq5g/AHFU6v8a7gye0aDAEe/ZZvjqR9ZTc=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -1,63 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
wmctrl,
|
||||
qtbase,
|
||||
mkDerivationWith,
|
||||
}:
|
||||
|
||||
{
|
||||
dev =
|
||||
with python3Packages;
|
||||
mkDerivationWith buildPythonPackage rec {
|
||||
pname = "plover";
|
||||
version = "4.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
description = "OpenSteno Plover stenography software";
|
||||
maintainers = with lib.maintainers; [
|
||||
twey
|
||||
kovirobi
|
||||
];
|
||||
license = lib.licenses.gpl2;
|
||||
};
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openstenoproject";
|
||||
repo = "plover";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-VpQT25bl8yPG4J9IwLkhSkBt31Y8BgPJdwa88WlreA8=";
|
||||
};
|
||||
|
||||
# I'm not sure why we don't find PyQt5 here but there's a similar
|
||||
# sed on many of the platforms Plover builds for
|
||||
postPatch = "sed -i /PyQt5/d setup.cfg";
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest
|
||||
mock
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
babel
|
||||
pyqt5
|
||||
xlib
|
||||
pyserial
|
||||
appdirs
|
||||
wcwidth
|
||||
setuptools
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||
'';
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs config.allowAliases {
|
||||
stable = throw "plover.stable was removed because it used Python 2. Use plover.dev instead."; # added 2022-06-05
|
||||
}
|
||||
@@ -681,7 +681,7 @@ let
|
||||
# clang++: error: unknown argument: '-fno-lifetime-dse'
|
||||
./patches/chromium-147-llvm-22.patch
|
||||
]
|
||||
++ lib.optionals (chromiumVersionAtLeast "148" && lib.versionOlder llvmVersion "23") [
|
||||
++ lib.optionals (versionRange "148" "149" && lib.versionOlder llvmVersion "23") [
|
||||
# clang++: error: unknown argument: '-fsanitize-ignore-for-ubsan-feature=return'
|
||||
(fetchpatch {
|
||||
name = "chromium-148-revert-build-Add--fsanitizer=return-config.patch";
|
||||
@@ -711,7 +711,22 @@ let
|
||||
hash = "sha256-jR0G9z2R8VGl2tkB3u0368RyWM1J6qYXqNWwKkYd5zU=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals (chromiumVersionAtLeast "148") [
|
||||
++ lib.optionals (chromiumVersionAtLeast "149" && lib.versionOlder llvmVersion "23") [
|
||||
# clang++: error: unknown argument: '-fdiagnostics-show-inlining-chain'
|
||||
# clang++: error: unknown argument: '-fsanitize-ignore-for-ubsan-feature=array-bounds'
|
||||
# clang++: error: unknown argument: '-fsanitize-ignore-for-ubsan-feature=return'
|
||||
./patches/chromium-149-llvm-22.patch
|
||||
]
|
||||
++ lib.optionals (chromiumVersionAtLeast "149" && stdenv.hostPlatform.isAarch64) [
|
||||
# [43731/56364] CXX obj/media/gpu/sandbox/sandbox/hardware_video_decoding_sandbox_hook_linux.o
|
||||
# FAILED: [code=1] obj/media/gpu/sandbox/sandbox/hardware_video_decoding_sandbox_hook_linux.o
|
||||
# clang++ -MD -MF obj/media/gpu/sandbox/sandbox/hardware_video_decoding_sandbox_hook_linux.o.d [...]
|
||||
# ../../media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc:123:9: error: use of undeclared identifier 'ERROR'
|
||||
# 123 | LOG(ERROR) << "dlopen(radeonsi_dri.so) failed with error: " << dlerror();
|
||||
# | ^~~~~
|
||||
./patches/chromium-149-use-of-undeclared-identifier-ERROR.patch
|
||||
]
|
||||
++ lib.optionals (versionRange "148" "149") [
|
||||
# ninja: error: '../../third_party/rust-toolchain/bin/rustc', needed by 'phony/default_for_rust_host_build_tools_rust_bin_inputs', missing and no known rule to make it
|
||||
(fetchpatch {
|
||||
name = "chromium-148-revert-Reland-build-use-tool-inputs-instead-of-siso-config-for-rust-actions.patch";
|
||||
@@ -854,6 +869,12 @@ let
|
||||
mkdir -p third_party/gperf/cipd/bin
|
||||
ln -s "${pkgsBuildHost.gperf}/bin/gperf" third_party/gperf/cipd/bin/gperf
|
||||
''
|
||||
# https://chromium-review.googlesource.com/c/chromium/src/+/7719879
|
||||
# ninja: error: '../../third_party/rust-toolchain/bin/rustc', needed by 'phony/default_for_rust_host_build_tools_rust_bin_inputs', missing and no known rule to make it
|
||||
+ lib.optionalString (chromiumVersionAtLeast "149") ''
|
||||
mkdir -p third_party/rust-toolchain/bin
|
||||
ln -s "${buildPackages.rustc}/bin/rustc" third_party/rust-toolchain/bin/rustc
|
||||
''
|
||||
+
|
||||
lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.isAarch64)
|
||||
''
|
||||
@@ -1036,7 +1057,11 @@ let
|
||||
# Mute some warnings that are enabled by default. This is useful because
|
||||
# our Clang is always older than Chromium's and the build logs have a size
|
||||
# of approx. 25 MB without this option (and this saves e.g. 66 %).
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option -Wno-unused-command-line-argument -Wno-shadow";
|
||||
env.NIX_CFLAGS_COMPILE =
|
||||
"-Wno-unknown-warning-option -Wno-unused-command-line-argument -Wno-shadow"
|
||||
# warning: '_LIBCPP_HARDENING_MODE' macro redefined [-Wmacro-redefined]
|
||||
# because of hardeningDisable = [ "strictflexarrays1" ];
|
||||
+ lib.optionalString (chromiumVersionAtLeast "149") " -Wno-macro-redefined";
|
||||
env.BUILD_CC = "$CC_FOR_BUILD";
|
||||
env.BUILD_CXX = "$CXX_FOR_BUILD";
|
||||
env.BUILD_AR = "$AR_FOR_BUILD";
|
||||
|
||||
@@ -1,44 +1,44 @@
|
||||
{
|
||||
"chromium": {
|
||||
"version": "148.0.7778.178",
|
||||
"version": "149.0.7827.53",
|
||||
"chromedriver": {
|
||||
"version": "148.0.7778.179",
|
||||
"hash_darwin": "sha256-jDw+ON0X8rePW1HLBZ5FVKMibImBuW/Tp0EDZ/UjJlw=",
|
||||
"hash_darwin_aarch64": "sha256-hNaaKMVy8sKNU444Uf78YI3ayUATrTBAr6/7Z3jewv0="
|
||||
"version": "149.0.7827.53",
|
||||
"hash_darwin": "sha256-JzeQy8O9gcoV195sQrfUV1TclUyAI4lzOcE5+BmgKrM=",
|
||||
"hash_darwin_aarch64": "sha256-nEkMVGUVYP0q9UECGT0ibc2vzjVRIO69dFrYOB05lqg="
|
||||
},
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
"rev": "41c40cfaec7ee3bf0423c59925d8b23982a601f1",
|
||||
"hash": "sha256-s9uvmYHCJKWnNhztmOPb+OHj/HbGo30PupwT4mHWjnM="
|
||||
"rev": "45dedc4c3b87c982fd846b3dc599b233ed3aff90",
|
||||
"hash": "sha256-Ttklyw6IdNeMExlzeiQg/qsCkTmqVhUJ34MFgYmCWD4="
|
||||
},
|
||||
"gn": {
|
||||
"version": "0-unstable-2026-04-01",
|
||||
"rev": "6e8dcdebbadf4f8aa75e6a4b6e0bdf89dce1513a",
|
||||
"hash": "sha256-BTPD8WM1pVAMkFDlHekMdWFGyf63KdhKkKwsqikqoBQ="
|
||||
"version": "0-unstable-2026-05-01",
|
||||
"rev": "1740f5c25bcac5a650ee3d1c1ec22bfa25fcd756",
|
||||
"hash": "sha256-oFs7fZAZEs/gQ7X1A4uigo9+Y+iEN9sMMQYwAjEuD04="
|
||||
},
|
||||
"npmHash": "sha256-JuVcY8iFRDWcPcP4Pg+qm5rnTXkiVfNsqSkXbDWqsE8="
|
||||
"npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg="
|
||||
},
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "d096af1c9e98c45c3596e59620622b1a049bfecb",
|
||||
"hash": "sha256-XRalekzeALnDh9KiGqhYdhXvkGkjO3TOIZeqwpPLO+U=",
|
||||
"rev": "9d2c8156a72129edca4785abb98866fad60ea338",
|
||||
"hash": "sha256-RPFeHTWAeJUzbWU7QyRPmT3sqf3bAEuJ7/IJ3TP40pA=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git",
|
||||
"rev": "c2725e0622e1a86d55f14514f2177a39efea4a0e",
|
||||
"hash": "sha256-f+BbQ6xIubloSzx/MhPSZ8ymCskmS+9+epDGtPjZqXc="
|
||||
"rev": "6eddfb5ec5f92127a531eda66c568d3a11e7ec11",
|
||||
"hash": "sha256-Cm6BOOlEyD0kdYxMSmk6Fj1Dnfs3zCzXsm+BOXgBme0="
|
||||
},
|
||||
"src/third_party/compiler-rt/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
|
||||
"rev": "76287b5da8e155135536c8e3a67432d97d74fe3a",
|
||||
"hash": "sha256-q6syHriTR8TCQSqTWbbAkVVK0a/i4wojdEGN7sWGxUY="
|
||||
"rev": "0408cce08083f3d81379ed7d9f5bd26c03e1495b",
|
||||
"hash": "sha256-kR5osTmp2girvNRVHzEKMZDCelgux9RrRuMoXMCRSGM="
|
||||
},
|
||||
"src/third_party/libc++/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
|
||||
"rev": "7ab65651aed6802d2599dcb7a73b1f82d5179d05",
|
||||
"hash": "sha256-7O/X2JW8ghkPTjmFZmT9cgG3Ui5zk3gUb436KlPww34="
|
||||
"rev": "be1c391acca009d8d80535ce924e3d285451cdfa",
|
||||
"hash": "sha256-zKb9PUiiBvhVhWnbQwR8uOFJ9gt3uYmfJ4M9ijpgKRc="
|
||||
},
|
||||
"src/third_party/libc++abi/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
|
||||
@@ -47,13 +47,13 @@
|
||||
},
|
||||
"src/third_party/libunwind/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
|
||||
"rev": "6ca46ff28e3578c57cbead6f233969eb3dabc176",
|
||||
"hash": "sha256-JW4kqpVTCFDN4WZE2S5gEkX1O7eDycl+adm3KGlUoTU="
|
||||
"rev": "71192be150bbe04d87bb5298512d464e38d2f654",
|
||||
"hash": "sha256-PxXemxdWZoEavKDOovi67IVWEr2YW8YK2F0LXM3LZPw="
|
||||
},
|
||||
"src/third_party/llvm-libc/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
|
||||
"rev": "2a826f2fda3cf8d75b47cbc3bb1d9b244f13a6ab",
|
||||
"hash": "sha256-OWe2lAT5XbADWuxHgg53lZiU0My/ys86FEXvn4zlVx0="
|
||||
"rev": "deb95b5e48e875920a2eaae799c8dbcd76a6a4db",
|
||||
"hash": "sha256-oAgIT3+vjBrX86jgi/Pb0SCyco0lozjBjXlrKm6i56M="
|
||||
},
|
||||
"src/chrome/test/data/perf/canvas_bench": {
|
||||
"url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
|
||||
@@ -72,8 +72,8 @@
|
||||
},
|
||||
"src/docs/website": {
|
||||
"url": "https://chromium.googlesource.com/website.git",
|
||||
"rev": "44319eca109f9678595924a90547c1f6650d8664",
|
||||
"hash": "sha256-Trkan7bzRaLFlTkRfNGh7ssoZ3QpMh+mxQacsSM+d2I="
|
||||
"rev": "c9a9ad55e9ec9934244e58a5a8cab9a295526010",
|
||||
"hash": "sha256-2GKWEnlExrTzoIYMxeP4n2klLLT/phB5ZVJ5Nj3/aoY="
|
||||
},
|
||||
"src/media/cdm/api": {
|
||||
"url": "https://chromium.googlesource.com/chromium/cdm.git",
|
||||
@@ -82,8 +82,8 @@
|
||||
},
|
||||
"src/net/third_party/quiche/src": {
|
||||
"url": "https://quiche.googlesource.com/quiche.git",
|
||||
"rev": "21ffbe4c7b717d00d2d768c259b5b330fd754ac3",
|
||||
"hash": "sha256-yKMmfdSBvbB3T042TJbZ1Mw+y0kyfHP0knQVFWAFPTg="
|
||||
"rev": "fafc2fe9efc9f2e28a0815229fc14ca30c266ba8",
|
||||
"hash": "sha256-4UmjE41MOFCBa3APDMyyJwkeV6LhHl5UsMxZpPRDsRY="
|
||||
},
|
||||
"src/testing/libfuzzer/fuzzers/wasm_corpus": {
|
||||
"url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
|
||||
@@ -92,8 +92,8 @@
|
||||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "50fd896fb21cca91f325812d01d1e971593efc73",
|
||||
"hash": "sha256-HcfKm7UQmg3wMDOytmaYzm7Z7gRdOrRoqAKaE0ZdI4E="
|
||||
"rev": "ded782bca9d5f165d1c4a70124cdc5384043a8b3",
|
||||
"hash": "sha256-7+Hhx/V554hO3zzGuIZswkaRVDElz7ost7vbnf2wyZc="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
@@ -102,18 +102,18 @@
|
||||
},
|
||||
"src/third_party/angle/third_party/rapidjson/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson",
|
||||
"rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f",
|
||||
"hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk="
|
||||
"rev": "24b5e7a8b27f42fa16b96fc70aade9106cf7102f",
|
||||
"hash": "sha256-oHHLYRDMb7Y/k0CwsdsxPC5lglr2IChQi0AiOMiFn78="
|
||||
},
|
||||
"src/third_party/angle/third_party/VK-GL-CTS/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
|
||||
"rev": "f52e89f885064b9109501bca16c813bb29389993",
|
||||
"hash": "sha256-3jx4QVR9nB3WggfrORGJGifmJQhAYVSPusa7RlR16qg="
|
||||
"rev": "3fe33a325af90c1c820b1e8109f11ea0f4b60c9b",
|
||||
"hash": "sha256-JgOdlwtjC5HiCWBAaeM+Ffp9KlbI7+erT0ZRZBlWxXI="
|
||||
},
|
||||
"src/third_party/anonymous_tokens/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
|
||||
"rev": "fdff40da0398d2c229308aed169345f6ff1a150f",
|
||||
"hash": "sha256-eJP45x3vXOG1rWvRl/0H0c2IV7nQ/9dYjAzJGHHszdc="
|
||||
"rev": "208ea23596884f6d86476ea88b64e7931cdec08a",
|
||||
"hash": "sha256-HLUX0mUzA3xcXbw71sIxFBNEkL8x86urcdJH2Yuuy04="
|
||||
},
|
||||
"src/third_party/readability/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git",
|
||||
@@ -127,28 +127,23 @@
|
||||
},
|
||||
"src/third_party/dav1d/libdav1d": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
|
||||
"rev": "d69235dd804b24c04ed05639cffcc912cd6cfd75",
|
||||
"hash": "sha256-iKq6TYscIBK4ydv+0msNV3tcs82Ljk5ZNr954Qv2lII="
|
||||
"rev": "5cfc3832687e3229117203905faf5425ac6bc0d7",
|
||||
"hash": "sha256-MWDDrb8P5AIFszY0u5gCrK+kZlbYffIt9Y1b/thXL7I="
|
||||
},
|
||||
"src/third_party/dawn": {
|
||||
"url": "https://dawn.googlesource.com/dawn.git",
|
||||
"rev": "19696dd088b8ed5804e2f02a8f83f5afdb3e99e3",
|
||||
"hash": "sha256-ihnVPCk9412UzCmoABWVUhiGaIdIYxiYMkk43KDqpg8="
|
||||
"rev": "1815a06195d9c74ac737a96f87c05111926e04f8",
|
||||
"hash": "sha256-71KbW0w60VB67+HM48WpOo18hrVId4/4QBDl+xl5pgo="
|
||||
},
|
||||
"src/third_party/dawn/third_party/glfw3/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
|
||||
"rev": "043378876a67b092f5d0d3d9748660121a336dd3",
|
||||
"hash": "sha256-4QSD1/uxWfYZPMjShB0h639eqAfuBRXAVfOm6BbZCBs="
|
||||
"rev": "b00e6a8a88ad1b60c0a045e696301deb92c9a13e",
|
||||
"hash": "sha256-uVJOf+D3bgS/CyEL1y52gvkml6VUTtNPMTU6X5/XyS4="
|
||||
},
|
||||
"src/third_party/dawn/third_party/dxc": {
|
||||
"src/third_party/dawn/third_party/directx-shader-compiler/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
|
||||
"rev": "eb67a9085c758516d940e1ce3fed0acfb6518209",
|
||||
"hash": "sha256-z+yIuVweIyLdOiZDRfSppjTRoYq8S93+JNUla4Umot8="
|
||||
},
|
||||
"src/third_party/dawn/third_party/dxheaders": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
|
||||
"rev": "980971e835876dc0cde415e8f9bc646e64667bf7",
|
||||
"hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA="
|
||||
"rev": "d73829d4e677ef00931e8e57de6d544396ab46cb",
|
||||
"hash": "sha256-BIXNgVeF5x3BZWFWZ1Gz+zpNSOEl+hZWB0GgMEaNS2w="
|
||||
},
|
||||
"src/third_party/dawn/third_party/directx-headers/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
|
||||
@@ -157,33 +152,33 @@
|
||||
},
|
||||
"src/third_party/dawn/third_party/OpenGL-Registry/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry",
|
||||
"rev": "5bae8738b23d06968e7c3a41308568120943ae77",
|
||||
"hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE="
|
||||
"rev": "9cb90ca4902d588bef3c830fbb1da484893bd5fb",
|
||||
"hash": "sha256-mWVORjrbNFINr5WKAIDVnPs2T+96vkxWqZdJwp8oT9I="
|
||||
},
|
||||
"src/third_party/dawn/third_party/EGL-Registry/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry",
|
||||
"rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071",
|
||||
"hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A="
|
||||
"rev": "3d7796b3721d93976b6bfe536aa97bbc4bce8667",
|
||||
"hash": "sha256-csSV8Yp0p0UIrodbX5793uO5iZMjQfy+0D2wPif2+Fw="
|
||||
},
|
||||
"src/third_party/dawn/third_party/webgpu-cts": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
|
||||
"rev": "09fdb847d90d0b5bfe57068ce2eb9283cb77fc7f",
|
||||
"hash": "sha256-eTAwnTiAHq8rmbw7u9nAwSuAlS5adStUJKfITlYkcgU="
|
||||
"rev": "5c6b119c4fa0d9059c45f7637df1fe26fc80a6e4",
|
||||
"hash": "sha256-9DAdS2u2YtrCFJu0KTuwRJjTUNexFxdmnn7LkwQ+KiQ="
|
||||
},
|
||||
"src/third_party/dawn/third_party/webgpu-headers/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
|
||||
"rev": "7d3186c3dd2c708703524027b46b8703534ab3cc",
|
||||
"hash": "sha256-yE3/mfhqc7YtVNg4f/nrUpuRUGRjOzdwl++vPvd+mvc="
|
||||
"rev": "dc16b3e531cf4f31be54236d1a3e988ba5f295a2",
|
||||
"hash": "sha256-tFn3OChLKsYz52Vml7WVgqyrK7SI6WR1Z2C2vvFfakI="
|
||||
},
|
||||
"src/third_party/highway/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
|
||||
"rev": "84379d1c73de9681b54fbe1c035a23c7bd5d272d",
|
||||
"hash": "sha256-HNrlqtAs1vKCoSJ5TASs34XhzjEbLW+ISco1NQON+BI="
|
||||
"rev": "2607d3b5b0113992fe84d3848859eae13b3b52c1",
|
||||
"hash": "sha256-YUYZO9KLffczjwIz3mBBceD6oM1giLCFLDHgDCevdRA="
|
||||
},
|
||||
"src/third_party/google_benchmark/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git",
|
||||
"rev": "188e8278990a9069ffc84441cb5a024fd0bede37",
|
||||
"hash": "sha256-GfqY2d+Nd7ovNrXxzTRm/AYWj7GuxIO6FawzUEzwOVA="
|
||||
"rev": "8abf1e701fbd88c8170f48fe0558247e2e5f8e7d",
|
||||
"hash": "sha256-M8QkA8+bckoRjlcVneYXNetmPEWEvmWy/mca5JA40Ho="
|
||||
},
|
||||
"src/third_party/libpfm4/src": {
|
||||
"url": "https://chromium.googlesource.com/external/git.code.sf.net/p/perfmon2/libpfm4.git",
|
||||
@@ -192,13 +187,13 @@
|
||||
},
|
||||
"src/third_party/boringssl/src": {
|
||||
"url": "https://boringssl.googlesource.com/boringssl.git",
|
||||
"rev": "d8be2b4a71155bf82da092ef543176351eeb59ff",
|
||||
"hash": "sha256-fZc95YrREDbf0YcO6zahIjdX6TcRJANcH9MrkLIIIHw="
|
||||
"rev": "65818adf16411ca394625f5747a1af28faf95d2c",
|
||||
"hash": "sha256-tcTTzQnBp8Od1jdDMrFoCr9bnW0OCjGqUjH3QMnusmo="
|
||||
},
|
||||
"src/third_party/breakpad/breakpad": {
|
||||
"url": "https://chromium.googlesource.com/breakpad/breakpad.git",
|
||||
"rev": "8be0e3114685fcc1589561067282edf75ea1259a",
|
||||
"hash": "sha256-igcX5XwacIwoGbqIcZKwlJYpRWl9Uc32WdpXyHO7UVA="
|
||||
"rev": "afa2870e449ef33ad41545e7670c574cf70926a4",
|
||||
"hash": "sha256-+N6FPtSiLQmNqf5+x5XDSksrRq/YDVSMVx5Rv1PGjfI="
|
||||
},
|
||||
"src/third_party/cast_core/public/src": {
|
||||
"url": "https://chromium.googlesource.com/cast_core/public",
|
||||
@@ -207,13 +202,13 @@
|
||||
},
|
||||
"src/third_party/catapult": {
|
||||
"url": "https://chromium.googlesource.com/catapult.git",
|
||||
"rev": "4f1d71f6841d210b3a06ab3ef2e2ed679af0ee56",
|
||||
"hash": "sha256-aHlf8gw3KxbKoyyajP4w586iYybx7HSkcKtLcZIgiDE="
|
||||
"rev": "6e4188cabb4f37314ea41e9adfcb2cf9b64e2641",
|
||||
"hash": "sha256-/kleYYllR22KjxHT2gTMGf6LEUZ1Ud7j593fIIAgqAA="
|
||||
},
|
||||
"src/third_party/catapult/third_party/webpagereplay": {
|
||||
"url": "https://chromium.googlesource.com/webpagereplay.git",
|
||||
"rev": "be48b5e3387780790ecc7723434b6ea6733bcc33",
|
||||
"hash": "sha256-KcFUlQMltsMm4WlTVMLzZXfrvu67ffkKjmBcruwZye0="
|
||||
"rev": "b7ac48f52cd298e966a76eb054412915c3e445d4",
|
||||
"hash": "sha256-smtwB6vzLgCAePz0jNfrpm8TxrxBnBkigLxERhxUEvE="
|
||||
},
|
||||
"src/third_party/ced/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
|
||||
@@ -232,13 +227,13 @@
|
||||
},
|
||||
"src/third_party/cpu_features/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git",
|
||||
"rev": "936b9ab5515dead115606559502e3864958f7f6e",
|
||||
"hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA="
|
||||
"rev": "d3b2440fcfc25fe8e6d0d4a85f06d68e98312f5b",
|
||||
"hash": "sha256-IBJc1sHHh4G3oTzQm1RAHHahsEECC+BDl14DHJ8M1Ys="
|
||||
},
|
||||
"src/third_party/cpuinfo/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
|
||||
"rev": "7607ca500436b37ad23fb8d18614bec7796b68a7",
|
||||
"hash": "sha256-LnLtCMMRg+DwB7MijBdt/tmCKD/zN5y2oTgXlYw3hTg="
|
||||
"rev": "3681f0ce1446167d01dfe125d6db96ba2ac31c3c",
|
||||
"hash": "sha256-PhWbzQgZSUb3eVyx+JTSnxVOAC2WzL2Dw1I9/6LEIsw="
|
||||
},
|
||||
"src/third_party/crc32c/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
|
||||
@@ -247,28 +242,28 @@
|
||||
},
|
||||
"src/third_party/cros_system_api": {
|
||||
"url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
|
||||
"rev": "c27a09148de373889e5d2bf616c4e85a68050ae2",
|
||||
"hash": "sha256-a/mAa1+if6B1FHe9crO8PDpc3o8M+CeIuXjXT0lwZOY="
|
||||
"rev": "7ecd2b41460516ecd7b7d6e5c298db25e1436b6f",
|
||||
"hash": "sha256-ehbAXv4DZStWDMC3iOjmWkAc4PhAamyI4C9bdXO7FfA="
|
||||
},
|
||||
"src/third_party/crossbench": {
|
||||
"url": "https://chromium.googlesource.com/crossbench.git",
|
||||
"rev": "c179f7919aade97c5cff64d14b9171736e7aaef9",
|
||||
"hash": "sha256-Hxazf58z9imnGO1aj2NRtsQ+BYrfAuIuZscADpr1NVI="
|
||||
"rev": "cecd70a5f49f777f603d38d11ac1f66c03c3e8af",
|
||||
"hash": "sha256-zLwIY8fQVebkfN4KFMbitZODhmiN65JK2s9IG/5Cd+o="
|
||||
},
|
||||
"src/third_party/crossbench-web-tests": {
|
||||
"url": "https://chromium.googlesource.com/chromium/web-tests.git",
|
||||
"rev": "b19e4e52c33fb8a105c3fc99598b0b9b4bc59752",
|
||||
"hash": "sha256-7vCQw91L2c97dnVdrJ53zL8hi0KZffDJJjk7GaG3b/U="
|
||||
"rev": "baf176aadedccc44329231d5dd40346874c2a63e",
|
||||
"hash": "sha256-oY1/uGB6ykePIklWe35rmJWsnpu/wjkER4TJeP4TTdw="
|
||||
},
|
||||
"src/third_party/depot_tools": {
|
||||
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
|
||||
"rev": "41c40cfaec7ee3bf0423c59925d8b23982a601f1",
|
||||
"hash": "sha256-s9uvmYHCJKWnNhztmOPb+OHj/HbGo30PupwT4mHWjnM="
|
||||
"rev": "45dedc4c3b87c982fd846b3dc599b233ed3aff90",
|
||||
"hash": "sha256-Ttklyw6IdNeMExlzeiQg/qsCkTmqVhUJ34MFgYmCWD4="
|
||||
},
|
||||
"src/third_party/devtools-frontend/src": {
|
||||
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
|
||||
"rev": "6efd6eb1d85fd67fdcc2385c54fa56c524bec3f7",
|
||||
"hash": "sha256-1pr3+RK519m+wtcacJB3PcDTL+qSHlOn1ctxpoLzTf8="
|
||||
"rev": "33c2f401a9c8ddad2159eb0ab83aa244a5247361",
|
||||
"hash": "sha256-M9aULI+HECgA0ptAG47OPK0QuB+xzmb29iOtJ3whpB0="
|
||||
},
|
||||
"src/third_party/dom_distiller_js/dist": {
|
||||
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
|
||||
@@ -282,8 +277,8 @@
|
||||
},
|
||||
"src/third_party/eigen3/src": {
|
||||
"url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
|
||||
"rev": "a3074053a614df7a3896cb4edbcba40222a5f549",
|
||||
"hash": "sha256-9AHpSqemqdwXoMiP3hH1YuEd3+nrudeVGTpInw+8BU4="
|
||||
"rev": "2cf9891537250255f50df5109ffe9e700e2a73de",
|
||||
"hash": "sha256-1bu1Y9itHIKcwY5J0sF08DSyfElLHiZ6SRsNZkFjz8o="
|
||||
},
|
||||
"src/third_party/farmhash/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
|
||||
@@ -292,18 +287,18 @@
|
||||
},
|
||||
"src/third_party/fast_float/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git",
|
||||
"rev": "cb1d42aaa1e14b09e1452cfdef373d051b8c02a4",
|
||||
"hash": "sha256-CG5je117WYyemTe5PTqznDP0bvY5TeXn8Vu1Xh5yUzQ="
|
||||
"rev": "05087a303dad9c98768b33c829d398223a649bc6",
|
||||
"hash": "sha256-ZQm8kDMYdwjKugc2vBG5mwTqXa01u6hODQc/Tai2I9A="
|
||||
},
|
||||
"src/third_party/federated_compute/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google-parfait/federated-compute.git",
|
||||
"rev": "eb170f645b270c7979edb863fd2cf8edab2b2fd1",
|
||||
"hash": "sha256-Cp0WQBbqWvPdrKCMQhH4Z6zl6YlIPLjafWZEwdkYWlc="
|
||||
"rev": "3112513bf1a80872311e7718c5385f535a819b89",
|
||||
"hash": "sha256-jnG3PCxjaYcClRgzOfIkHbbD3xU9TDLyQR3VZUwHIgU="
|
||||
},
|
||||
"src/third_party/ffmpeg": {
|
||||
"url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
|
||||
"rev": "b5e18fb9da84e26ceef30d4e4886696bf59337c0",
|
||||
"hash": "sha256-JHAicFKBvtkwmZPRBKYPT6JVqYqF8hyXxU0H7kfgCBs="
|
||||
"rev": "f45bab87ce4c5fafc67fd53fcde777578d01bfa0",
|
||||
"hash": "sha256-fsZSqmG6vFOPJYuBgG6OSWkzRu27B3mv/PqAP8s4ARk="
|
||||
},
|
||||
"src/third_party/flac": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/flac.git",
|
||||
@@ -332,8 +327,8 @@
|
||||
},
|
||||
"src/third_party/freetype/src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
|
||||
"rev": "99b479dc34728936b006679a31e12b8cf432fc55",
|
||||
"hash": "sha256-H5RzBFYWIp/QYKyeBM2wfuX7FvXHPbhCAp7qne5Zvhw="
|
||||
"rev": "b6bcd2177f72bb4842c7701d7b7f633bb3fc951a",
|
||||
"hash": "sha256-TUz3yUD9HxqUMCOpLk74rEf8J0tMTh4ZCuD94AD4+q4="
|
||||
},
|
||||
"src/third_party/fxdiv/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
|
||||
@@ -342,18 +337,13 @@
|
||||
},
|
||||
"src/third_party/harfbuzz/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
|
||||
"rev": "f027b8e9039f73bf803eae684fee2eb2d30e4180",
|
||||
"hash": "sha256-HWb3QbPl+RE2oI/Jwv5BjKwv9UnJ8VcJvk+uGy9cAqM="
|
||||
"rev": "e6741e2205309752839da60ff075b7fa2e7cddd3",
|
||||
"hash": "sha256-XjUuY17fcZi+dIZFojq+eDsDVrBxtAWRydPdudt56+8="
|
||||
},
|
||||
"src/third_party/ink/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
|
||||
"rev": "9d5367423281a8fcf5bc1c418e20477a992b270a",
|
||||
"hash": "sha256-uDaK/cDA52Cn+ioPW2bXAJze1eW8TK3xF7+bl/Ylh6Y="
|
||||
},
|
||||
"src/third_party/ink_stroke_modeler/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git",
|
||||
"rev": "da42d439389c90ec7574f0381ec53e7f5be0c2eb",
|
||||
"hash": "sha256-W5HgVe0v9O/EuhpKMHp83PLq4p6cuBul3QUGLYdF6rY="
|
||||
"rev": "a988417b6d0b1ea03fb0b40269fbc42313acc6fd",
|
||||
"hash": "sha256-6O+N/ULn8sqsdgFw7VZ7TMjWvCAZbYo398PruPScU/k="
|
||||
},
|
||||
"src/third_party/instrumented_libs": {
|
||||
"url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git",
|
||||
@@ -417,8 +407,8 @@
|
||||
},
|
||||
"src/third_party/fuzztest/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
|
||||
"rev": "800c545cf9d6e9c01328a1974f93a7e6564a74fd",
|
||||
"hash": "sha256-Pvz+CWTBcWE0N0yfNGZhXDgUrGeIaCNfEjP1jYmF6G0="
|
||||
"rev": "e24a91020ab19c3d6f590bd0911b7acb492f81be",
|
||||
"hash": "sha256-wFjuvJzGEaal+pIo5UtkdLHYTpoWxRE6Vf5OGLObGQk="
|
||||
},
|
||||
"src/third_party/domato/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
|
||||
@@ -432,13 +422,13 @@
|
||||
},
|
||||
"src/third_party/libaom/source/libaom": {
|
||||
"url": "https://aomedia.googlesource.com/aom.git",
|
||||
"rev": "b63f30b6d30028a3d7d9c5223def8f3ad97dcc4c",
|
||||
"hash": "sha256-LaBEcVcSB8WB9ZNRgPSiGaKdQL5f3wll2sPb9OhN5SE="
|
||||
"rev": "33dba9e12a9f12e737eaa7c2624e8c580950a89a",
|
||||
"hash": "sha256-01DbV0kQFg1yyFpVeo82KBoZHhizA7xnZ1qOuu4HTcs="
|
||||
},
|
||||
"src/third_party/crabbyavif/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
|
||||
"rev": "7466a44ac80893803d4a7168b98dc6cd02d1fe2d",
|
||||
"hash": "sha256-x1MRNtGLmwlRNenoQKz2Bgm3J5eHlNiJZtzhT9lttmk="
|
||||
"rev": "c433c9a32320aed983e4106931596fbbae3f77ee",
|
||||
"hash": "sha256-yw1cXB6s6biD2vj2K/3sVbKiaNK7bt+NkbQovbYlJ2Q="
|
||||
},
|
||||
"src/third_party/nearby/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
|
||||
@@ -492,8 +482,8 @@
|
||||
},
|
||||
"src/third_party/cros-components/src": {
|
||||
"url": "https://chromium.googlesource.com/external/google3/cros_components.git",
|
||||
"rev": "fb512780dcc5ba4b5be9e8a3118919002077c760",
|
||||
"hash": "sha256-7wx73HZ6aqXQvLxwX6XnJAPefi/t47gIhvDH3FRT1j4="
|
||||
"rev": "e580888fcc1c108e25c218ccf8b7a4372de18d57",
|
||||
"hash": "sha256-p0Wfvhg/j8v9xL9Pueo7xPVHBKowOLI00AeIZXPQw4k="
|
||||
},
|
||||
"src/third_party/libdrm/src": {
|
||||
"url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git",
|
||||
@@ -520,20 +510,20 @@
|
||||
"rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376",
|
||||
"hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY="
|
||||
},
|
||||
"src/third_party/libphonenumber/dist": {
|
||||
"src/third_party/libphonenumber/src": {
|
||||
"url": "https://chromium.googlesource.com/external/libphonenumber.git",
|
||||
"rev": "9d46308f313f2bf8dbce1dfd4f364633ca869ca7",
|
||||
"hash": "sha256-ZbuDrZEUVp/ekjUP8WO/FsjAomRjeDBptT4nQZvTVi4="
|
||||
"rev": "ade546d8856475d0493863ee270eb3be9628106b",
|
||||
"hash": "sha256-cLtsM35Ir3iG3j8+Cy2McL1ysRB0Y1PXealAKl05Twg="
|
||||
},
|
||||
"src/third_party/libprotobuf-mutator/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git",
|
||||
"rev": "7bf98f78a30b067e22420ff699348f084f802e12",
|
||||
"hash": "sha256-EaEC6R7SzqLw4QjEcWXFXhZc84lNBp6RSa9izjGnWKE="
|
||||
"rev": "c1c950eae0440c3808f2b8bd7c57d0c6a42c1a90",
|
||||
"hash": "sha256-Su1SPr/GEFi7/N8/HrFkVbGfWH0vYdcJ5/on8zLMcyU="
|
||||
},
|
||||
"src/third_party/libsrtp": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git",
|
||||
"rev": "e8383771af8aa4096f5bcfe3743a5ea128f88a9a",
|
||||
"hash": "sha256-xC//VEFrI94nCkyLnRa6uQ+hJQqe41v0Qjm4LJ7K84I="
|
||||
"rev": "cd5d177bf1fde755ddb4c7f0d9ff7693f8b49e5e",
|
||||
"hash": "sha256-6tIbthIcUw58AgaNzvSenZPp/e5vHVTp5K2bpPF+Zg0="
|
||||
},
|
||||
"src/third_party/libsync/src": {
|
||||
"url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git",
|
||||
@@ -547,13 +537,13 @@
|
||||
},
|
||||
"src/third_party/libvpx/source/libvpx": {
|
||||
"url": "https://chromium.googlesource.com/webm/libvpx.git",
|
||||
"rev": "47ac1ec7f3de7d7cb3d070844c427c8f1fa9d6fc",
|
||||
"hash": "sha256-RyYnkLYafiS6kQKeOmzohtxFRXudDzgEmQkG+qKHozc="
|
||||
"rev": "640d4ce27ba918783e28a0da46a8a37abe4a65b6",
|
||||
"hash": "sha256-uCa/MEfw2s05kK91uubi/TqztHulwattzt1vfr0LR4E="
|
||||
},
|
||||
"src/third_party/libwebm/source": {
|
||||
"url": "https://chromium.googlesource.com/webm/libwebm.git",
|
||||
"rev": "b7a1e4767fbb02ad467f45ba378e858e897028da",
|
||||
"hash": "sha256-Lzfs15Us8MDDQYvLRVf6xKg9A76aXPnTukx/A8Mf7rw="
|
||||
"rev": "6184f4484a826724b5293837134ab9492261b941",
|
||||
"hash": "sha256-zXPuisCv2KkGQq23qTNhHeXpyCClUIeyjHra08DHJIw="
|
||||
},
|
||||
"src/third_party/libwebp/src": {
|
||||
"url": "https://chromium.googlesource.com/webm/libwebp.git",
|
||||
@@ -562,8 +552,8 @@
|
||||
},
|
||||
"src/third_party/libyuv": {
|
||||
"url": "https://chromium.googlesource.com/libyuv/libyuv.git",
|
||||
"rev": "30809ff64a9ca5e45f86439c0d474c2d3eef3d05",
|
||||
"hash": "sha256-DW7PuRqA1x0K8/uJbxBJ4Cn9YEPFhZ9vhuGVVyGKK98="
|
||||
"rev": "a7849e8a5e9c996bef2332efae897e7301055a20",
|
||||
"hash": "sha256-ftOTwWULKNplqjQQ9oM9t+PU3S6/ySDOBoE5E/HWuHg="
|
||||
},
|
||||
"src/third_party/lss": {
|
||||
"url": "https://chromium.googlesource.com/linux-syscall-support.git",
|
||||
@@ -582,13 +572,13 @@
|
||||
},
|
||||
"src/third_party/nasm": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/nasm.git",
|
||||
"rev": "45252858722aad12e545819b2d0f370eb865431b",
|
||||
"hash": "sha256-0KsHYi76IaVNwk0dBhem2AnUXd9PpeS+jUsY+zPmeJ8="
|
||||
"rev": "358842b6b7dd69b2ed635bef17f941e030a05e5f",
|
||||
"hash": "sha256-YwjwubijMZ9OvYeMUVMSunWZ2VCuqUFEOyv/MK/oojc="
|
||||
},
|
||||
"src/third_party/neon_2_sse/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git",
|
||||
"rev": "662a85912e8f86ec808f9b15ce77f8715ba53316",
|
||||
"hash": "sha256-4OzG4wIPwnKbFD9LG+stxHt5O4qB85ZIXVeSrNqDAyM="
|
||||
"rev": "ed59be8546632d5126ff69c87122ae5de20ffe4f",
|
||||
"hash": "sha256-ydHSMPJS+axvW7KIR/9SLWNFq/lP67dpg9Yt7shLCng="
|
||||
},
|
||||
"src/third_party/openh264/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/cisco/openh264",
|
||||
@@ -597,8 +587,8 @@
|
||||
},
|
||||
"src/third_party/openscreen/src": {
|
||||
"url": "https://chromium.googlesource.com/openscreen",
|
||||
"rev": "448a19d1f24e0f8ce85ad0c1c6a50cf370ae69d7",
|
||||
"hash": "sha256-hRDFnoqAH4HoWZ3oTWlzNge2nwlxpUC/GEq0MQVzBw8="
|
||||
"rev": "684bcd767271a21f3e5d475b17a0fd862f16c65e",
|
||||
"hash": "sha256-Yjz2E1/h+zp7L2x0zE0l+ktQIiSrJ4ZknXOhaVPKQVE="
|
||||
},
|
||||
"src/third_party/openscreen/src/buildtools": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src/buildtools",
|
||||
@@ -612,13 +602,13 @@
|
||||
},
|
||||
"src/third_party/pdfium": {
|
||||
"url": "https://pdfium.googlesource.com/pdfium.git",
|
||||
"rev": "a78c62d93a8f514ea2cd98a70bd1d21226be9d93",
|
||||
"hash": "sha256-qd3Oa/JFzoI5hKDY2/OQAzdr2z9srUj0H6oKz0R516U="
|
||||
"rev": "74d747ce1d383caca3ec0e604d77bac35ccd1e58",
|
||||
"hash": "sha256-qMY6L93hlnMgGZ5Blk5ldDnI/LUXYyuk+b7FXCiVV6s="
|
||||
},
|
||||
"src/third_party/perfetto": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
|
||||
"rev": "46432bb2a7a60e10fcee516f1692e6846d098a8d",
|
||||
"hash": "sha256-jVih4xWota4SZQi4yEtaIP+4qgD03OsELt2aaulIXik="
|
||||
"rev": "846203c4b3b25f834a0bebc101fa8e1b8f9d0ca9",
|
||||
"hash": "sha256-YOgOau9vNrOOqyUf6WylI/oQ2drCxoW7jnrHt7fAfQM="
|
||||
},
|
||||
"src/third_party/protobuf-javascript/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
|
||||
@@ -627,8 +617,8 @@
|
||||
},
|
||||
"src/third_party/pthreadpool/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
|
||||
"rev": "9003ee6c137cea3b94161bd5c614fb43be523ee1",
|
||||
"hash": "sha256-Es9QNblzo5b+x4K7myQJwIiUKvqyP16QExWPhGqqDO8="
|
||||
"rev": "a56dcd79c699366e7ac6466792c3025883ff7704",
|
||||
"hash": "sha256-WfyuPfII4eSmLskZV0TAcu4K6OyW38TjkDHm+VUx5eY="
|
||||
},
|
||||
"src/third_party/pyelftools": {
|
||||
"url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
|
||||
@@ -657,13 +647,13 @@
|
||||
},
|
||||
"src/third_party/search_engines_data/resources": {
|
||||
"url": "https://chromium.googlesource.com/external/search_engines_data.git",
|
||||
"rev": "2ecec7b3a56bcb5d7a4a1fc9bc71d7e1cda2a8d1",
|
||||
"hash": "sha256-UPP47dgdXxr+LPvTcEc6gi89OxmvdKD3CdwV4wKXvwQ="
|
||||
"rev": "2345fee6ce4ae24d9c365d5c0884ece593c55c67",
|
||||
"hash": "sha256-5qkra6FURaMvEOk+ZKMRH1hc8ixEnk3u4rxNm0G8tuQ="
|
||||
},
|
||||
"src/third_party/skia": {
|
||||
"url": "https://skia.googlesource.com/skia.git",
|
||||
"rev": "a2888b27a98e4ff30085d4d2dba8a1a99baf6dfb",
|
||||
"hash": "sha256-eOjFuMmXr9YtZ0e4yDB8JMjTrNWEg5OlTkAMGuHZIWE="
|
||||
"rev": "53348aa333da02b77c4b5797e2de722f5abde7d0",
|
||||
"hash": "sha256-Qh0ytA45zP67VQE417iUtjPcJmJmDzcu4BAatyh6p0w="
|
||||
},
|
||||
"src/third_party/smhasher/src": {
|
||||
"url": "https://chromium.googlesource.com/external/smhasher.git",
|
||||
@@ -682,8 +672,8 @@
|
||||
},
|
||||
"src/third_party/swiftshader": {
|
||||
"url": "https://swiftshader.googlesource.com/SwiftShader.git",
|
||||
"rev": "89556131bf9d48af3c5c9fbb9a3322e706da89a3",
|
||||
"hash": "sha256-h0utcwCnzwhFufggkBNeA674x2Kqwu4sz3jQ/9eoQv0="
|
||||
"rev": "f9d5d49a3c599a315e3493dc1e9b5309cffb3305",
|
||||
"hash": "sha256-kBfqgXXJeEPT80mu6CJ2Bwmdv/y8jVzM6TedMXbzo4o="
|
||||
},
|
||||
"src/third_party/text-fragments-polyfill/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
|
||||
@@ -692,23 +682,23 @@
|
||||
},
|
||||
"src/third_party/tflite/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
|
||||
"rev": "de8d7f65b6eb670e4dad0225d0d6f99bebaab559",
|
||||
"hash": "sha256-r2b+/VBffxsh1sRM2xcFiBx9K6GD6FsaQXpfFMBFUag="
|
||||
"rev": "2216f531fb72119745382c62f232acf9790f4b6e",
|
||||
"hash": "sha256-zySLNPmug5HS5pwJ/lEMAWjjZSOuxdTgup7Y90k7NZI="
|
||||
},
|
||||
"src/third_party/litert/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google-ai-edge/LiteRT.git",
|
||||
"rev": "588075c77c6895cce6397d41d2890b1aa0a14372",
|
||||
"hash": "sha256-rcEPZNSV0DiDrmoBCtJ07wFzzpmpM93jG4jYaEdNWvI="
|
||||
"rev": "9b5418dd7a1a318eed20395743dcc868df17d8b0",
|
||||
"hash": "sha256-80amwDPF3RrcoTaTQsunNmlvBGs6KCv369FW3J/Xcts="
|
||||
},
|
||||
"src/third_party/vulkan-deps": {
|
||||
"url": "https://chromium.googlesource.com/vulkan-deps",
|
||||
"rev": "0ced1107c62836f439f684a5696c4bd69e09fce3",
|
||||
"hash": "sha256-VOyN618wzyyO2Wh18gCnw+FCr/NbegX3A/54MClyhwc="
|
||||
"rev": "d234b7b29748c07ef389279dd24f533ebd04cadc",
|
||||
"hash": "sha256-w49HOjPixSI/C5IGlxQMj/Ol9f/Lr2zI2oMhQzzu1zk="
|
||||
},
|
||||
"src/third_party/glslang/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
|
||||
"rev": "715c8500e7cd67f2eba9e60e98852a1ed49d2f15",
|
||||
"hash": "sha256-vSbMdTjlRVvYLi5ZvTVmfe76oAQ4AhqyD+ohvkvIYIs="
|
||||
"rev": "458ff50a67cb69371850068a62b78f1990a1ff9a",
|
||||
"hash": "sha256-2WauVjAEeZn16b4fE4ImKPX3wjDmeN92mqWi3NMiXSw="
|
||||
},
|
||||
"src/third_party/spirv-cross/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
|
||||
@@ -717,38 +707,38 @@
|
||||
},
|
||||
"src/third_party/spirv-headers/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
|
||||
"rev": "6dd7ba990830f7c15ac1345ff3b43ef6ffdad216",
|
||||
"hash": "sha256-UKBVs2s05hP+paPq1dZFaUEQQ9Kx9acHxYUyJVx22eY="
|
||||
"rev": "126038020c2bd47efaa942ccc364ca5353ffccde",
|
||||
"hash": "sha256-QBX2M+ZSWgVvCx58NeDIdf6mIkdJbecDktBfUWGPvNc="
|
||||
},
|
||||
"src/third_party/spirv-tools/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
|
||||
"rev": "2d14d2e76aa7de72404b17078eda15c20a6a0389",
|
||||
"hash": "sha256-8Xtzq8WOdFEw+uEJqMW39LLHt2m165K9OJsIFZuifoM="
|
||||
"rev": "2ec8457ab33d539b6f1fecc998360c0b8b05ed4f",
|
||||
"hash": "sha256-9TBb/gnDXgZRZXhF27KEQ0XQI5itRHKJQjLrkFDQq7Q="
|
||||
},
|
||||
"src/third_party/vulkan-headers/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
|
||||
"rev": "afe9eb980aa928a66d1c9c06f38c55dd59868720",
|
||||
"hash": "sha256-/yolWlC7ruRiJ0gSdCoSlqL9+j2uJAh+o+H0OG37pq4="
|
||||
"rev": "f6a6f7ab165cedbfa2a7d0c93fe27a2d01ce09c8",
|
||||
"hash": "sha256-ZbjmxbRUiVJADNRWziCH0UIM09qKf+lm9PRnWOhZFhQ="
|
||||
},
|
||||
"src/third_party/vulkan-loader/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
|
||||
"rev": "df84d2be47457a8dfd7eb66f8c2b031683bd1ba5",
|
||||
"hash": "sha256-8ParcURRRU3eS9Oej/vHTwOwvYy3HsVJsKh2wQLKUgM="
|
||||
"rev": "15a84652b94e465e9a7b25eb507193929863bc2f",
|
||||
"hash": "sha256-pdC3YCM0Nzeabi5TPD+qR5PVdsxmWMnf2L9HsOcbv84="
|
||||
},
|
||||
"src/third_party/vulkan-tools/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
|
||||
"rev": "90bf5bc4fd8bea0d300f6564af256a51a34124b8",
|
||||
"hash": "sha256-tmTD/waVX/duaKXvj0FNUS+ncL1agM73kK7pEfHEsSA="
|
||||
"rev": "7c46da2b39036a80ce088576d5794bf39e667f56",
|
||||
"hash": "sha256-nAyNVveeGg9sA0E37YiEPm+UdKsy48nAOjnUYHQnuqw="
|
||||
},
|
||||
"src/third_party/vulkan-utility-libraries/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
|
||||
"rev": "48b1fd1a65e436bae806cb6180c9338846b9de97",
|
||||
"hash": "sha256-B3GXmwJEvnGcER5DJt0FGrwqNi3t8iV6VgX8uOrExlU="
|
||||
"rev": "2c909c1ab6f9c6caba39a84a4887186b3fafdead",
|
||||
"hash": "sha256-k3xeKHQbd2rTQJsOZKXEMPrYjcHwoCC1N12F6AIP6Ho="
|
||||
},
|
||||
"src/third_party/vulkan-validation-layers/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
|
||||
"rev": "ac146eef210b6f52b842111c5d3419ab32a7293f",
|
||||
"hash": "sha256-GqjVHxtda1a47+9G+nqh4qNMJmQaUdZNMUGQ8kAIIkk="
|
||||
"rev": "b105d8ea361af258abed65efb5a1565c031dcf1c",
|
||||
"hash": "sha256-GgznBGYgnCFMNaqAOQ15dlw2dOFfSp3mAV2KokVLzgk="
|
||||
},
|
||||
"src/third_party/vulkan_memory_allocator": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
|
||||
@@ -787,23 +777,23 @@
|
||||
},
|
||||
"src/third_party/webgpu-cts/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
|
||||
"rev": "09fdb847d90d0b5bfe57068ce2eb9283cb77fc7f",
|
||||
"hash": "sha256-eTAwnTiAHq8rmbw7u9nAwSuAlS5adStUJKfITlYkcgU="
|
||||
"rev": "3b327ebc44f11212fd3872972a6dd394634fb9e3",
|
||||
"hash": "sha256-RSZVKv2Z0pg2cGa3Elr2r5VZqdxlRJ+6mzm1Au1qg1I="
|
||||
},
|
||||
"src/third_party/webpagereplay": {
|
||||
"url": "https://chromium.googlesource.com/webpagereplay.git",
|
||||
"rev": "be48b5e3387780790ecc7723434b6ea6733bcc33",
|
||||
"hash": "sha256-KcFUlQMltsMm4WlTVMLzZXfrvu67ffkKjmBcruwZye0="
|
||||
"rev": "b7ac48f52cd298e966a76eb054412915c3e445d4",
|
||||
"hash": "sha256-smtwB6vzLgCAePz0jNfrpm8TxrxBnBkigLxERhxUEvE="
|
||||
},
|
||||
"src/third_party/webrtc": {
|
||||
"url": "https://webrtc.googlesource.com/src.git",
|
||||
"rev": "9a7f650bcd14f241d20f88f4e1ea3b7300de72ac",
|
||||
"hash": "sha256-k5cHE4XURJQrPURmXk4MMNV5k8+ryKfjmsVTzARRro4="
|
||||
"rev": "5a7e0ff57a52e12f834d64c57d040d1105ea17f2",
|
||||
"hash": "sha256-V1accCSU6LV5Ixhd+HBOvqZ7GxT57ALsvaF8ABLIXxM="
|
||||
},
|
||||
"src/third_party/wuffs/src": {
|
||||
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
|
||||
"rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
|
||||
"hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw="
|
||||
"rev": "50869df0ea703b4f41b238bfe26aec6ec9c86889",
|
||||
"hash": "sha256-V7inWJqH7Q4Ac/ZB//7XHrpgfAYUPBxWBerBem6Q/Kk="
|
||||
},
|
||||
"src/third_party/weston/src": {
|
||||
"url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git",
|
||||
@@ -812,8 +802,13 @@
|
||||
},
|
||||
"src/third_party/xnnpack/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
|
||||
"rev": "1812bbe2928a32f26c5e48466712ba6460cf290c",
|
||||
"hash": "sha256-xal21wjgeql3MjQXw6F1ezcRsnhVKod5jv0nYWroJ1o="
|
||||
"rev": "2ad25fc09167df69c6c02eb8082a0b9658dd5e80",
|
||||
"hash": "sha256-vBMGBXzJPCcsc2kMyGecjti68oZHWUwJKd7tkKub6kg="
|
||||
},
|
||||
"src/third_party/libei/src": {
|
||||
"url": "https://chromium.googlesource.com/external/gitlab.freedesktop.org/libinput/libei.git",
|
||||
"rev": "5d6d8e6590df210b75559a889baa9459c68d9366",
|
||||
"hash": "sha256-lSrIC93Cke90/Xc8dqd3e/TU32tflYHYqc5fE8wglBI="
|
||||
},
|
||||
"src/third_party/zstd/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
|
||||
@@ -822,13 +817,13 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "ad6e4525c418a92147c8247ef9d144ce4c242a38",
|
||||
"hash": "sha256-+cQdsWTgIohd3yOCsNCprSr4Ctes77fWGdmPxN2tQlM="
|
||||
"rev": "5a39b146dd810a52812202fae891281d5dc4db7d",
|
||||
"hash": "sha256-UbX88nE4VyWUm4PvFTOy3mC04MzSdgC006ZpQrEY8cQ="
|
||||
}
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "148.0.7778.178",
|
||||
"version": "148.0.7778.215",
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
"rev": "41c40cfaec7ee3bf0423c59925d8b23982a601f1",
|
||||
@@ -840,16 +835,16 @@
|
||||
"hash": "sha256-BTPD8WM1pVAMkFDlHekMdWFGyf63KdhKkKwsqikqoBQ="
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "148.0.7778.178-1",
|
||||
"hash": "sha256-s4zTU4rQUcrfpg7CWFdvEn3JYNqhHGsAFcYmQGS64fc="
|
||||
"rev": "148.0.7778.215-1",
|
||||
"hash": "sha256-Rp+PuyOQ26Cqiu+8sNlJkjp/3bO968NYNX1AgHOyYOA="
|
||||
},
|
||||
"npmHash": "sha256-JuVcY8iFRDWcPcP4Pg+qm5rnTXkiVfNsqSkXbDWqsE8="
|
||||
},
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "d096af1c9e98c45c3596e59620622b1a049bfecb",
|
||||
"hash": "sha256-XRalekzeALnDh9KiGqhYdhXvkGkjO3TOIZeqwpPLO+U=",
|
||||
"rev": "7c855c70efe3f6ade6663c1520913fa7f63a0b2b",
|
||||
"hash": "sha256-uDVYgSjxQ+xw8DHVd5UNkqnUrJ6P5ZWxL2tZToBhgQg=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
@@ -919,8 +914,8 @@
|
||||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "50fd896fb21cca91f325812d01d1e971593efc73",
|
||||
"hash": "sha256-HcfKm7UQmg3wMDOytmaYzm7Z7gRdOrRoqAKaE0ZdI4E="
|
||||
"rev": "a101e2d1db6da927325273566fe8f5404fa3a9bd",
|
||||
"hash": "sha256-uIqodvHxEY9xNse2IHNns2Mz9zLAUZSSIN7pAXB8cPs="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
@@ -959,8 +954,8 @@
|
||||
},
|
||||
"src/third_party/dawn": {
|
||||
"url": "https://dawn.googlesource.com/dawn.git",
|
||||
"rev": "19696dd088b8ed5804e2f02a8f83f5afdb3e99e3",
|
||||
"hash": "sha256-ihnVPCk9412UzCmoABWVUhiGaIdIYxiYMkk43KDqpg8="
|
||||
"rev": "78a9030d63048d832c4b822839bffe38ad4f20e5",
|
||||
"hash": "sha256-ZknkLN64TYAN5j9WsgtKlRBrAc3iCM084zpc8Zui8Ts="
|
||||
},
|
||||
"src/third_party/dawn/third_party/glfw3/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
|
||||
@@ -1094,8 +1089,8 @@
|
||||
},
|
||||
"src/third_party/devtools-frontend/src": {
|
||||
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
|
||||
"rev": "6efd6eb1d85fd67fdcc2385c54fa56c524bec3f7",
|
||||
"hash": "sha256-1pr3+RK519m+wtcacJB3PcDTL+qSHlOn1ctxpoLzTf8="
|
||||
"rev": "1fb83ff123c44ab59a480056c8c1ba3d33c2caf0",
|
||||
"hash": "sha256-S6agM7HMZ2g2W6e9tYdLSXr0Lc6zeQF9hAYLIeImAYQ="
|
||||
},
|
||||
"src/third_party/dom_distiller_js/dist": {
|
||||
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
|
||||
@@ -1159,8 +1154,8 @@
|
||||
},
|
||||
"src/third_party/freetype/src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
|
||||
"rev": "99b479dc34728936b006679a31e12b8cf432fc55",
|
||||
"hash": "sha256-H5RzBFYWIp/QYKyeBM2wfuX7FvXHPbhCAp7qne5Zvhw="
|
||||
"rev": "6d9fc45fc4bca8aef0b8f65592520673638c3334",
|
||||
"hash": "sha256-A21ONLz8HxoBkOL/jHfs5YwePmOnFyNdlNYSJa9wers="
|
||||
},
|
||||
"src/third_party/fxdiv/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
|
||||
@@ -1169,8 +1164,8 @@
|
||||
},
|
||||
"src/third_party/harfbuzz/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
|
||||
"rev": "f027b8e9039f73bf803eae684fee2eb2d30e4180",
|
||||
"hash": "sha256-HWb3QbPl+RE2oI/Jwv5BjKwv9UnJ8VcJvk+uGy9cAqM="
|
||||
"rev": "67bb413f586f36ba44d740319cb7a28b3d283ea6",
|
||||
"hash": "sha256-WCPEkbiiU8dENM+ik0KokW9Uxmz0xlsRFVVPPOEOZXw="
|
||||
},
|
||||
"src/third_party/ink/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
|
||||
@@ -1259,8 +1254,8 @@
|
||||
},
|
||||
"src/third_party/libaom/source/libaom": {
|
||||
"url": "https://aomedia.googlesource.com/aom.git",
|
||||
"rev": "b63f30b6d30028a3d7d9c5223def8f3ad97dcc4c",
|
||||
"hash": "sha256-LaBEcVcSB8WB9ZNRgPSiGaKdQL5f3wll2sPb9OhN5SE="
|
||||
"rev": "343cee0a952f8c7d329e59ff3ac2c8bdbe70ec6a",
|
||||
"hash": "sha256-H8Eu3BiUIiZcyReGDyFq9UvjdMJOX00ERjru8+I0zL8="
|
||||
},
|
||||
"src/third_party/crabbyavif/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
|
||||
@@ -1439,8 +1434,8 @@
|
||||
},
|
||||
"src/third_party/pdfium": {
|
||||
"url": "https://pdfium.googlesource.com/pdfium.git",
|
||||
"rev": "a78c62d93a8f514ea2cd98a70bd1d21226be9d93",
|
||||
"hash": "sha256-qd3Oa/JFzoI5hKDY2/OQAzdr2z9srUj0H6oKz0R516U="
|
||||
"rev": "72ea487e4399c44c3a53a48b104f9612ca772008",
|
||||
"hash": "sha256-0VgmDPyF5k81nBXdo88CcIIbz6XRhaiADnG8gwDGZZk="
|
||||
},
|
||||
"src/third_party/perfetto": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
|
||||
@@ -1489,8 +1484,8 @@
|
||||
},
|
||||
"src/third_party/skia": {
|
||||
"url": "https://skia.googlesource.com/skia.git",
|
||||
"rev": "a2888b27a98e4ff30085d4d2dba8a1a99baf6dfb",
|
||||
"hash": "sha256-eOjFuMmXr9YtZ0e4yDB8JMjTrNWEg5OlTkAMGuHZIWE="
|
||||
"rev": "03c3234e64f9fbbbcf6a7b9c79e94059df49dbfe",
|
||||
"hash": "sha256-e0MSCbqv4u4995nowzipKorkn6mPpO7tf8+ygj3/nFY="
|
||||
},
|
||||
"src/third_party/smhasher/src": {
|
||||
"url": "https://chromium.googlesource.com/external/smhasher.git",
|
||||
@@ -1624,8 +1619,8 @@
|
||||
},
|
||||
"src/third_party/webrtc": {
|
||||
"url": "https://webrtc.googlesource.com/src.git",
|
||||
"rev": "9a7f650bcd14f241d20f88f4e1ea3b7300de72ac",
|
||||
"hash": "sha256-k5cHE4XURJQrPURmXk4MMNV5k8+ryKfjmsVTzARRro4="
|
||||
"rev": "e3ee86921c57b9f8921045e77f098604803cb66c",
|
||||
"hash": "sha256-n39HENOXmatsZLF6jdYRsb+wl2cM0i6ngT4Zbyu5ayE="
|
||||
},
|
||||
"src/third_party/wuffs/src": {
|
||||
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
|
||||
@@ -1649,8 +1644,8 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "ad6e4525c418a92147c8247ef9d144ce4c242a38",
|
||||
"hash": "sha256-+cQdsWTgIohd3yOCsNCprSr4Ctes77fWGdmPxN2tQlM="
|
||||
"rev": "5e24a1fd6ffb840b93ee90a800897fcb4d60eeab",
|
||||
"hash": "sha256-JcBGaXhqNRIA4NPPV4eANVM93wsQ9QxSLO/Ecz3wklU="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
|
||||
index f977c9fed76e6f50c50351ca22128e8c8c8897b1..81460f3591b734f3354a6f9ac7bb0990e5b28889 100644
|
||||
--- a/build/config/compiler/BUILD.gn
|
||||
+++ b/build/config/compiler/BUILD.gn
|
||||
@@ -589,7 +589,7 @@ config("compiler") {
|
||||
# Flags for diagnostics.
|
||||
cflags += [ "-fcolor-diagnostics" ]
|
||||
if (!is_win) {
|
||||
- cflags += [ "-fdiagnostics-show-inlining-chain" ]
|
||||
+ cflags += [ ]
|
||||
} else {
|
||||
# Combine after https://github.com/llvm/llvm-project/pull/192241
|
||||
cflags += [ "/clang:-fdiagnostics-show-inlining-chain" ]
|
||||
@@ -1911,7 +1911,7 @@ config("clang_warning_suppression") {
|
||||
# See also: https://crbug.com/40891132#comment10
|
||||
ubsan_hardening("c_array_bounds") {
|
||||
sanitizer = "array-bounds"
|
||||
- condition = !(is_asan && target_cpu == "x86")
|
||||
+ condition = false
|
||||
|
||||
# Because we've enabled array-bounds sanitizing we also want to suppress
|
||||
# the related warning about "unsafe-buffer-usage-in-static-sized-array",
|
||||
@@ -1925,6 +1925,7 @@ ubsan_hardening("c_array_bounds") {
|
||||
# `NOTREACHED()` at the end of such functions.
|
||||
ubsan_hardening("return") {
|
||||
sanitizer = "return"
|
||||
+ condition = false
|
||||
}
|
||||
|
||||
config("rustc_revision") {
|
||||
@@ -0,0 +1,12 @@
|
||||
diff --git a/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc b/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc
|
||||
index 58ab0db508f73dbac36a84cb71ffdad972b3fc3c..b5b97f6c6b22a79fd5e4e53393859a107cc0f399 100644
|
||||
--- a/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc
|
||||
+++ b/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc
|
||||
@@ -7,6 +7,7 @@
|
||||
#include <dlfcn.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
+#include "base/logging.h"
|
||||
#include "base/process/process_metrics.h"
|
||||
#include "base/strings/stringprintf.h"
|
||||
#include "build/build_config.h"
|
||||
File diff suppressed because it is too large
Load Diff
@@ -9,10 +9,10 @@
|
||||
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "151.0.2";
|
||||
version = "151.0.3";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "87308953ed354a2799a9a45be40033bf9ff8d80fa220f034aacfbd6e754716901d4164c37fa56032c659b259116603e0ba2b566c1f3651ab9cc0835d502cd739";
|
||||
sha512 = "511723e5cf042abb66cbeda89b78d42de8d1b53544565670173f3e69c2a7ceefc76468c90576221418bfc9b122151ec117978caa4823cfb9b80797f3064bd895";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -149,36 +149,34 @@ let
|
||||
) (lib.optionals usesNixExtensions nixExtensions);
|
||||
|
||||
enterprisePolicies = {
|
||||
policies = {
|
||||
DisableAppUpdate = true;
|
||||
}
|
||||
// lib.optionalAttrs usesNixExtensions {
|
||||
ExtensionSettings = {
|
||||
"*" = {
|
||||
blocked_install_message = "You can't have manual extension mixed with nix extensions";
|
||||
installation_mode = "blocked";
|
||||
};
|
||||
}
|
||||
// lib.foldr (
|
||||
e: ret:
|
||||
ret
|
||||
// {
|
||||
"${e.extid}" = {
|
||||
installation_mode = "allowed";
|
||||
policies =
|
||||
lib.optionalAttrs usesNixExtensions {
|
||||
ExtensionSettings = {
|
||||
"*" = {
|
||||
blocked_install_message = "You can't have manual extension mixed with nix extensions";
|
||||
installation_mode = "blocked";
|
||||
};
|
||||
}
|
||||
) { } extensions;
|
||||
// lib.foldr (
|
||||
e: ret:
|
||||
ret
|
||||
// {
|
||||
"${e.extid}" = {
|
||||
installation_mode = "allowed";
|
||||
};
|
||||
}
|
||||
) { } extensions;
|
||||
|
||||
Extensions = {
|
||||
Install = lib.foldr (e: ret: ret ++ [ "${e.outPath}/${e.extid}.xpi" ]) [ ] extensions;
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs smartcardSupport {
|
||||
SecurityDevices = {
|
||||
"OpenSC PKCS#11 Module" = "opensc-pkcs11.so";
|
||||
};
|
||||
}
|
||||
// extraPolicies;
|
||||
Extensions = {
|
||||
Install = lib.foldr (e: ret: ret ++ [ "${e.outPath}/${e.extid}.xpi" ]) [ ] extensions;
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs smartcardSupport {
|
||||
SecurityDevices = {
|
||||
"OpenSC PKCS#11 Module" = "opensc-pkcs11.so";
|
||||
};
|
||||
}
|
||||
// extraPolicies;
|
||||
};
|
||||
|
||||
mozillaCfg = ''
|
||||
@@ -213,7 +211,7 @@ let
|
||||
terminal = false;
|
||||
}
|
||||
// (
|
||||
if libName == "thunderbird" then
|
||||
if lib.strings.hasPrefix "thunderbird" libName then
|
||||
{
|
||||
genericName = "Email Client";
|
||||
comment = "Read and write e-mails or RSS feeds, or manage tasks on calendars.";
|
||||
@@ -397,6 +395,9 @@ let
|
||||
ln -sfT "$target" "$out/$l"
|
||||
done
|
||||
|
||||
# Disable update checks
|
||||
touch "$out/${libDir}/is-packaged-app"
|
||||
|
||||
cd "$out"
|
||||
|
||||
''
|
||||
|
||||
@@ -105,11 +105,11 @@ assert lib.all (p: p.enabled -> !(builtins.elem null p.buildInputs)) plugins;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "weechat";
|
||||
version = "4.9.0";
|
||||
version = "4.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
|
||||
hash = "sha256-fLubJ/JafS8djEJqCPjmJe77wdPlm793WSVET3I5S28=";
|
||||
hash = "sha256-BJYLVuHdhhJ/Y8+P0Bu/93yBQvQK6KlBrD22QtMQzek=";
|
||||
};
|
||||
|
||||
# Why is this needed? https://github.com/weechat/weechat/issues/2031
|
||||
@@ -200,7 +200,7 @@ stdenv.mkDerivation rec {
|
||||
on https://nixos.org/nixpkgs/manual/#sec-weechat .
|
||||
'';
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ ncfavier ];
|
||||
maintainers = with lib.maintainers; [ abbe ];
|
||||
mainProgram = "weechat";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -30,12 +30,16 @@ let
|
||||
(if lib.versionOlder version "140" then ./no-buildconfig.patch else ./no-buildconfig-tb140.patch)
|
||||
];
|
||||
# FIXME: let's hope that upstream will fix this soon and we can drop this hack again.
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=2006630
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=2040877
|
||||
extraPostPatch =
|
||||
lib.optionalString (lib.versionAtLeast version "147" && lib.versionOlder version "149")
|
||||
''
|
||||
find . -name .cargo-checksum.json | xargs sed 's/"[^"]*\.gitmodules":"[a-z0-9]*",//g' -i
|
||||
'';
|
||||
lib.optionalString (lib.versionAtLeast version "151" && lib.versionOlder version "152") ''
|
||||
echo https://hg.mozilla.org/releases/comm-release/rev/becfb8fb2c70f1603882a2787e2170d5d8013949 >> sourcestamp.txt
|
||||
echo https://hg.mozilla.org/releases/mozilla-release/rev/fc12dc911f904307729760a817deb829cbf8feb4 >> sourcestamp.txt
|
||||
''
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=2006630
|
||||
+ lib.optionalString (lib.versionAtLeast version "140.8" && lib.versionOlder version "151") ''
|
||||
find . -name .cargo-checksum.json | xargs sed 's/"[^"]*\.gitmodules":"[a-z0-9]*",//g' -i
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/";
|
||||
@@ -73,8 +77,8 @@ rec {
|
||||
thunderbird = thunderbird-latest;
|
||||
|
||||
thunderbird-latest = common {
|
||||
version = "150.0.2";
|
||||
sha512 = "3e52220ff34aa6cd1bf46a910dba1f30d0abf7d19ed7f501ffeeb8f5901b8d97fdc0adb0cceb434ef8e83c7f7b83f28024b872280237af72ff2da9d89fafe065";
|
||||
version = "151.0.1";
|
||||
sha512 = "a09c1e18faa8d7fdccf39e905542c21e817230e68c7cc6050beec048d0fec0f8eb92e51278d2ccd8d8cfa842762662235517e20238b555a4ad48ee5648dc3589";
|
||||
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "thunderbirdPackages.thunderbird-latest";
|
||||
@@ -87,8 +91,8 @@ rec {
|
||||
thunderbird-140 = common {
|
||||
applicationName = "Thunderbird ESR";
|
||||
|
||||
version = "140.7.2esr";
|
||||
sha512 = "513bcaa496f987d0f3906aeb6fe3ea651331470646b0c58479c91bb2c8eb52e389bc8aa646437a03b611ab78bda1df7252545960ffe38086d1fc462e65421819";
|
||||
version = "140.11.1esr";
|
||||
sha512 = "93dfdd26e6f4c7dd2f7dcc2e4994980d017868341c60c93775721467abd9192b815f2de63928e7d10c965fc045ed72ca5b49ed6502a61e50104ee5cd00941d1e";
|
||||
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "thunderbirdPackages.thunderbird-140";
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.83";
|
||||
version = "0.84";
|
||||
pname = "putty";
|
||||
|
||||
src = fetchurl {
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
"https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz"
|
||||
"ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz"
|
||||
];
|
||||
hash = "sha256-cYd3wT1j0N/5H+AxYrwqBbTfyLCCdjTNYLUc79/2McY=";
|
||||
hash = "sha256-BgV4Yq4Zjx29IZ0MdJMIDVn2BhlLtQVsVJ40KqAbaf4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
zarith,
|
||||
camlp5,
|
||||
camlp-streams,
|
||||
pcre2,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -18,6 +19,7 @@ let
|
||||
''
|
||||
-I ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith \
|
||||
-I ${zarith}/lib/ocaml/${ocaml.version}/site-lib/stublibs \
|
||||
-I ${pcre2}/lib/ocaml/${ocaml.version}/site-lib/stublibs \
|
||||
''
|
||||
else
|
||||
lib.optionalString (num != null) ''
|
||||
@@ -61,6 +63,7 @@ stdenv.mkDerivation {
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
camlp-streams
|
||||
pcre2
|
||||
(if use_zarith then zarith else num)
|
||||
];
|
||||
|
||||
|
||||
@@ -396,7 +396,7 @@ in
|
||||
# https://github.com/moby/moby/tree/${mobyRev}/Dockerfile
|
||||
docker_25 =
|
||||
let
|
||||
version = "25.0.13";
|
||||
version = "25.0.16";
|
||||
in
|
||||
callPackage dockerGen {
|
||||
inherit version;
|
||||
@@ -405,7 +405,7 @@ in
|
||||
cliRev = "43987fca488a535d810c429f75743d8c7b63bf4f";
|
||||
cliHash = "sha256-OwufdfuUPbPtgqfPeiKrQVkOOacU2g4ommHb770gV40=";
|
||||
mobyRev = "v${version}";
|
||||
mobyHash = "sha256-X+1QG/toJt+VNLktR5vun8sG3PRoTVBAcekFXxocJdU=";
|
||||
mobyHash = "sha256-St5yLoxo8QUTu7PjNcblS/EzZm98T189RPl1y+pAyHA=";
|
||||
runcRev = "v1.2.5";
|
||||
runcHash = "sha256-J/QmOZxYnMPpzm87HhPTkYdt+fN+yeSUu2sv6aUeTY4=";
|
||||
containerdRev = "v1.7.27";
|
||||
@@ -430,18 +430,21 @@ in
|
||||
containerdHash = "sha256-vz7RFJkFkMk2gp7bIMx1kbkDFUMS9s0iH0VoyD9A21s=";
|
||||
tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828";
|
||||
tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw=";
|
||||
knownVulnerabilities = [
|
||||
"docker_28 has been unmaintained since November 2025, use docker_29 or newer instead"
|
||||
];
|
||||
};
|
||||
|
||||
docker_29 =
|
||||
let
|
||||
version = "29.5.1";
|
||||
version = "29.5.2";
|
||||
in
|
||||
callPackage dockerGen {
|
||||
inherit version;
|
||||
cliRev = "v${version}";
|
||||
cliHash = "sha256-oobGr0UaeJL800hHx3K0tQs50HZbOn559WcLnSRiRhU=";
|
||||
cliHash = "sha256-kHgDZVr6mAyCtZ6bSG9FWV0GhWDfXLXzHYFrmjFzO9w=";
|
||||
mobyRev = "docker-v${version}";
|
||||
mobyHash = "sha256-ghYEOWr5RUDm0YLyupaDSpLd+8gFqxp3VjCt+3lztcA=";
|
||||
mobyHash = "sha256-lux7tTyF6vm5wuIXs+z3Ygd2v4JjgHbRvOXNA4kjNtg=";
|
||||
runcRev = "v1.3.5";
|
||||
runcHash = "sha256-Swphxbu/OLkUrfRjLMZIVGwYb7AN0xHdyxm0ysAVam0=";
|
||||
containerdRev = "v2.2.3";
|
||||
|
||||
@@ -640,7 +640,7 @@ buildStdenv.mkDerivation {
|
||||
|
||||
profilingPhase = lib.optionalString pgoSupport ''
|
||||
# Avoid compressing the instrumented build with high levels of compression
|
||||
export MOZ_PKG_FORMAT=tar
|
||||
export MOZ_PKG_FORMAT=TAR
|
||||
|
||||
# Package up Firefox for profiling
|
||||
./mach package
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
pname ? null,
|
||||
# The `dl` field of the registry's index configuration
|
||||
# https://doc.rust-lang.org/cargo/reference/registry-index.html#index-configuration
|
||||
registryDl ? "https://crates.io/api/v1/crates",
|
||||
registryDl ? "https://static.crates.io/crates",
|
||||
version,
|
||||
unpack ? true,
|
||||
...
|
||||
|
||||
@@ -130,7 +130,10 @@ let
|
||||
};
|
||||
|
||||
registries = {
|
||||
"https://github.com/rust-lang/crates.io-index" = "https://crates.io/api/v1/crates";
|
||||
# Use static.crates.io (CDN) instead of crates.io/api to avoid the 1 req/sec
|
||||
# rate limit on the API servers, which currently returns intermittent 403s.
|
||||
# See https://github.com/rust-lang/crates.io/issues/13482
|
||||
"https://github.com/rust-lang/crates.io-index" = "https://static.crates.io/crates";
|
||||
}
|
||||
// extraRegistries;
|
||||
|
||||
|
||||
@@ -620,7 +620,10 @@ rec {
|
||||
in
|
||||
runCommand name args ''
|
||||
mkdir -p $out
|
||||
for i in $(cat $pathsPath); do
|
||||
if [ -n "''${pathsPath:-}" ] && [ -f "$pathsPath" ]; then
|
||||
mapfile -d " " -t paths < "$pathsPath"
|
||||
fi
|
||||
for i in "''${paths[@]}"; do
|
||||
${optionalString (!failOnMissing) "if test -d $i; then "}${lndir}/bin/lndir -silent $i $out${
|
||||
optionalString (!failOnMissing) "; fi"
|
||||
}
|
||||
|
||||
@@ -55,6 +55,24 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
symlinkJoin-structured-attrs = testEqualContents {
|
||||
assertion = "symlinkJoin-structured-attrs";
|
||||
actual = symlinkJoin {
|
||||
__structuredAttrs = true;
|
||||
name = "symlinkJoin-structured-attrs";
|
||||
paths = [
|
||||
foo
|
||||
bar
|
||||
baz
|
||||
];
|
||||
};
|
||||
expected = runCommand "symlinkJoin-foo-bar-baz" { } ''
|
||||
mkdir -p $out/{var/lib/arbitrary,etc/test.d}
|
||||
ln -s {${foo},${bar}}/etc/test.d/* $out/etc/test.d
|
||||
ln -s ${baz}/var/lib/arbitrary/baz $out/var/lib/arbitrary/
|
||||
'';
|
||||
};
|
||||
|
||||
symlinkJoin-strip-paths = testEqualContents {
|
||||
assertion = "symlinkJoin-strip-paths";
|
||||
actual = symlinkJoin {
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "alire";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alire-project";
|
||||
repo = "alire";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DfzCQu9xOe9JgX6RTrYOGTIS6EcPimLnd5pfXMtfRss=";
|
||||
hash = "sha256-YOUFTKbqbFfdYNWcGCvtFCDCW2tH8E3YuRQrV522Px4=";
|
||||
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "agg";
|
||||
version = "1.8.1";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asciinema";
|
||||
repo = "agg";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-64VyCTGjzey6AHEAfk5V/Qoffe5+sDaDNve54M7tmf4=";
|
||||
hash = "sha256-XuAVckgTsKvngrR/blgpLgONaWxfrn8o7hCKqCGPNeM=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
cargoHash = "sha256-/WS5nAFKnP/CsU5+Pf5rtNN4LWaXVjlidLzH7DWYds0=";
|
||||
cargoHash = "sha256-VcdHlQOplki31uLOutVx7HH7rjH9a5fEZhlxtLvuS9E=";
|
||||
|
||||
__impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"/System/Library/Fonts"
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "audit";
|
||||
version = "4.1.2-unstable-2025-09-06"; # fixes to non-static builds right after 4.1.2 release
|
||||
version = "4.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-audit";
|
||||
repo = "audit-userspace";
|
||||
rev = "cb13fe75ee2c36d5c525ed9de22aae10dbc8caf4";
|
||||
hash = "sha256-NX0TWA+LtcZgbM9aQfokWv2rGNAAb3ksGqAH8URAkYM=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GdJ9nzlDAdOazOHH/YWuEoELrJh+G5ZJUKwIqAKAzpo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -130,10 +130,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Instead, we load audit rules in a dedicated module.
|
||||
postFixup = ''
|
||||
moveToOutput bin/augenrules $scripts
|
||||
substituteInPlace $scripts/bin/augenrules \
|
||||
--replace-fail "/sbin/auditctl -R" "$bin/bin/auditctl -R" \
|
||||
--replace-fail "auditctl -s" "$bin/bin/auditctl -s" \
|
||||
--replace-fail "/bin/ls" "ls"
|
||||
wrapProgram $scripts/bin/augenrules \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bettercap";
|
||||
version = "2.41.4";
|
||||
version = "2.41.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bettercap";
|
||||
repo = "bettercap";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-y23gNqS5f/MP+wyRMxe40I+9RuZGyZEok17LIc9Z8O4=";
|
||||
sha256 = "sha256-oiJPZW0ywrRlKq9kfKilCxbq9WN5VhhY2T/5iDe78RM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1kgjMPsj8z2Cl0YWe/1zY0Zuiza0X+ZAIgsMqPhCrMw=";
|
||||
vendorHash = "sha256-ssNGy40KMJ9P33uEGyYOer92QRS2T6DQlKaf/3XMFwQ=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bird";
|
||||
version = "2.18.1";
|
||||
version = "2.19.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.nic.cz";
|
||||
owner = "labs";
|
||||
repo = "bird";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tYICTipTzugtb7kv/zwsChM8v+zJ2TVsotEkJDcZCto=";
|
||||
hash = "sha256-xk3z5kkjnInmIwtE6Q7kCJ5P5Njt/Oz1+HPO0vcr93E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bird";
|
||||
version = "3.2.1";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.nic.cz";
|
||||
owner = "labs";
|
||||
repo = "bird";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FkrVrjT4Q9zLeauP2GOX38a7a4q7h2aQbEe/kmfKB3A=";
|
||||
hash = "sha256-mH9CM9Emie2B9c5PeW4DKUQUzvgxTExPBGG06YbWqGo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,202 @@
|
||||
From 776f2a97d34c2ccfba90c0bcb448de7792edfdb6 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Gaynor <alex.gaynor@gmail.com>
|
||||
Date: Wed, 18 Feb 2026 07:46:15 -0500
|
||||
Subject: [PATCH 1/2] Fix buffer overflow in DTLS cookie generation callback
|
||||
(#1479)
|
||||
|
||||
The cookie generate callback copied user-returned bytes into a
|
||||
fixed-size native buffer without enforcing a maximum length. A
|
||||
callback returning more than DTLS1_COOKIE_LENGTH bytes would overflow
|
||||
the OpenSSL-provided buffer, corrupting adjacent memory.
|
||||
|
||||
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
|
||||
---
|
||||
src/OpenSSL/SSL.py | 7 +++++++
|
||||
tests/test_ssl.py | 38 ++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 45 insertions(+)
|
||||
|
||||
diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
|
||||
index efbf7907e618c912d48352f74fb80a9c19b9b98b..e28e10ab81ade8d79aff0cb9232fa71b1fb5314b 100644
|
||||
--- a/src/OpenSSL/SSL.py
|
||||
+++ b/src/OpenSSL/SSL.py
|
||||
@@ -561,11 +561,18 @@ class _CookieGenerateCallbackHelper(_CallbackExceptionHelper):
|
||||
def __init__(self, callback):
|
||||
_CallbackExceptionHelper.__init__(self)
|
||||
|
||||
+ max_cookie_len = getattr(_lib, "DTLS1_COOKIE_LENGTH", 255)
|
||||
+
|
||||
@wraps(callback)
|
||||
def wrapper(ssl, out, outlen):
|
||||
try:
|
||||
conn = Connection._reverse_mapping[ssl]
|
||||
cookie = callback(conn)
|
||||
+ if len(cookie) > max_cookie_len:
|
||||
+ raise ValueError(
|
||||
+ f"Cookie too long (got {len(cookie)} bytes, "
|
||||
+ f"max {max_cookie_len})"
|
||||
+ )
|
||||
out[0 : len(cookie)] = cookie
|
||||
outlen[0] = len(cookie)
|
||||
return 1
|
||||
diff --git a/tests/test_ssl.py b/tests/test_ssl.py
|
||||
index 024436f064ddadbf79a3e6b78e2a9e4aeeee7ac2..5f427e92b48e57276fee7acb5ffdbaf136462cee 100644
|
||||
--- a/tests/test_ssl.py
|
||||
+++ b/tests/test_ssl.py
|
||||
@@ -4497,6 +4497,44 @@ class TestDTLS:
|
||||
except NotImplementedError: # OpenSSL 1.1.0 and earlier
|
||||
pass
|
||||
|
||||
+ def test_cookie_generate_too_long(self) -> None:
|
||||
+ s_ctx = Context(DTLS_METHOD)
|
||||
+
|
||||
+ def generate_cookie(ssl: Connection) -> bytes:
|
||||
+ return b"\x00" * 256
|
||||
+
|
||||
+ def verify_cookie(ssl: Connection, cookie: bytes) -> bool:
|
||||
+ return True
|
||||
+
|
||||
+ s_ctx.set_cookie_generate_callback(generate_cookie)
|
||||
+ s_ctx.set_cookie_verify_callback(verify_cookie)
|
||||
+ s_ctx.use_privatekey(load_privatekey(FILETYPE_PEM, server_key_pem))
|
||||
+ s_ctx.use_certificate(load_certificate(FILETYPE_PEM, server_cert_pem))
|
||||
+ s_ctx.set_options(OP_NO_QUERY_MTU)
|
||||
+ s = Connection(s_ctx)
|
||||
+ s.set_accept_state()
|
||||
+
|
||||
+ c_ctx = Context(DTLS_METHOD)
|
||||
+ c_ctx.set_options(OP_NO_QUERY_MTU)
|
||||
+ c = Connection(c_ctx)
|
||||
+ c.set_connect_state()
|
||||
+
|
||||
+ c.set_ciphertext_mtu(1500)
|
||||
+ s.set_ciphertext_mtu(1500)
|
||||
+
|
||||
+ # Client sends ClientHello
|
||||
+ try:
|
||||
+ c.do_handshake()
|
||||
+ except SSL.WantReadError:
|
||||
+ pass
|
||||
+ chunk = c.bio_read(self.LARGE_BUFFER)
|
||||
+ s.bio_write(chunk)
|
||||
+
|
||||
+ # Server tries DTLSv1_listen, which triggers cookie generation.
|
||||
+ # The oversized cookie should raise ValueError.
|
||||
+ with pytest.raises(ValueError, match="Cookie too long"):
|
||||
+ s.DTLSv1_listen()
|
||||
+
|
||||
def test_timeout(self, monkeypatch):
|
||||
c_ctx = Context(DTLS_METHOD)
|
||||
c = Connection(c_ctx)
|
||||
--
|
||||
2.53.0
|
||||
|
||||
|
||||
From d39f020cc63c1da4d44be683f310fbc9f44f61bb Mon Sep 17 00:00:00 2001
|
||||
From: Alex Gaynor <alex.gaynor@gmail.com>
|
||||
Date: Mon, 16 Feb 2026 21:04:37 -0500
|
||||
Subject: [PATCH 2/2] Handle exceptions in set_tlsext_servername_callback
|
||||
callbacks (#1478)
|
||||
|
||||
When the servername callback raises an exception, call sys.excepthook
|
||||
with the exception info and return SSL_TLSEXT_ERR_ALERT_FATAL to abort
|
||||
the handshake. Previously, exceptions would propagate uncaught through
|
||||
the CFFI callback boundary.
|
||||
|
||||
https://claude.ai/code/session_01P7y1XmWkdtC5UcmZwGDvGi
|
||||
|
||||
Co-authored-by: Claude <noreply@anthropic.com>
|
||||
---
|
||||
src/OpenSSL/SSL.py | 9 +++++++--
|
||||
tests/test_ssl.py | 50 ++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 57 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
|
||||
index e28e10ab81ade8d79aff0cb9232fa71b1fb5314b..a2d5f5b086b3fe27c6e30848cdd027ee60f69677 100644
|
||||
--- a/src/OpenSSL/SSL.py
|
||||
+++ b/src/OpenSSL/SSL.py
|
||||
@@ -1,5 +1,6 @@
|
||||
import os
|
||||
import socket
|
||||
+import sys
|
||||
from errno import errorcode
|
||||
from functools import partial, wraps
|
||||
from itertools import chain, count
|
||||
@@ -1444,8 +1445,12 @@ class Context:
|
||||
"""
|
||||
|
||||
@wraps(callback)
|
||||
- def wrapper(ssl, alert, arg):
|
||||
- callback(Connection._reverse_mapping[ssl])
|
||||
+ def wrapper(ssl, alert, arg): # type: ignore[no-untyped-def]
|
||||
+ try:
|
||||
+ callback(Connection._reverse_mapping[ssl])
|
||||
+ except Exception:
|
||||
+ sys.excepthook(*sys.exc_info())
|
||||
+ return _lib.SSL_TLSEXT_ERR_ALERT_FATAL
|
||||
return 0
|
||||
|
||||
self._tlsext_servername_callback = _ffi.callback(
|
||||
diff --git a/tests/test_ssl.py b/tests/test_ssl.py
|
||||
index 5f427e92b48e57276fee7acb5ffdbaf136462cee..d42beace175c1ea79929050ec6f88faa539ff6b4 100644
|
||||
--- a/tests/test_ssl.py
|
||||
+++ b/tests/test_ssl.py
|
||||
@@ -1854,6 +1854,56 @@ class TestServerNameCallback:
|
||||
|
||||
assert args == [(server, b"foo1.example.com")]
|
||||
|
||||
+ def test_servername_callback_exception(
|
||||
+ self, monkeypatch: pytest.MonkeyPatch
|
||||
+ ) -> None:
|
||||
+ """
|
||||
+ When the callback passed to `Context.set_tlsext_servername_callback`
|
||||
+ raises an exception, ``sys.excepthook`` is called with the exception
|
||||
+ and the handshake fails with an ``Error``.
|
||||
+ """
|
||||
+ exc = TypeError("server name callback failed")
|
||||
+
|
||||
+ def servername(conn: Connection) -> None:
|
||||
+ raise exc
|
||||
+
|
||||
+ excepthook_calls: list[
|
||||
+ tuple[type[BaseException], BaseException, object]
|
||||
+ ] = []
|
||||
+
|
||||
+ def custom_excepthook(
|
||||
+ exc_type: type[BaseException],
|
||||
+ exc_value: BaseException,
|
||||
+ exc_tb: object,
|
||||
+ ) -> None:
|
||||
+ excepthook_calls.append((exc_type, exc_value, exc_tb))
|
||||
+
|
||||
+ context = Context(SSLv23_METHOD)
|
||||
+ context.set_tlsext_servername_callback(servername)
|
||||
+
|
||||
+ # Necessary to actually accept the connection
|
||||
+ context.use_privatekey(load_privatekey(FILETYPE_PEM, server_key_pem))
|
||||
+ context.use_certificate(
|
||||
+ load_certificate(FILETYPE_PEM, server_cert_pem)
|
||||
+ )
|
||||
+
|
||||
+ # Do a little connection to trigger the logic
|
||||
+ server = Connection(context, None)
|
||||
+ server.set_accept_state()
|
||||
+
|
||||
+ client = Connection(Context(SSLv23_METHOD), None)
|
||||
+ client.set_connect_state()
|
||||
+ client.set_tlsext_host_name(b"foo1.example.com")
|
||||
+
|
||||
+ monkeypatch.setattr(sys, "excepthook", custom_excepthook)
|
||||
+ with pytest.raises(Error):
|
||||
+ interact_in_memory(server, client)
|
||||
+
|
||||
+ assert len(excepthook_calls) == 1
|
||||
+ assert excepthook_calls[0][0] is TypeError
|
||||
+ assert excepthook_calls[0][1] is exc
|
||||
+ assert excepthook_calls[0][2] is not None
|
||||
+
|
||||
|
||||
class TestApplicationLayerProtoNegotiation:
|
||||
"""
|
||||
--
|
||||
2.53.0
|
||||
|
||||
@@ -282,7 +282,9 @@ let
|
||||
inherit version;
|
||||
hash = "sha256-hBSYub7GFiOxtsR+u8AjZ8B9YODhlfGXkIF/EMyNsLc=";
|
||||
};
|
||||
patches = [ ]; # those two CVE patches do not apply (!)
|
||||
patches = [
|
||||
./old-python-packages/pyopenssl-Cherry-pick-fix-for-CVE-2026-27459-and-CVE-2026-27448.patch
|
||||
];
|
||||
disabledTests = old.disabledTests or [ ] ++ [
|
||||
"test_export_md5_digest"
|
||||
];
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
installShellFiles,
|
||||
nixosTests,
|
||||
externalPlugins ? [ ],
|
||||
vendorHash ? "sha256-bnNpJgy54wvTST1Jtfbd1ldLJrIzTW62TL7wyHeqz28=",
|
||||
vendorHash ? "sha256-9LLTgIjOOMvYx4nhy+6X9bEBvqlKeTx//39q+YWXeHw=",
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -14,13 +14,13 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "coredns";
|
||||
version = "1.13.2";
|
||||
version = "1.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coredns";
|
||||
repo = "coredns";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9ggyFixdNy0t4UA8ZxU5oMUzA/8EB/k1jors4f8Q6YE=";
|
||||
hash = "sha256-Uk4oWsUxaGdLQzX5JywYzi7pmQHGo06uQdLeOkP4U/s";
|
||||
};
|
||||
|
||||
inherit vendorHash;
|
||||
@@ -32,59 +32,61 @@ buildGoModule (finalAttrs: {
|
||||
"man"
|
||||
];
|
||||
|
||||
# Override the go-modules fetcher derivation to fetch plugins
|
||||
modBuildPhase = ''
|
||||
cp plugin.cfg plugin.cfg.orig
|
||||
${
|
||||
(lib.concatMapStringsSep "\n" (
|
||||
plugin:
|
||||
let
|
||||
position = plugin.position or "end-of-file";
|
||||
formatPlugin = { name, repo, ... }: "${name}:${repo}";
|
||||
in
|
||||
if position == "end-of-file" then
|
||||
"echo '${formatPlugin plugin}' >> plugin.cfg"
|
||||
else if position == "start-of-file" then
|
||||
"sed -i '1i ${formatPlugin plugin}' plugin.cfg"
|
||||
else if lib.hasAttrByPath [ "before" ] position then
|
||||
''
|
||||
if ! grep -q '^${position.before}:' plugin.cfg; then
|
||||
echo 'Failed to insert ${plugin.name} before ${position.before} in plugin.cfg: ${position.before} is not in plugin.cfg'
|
||||
exit 1
|
||||
fi
|
||||
sed -i '/^${position.before}:/i ${formatPlugin plugin}' plugin.cfg
|
||||
''
|
||||
else if lib.hasAttrByPath [ "after" ] position then
|
||||
''
|
||||
if ! grep -q '^${position.after}:' plugin.cfg; then
|
||||
echo 'Failed to insert ${plugin.name} after ${position.after} in plugin.cfg: ${position.after} is not in plugin.cfg'
|
||||
exit 1
|
||||
fi
|
||||
sed -i '/^${position.after}:/a ${formatPlugin plugin}' plugin.cfg
|
||||
''
|
||||
else
|
||||
throw ''
|
||||
Unsupported position value in externalPlugin:
|
||||
${builtins.toJSON plugin}.
|
||||
Valid values for position attr are:
|
||||
- position = "end-of-file" (the default)
|
||||
- position = "start-of-file"
|
||||
- position.before = "{other plugin}"
|
||||
- position.after = "{other plugin}"
|
||||
''
|
||||
) externalPlugins)
|
||||
}
|
||||
diff -u plugin.cfg.orig plugin.cfg || true
|
||||
for src in ${toString (attrsToSources externalPlugins)}; do go get $src; done
|
||||
CC= GOOS= GOARCH= go generate
|
||||
go mod tidy
|
||||
go mod vendor
|
||||
'';
|
||||
overrideModAttrs = {
|
||||
# Add plugins before vendoring the modules.
|
||||
preBuild = ''
|
||||
cp plugin.cfg plugin.cfg.orig
|
||||
${
|
||||
(lib.concatMapStringsSep "\n" (
|
||||
plugin:
|
||||
let
|
||||
position = plugin.position or "end-of-file";
|
||||
formatPlugin = { name, repo, ... }: "${name}:${repo}";
|
||||
in
|
||||
if position == "end-of-file" then
|
||||
"echo '${formatPlugin plugin}' >> plugin.cfg"
|
||||
else if position == "start-of-file" then
|
||||
"sed -i '1i ${formatPlugin plugin}' plugin.cfg"
|
||||
else if lib.hasAttrByPath [ "before" ] position then
|
||||
''
|
||||
if ! grep -q '^${position.before}:' plugin.cfg; then
|
||||
echo 'Failed to insert ${plugin.name} before ${position.before} in plugin.cfg: ${position.before} is not in plugin.cfg'
|
||||
exit 1
|
||||
fi
|
||||
sed -i '/^${position.before}:/i ${formatPlugin plugin}' plugin.cfg
|
||||
''
|
||||
else if lib.hasAttrByPath [ "after" ] position then
|
||||
''
|
||||
if ! grep -q '^${position.after}:' plugin.cfg; then
|
||||
echo 'Failed to insert ${plugin.name} after ${position.after} in plugin.cfg: ${position.after} is not in plugin.cfg'
|
||||
exit 1
|
||||
fi
|
||||
sed -i '/^${position.after}:/a ${formatPlugin plugin}' plugin.cfg
|
||||
''
|
||||
else
|
||||
throw ''
|
||||
Unsupported position value in externalPlugin:
|
||||
${builtins.toJSON plugin}.
|
||||
Valid values for position attr are:
|
||||
- position = "end-of-file" (the default)
|
||||
- position = "start-of-file"
|
||||
- position.before = "{other plugin}"
|
||||
- position.after = "{other plugin}"
|
||||
''
|
||||
) externalPlugins)
|
||||
}
|
||||
diff -u plugin.cfg.orig plugin.cfg || true
|
||||
for src in ${toString (attrsToSources externalPlugins)}; do go get $src; done
|
||||
GOFLAGS=''${GOFLAGS//-mod=vendor/} CC= GOOS= GOARCH= go generate
|
||||
go mod tidy
|
||||
'';
|
||||
|
||||
modInstallPhase = ''
|
||||
mv -t vendor go.mod go.sum plugin.cfg
|
||||
cp -r --reflink=auto vendor "$out"
|
||||
'';
|
||||
# Move the modified `go.mod`, `go.sum`, and `plugin.cfg` files into the
|
||||
# vendor directory so we can retrieve them later in the `preBuild` hook.
|
||||
postBuild = ''
|
||||
mv -t vendor go.mod go.sum plugin.cfg
|
||||
'';
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
chmod -R u+w vendor
|
||||
@@ -102,10 +104,21 @@ buildGoModule (finalAttrs: {
|
||||
substituteInPlace test/readme_test.go \
|
||||
--replace-fail "TestReadme" "SkipReadme"
|
||||
|
||||
substituteInPlace test/metrics_test.go \
|
||||
--replace-fail "TestMetricsRewriteRequestSize" "SkipMetricsRewriteRequestSize"
|
||||
|
||||
substituteInPlace test/quic_test.go \
|
||||
--replace-fail "TestQUICReloadDoesNotPanic" "SkipQUICReloadDoesNotPanic"
|
||||
|
||||
# this test fails if any external plugins were imported.
|
||||
# it's a lint rather than a test of functionality, so it's safe to disable.
|
||||
substituteInPlace test/presubmit_test.go \
|
||||
--replace-fail "TestImportOrdering" "SkipImportOrdering"
|
||||
|
||||
substituteInPlace plugin/pkg/parse/transport_test.go \
|
||||
--replace-fail \
|
||||
"TestTransport" \
|
||||
"SkipTransport"
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# loopback interface is lo0 on macos
|
||||
@@ -123,6 +136,7 @@ buildGoModule (finalAttrs: {
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
coredns-external-plugins = nixosTests.coredns;
|
||||
kubernetes-single-node = nixosTests.kubernetes.dns-single-node;
|
||||
kubernetes-multi-node = nixosTests.kubernetes.dns-multi-node;
|
||||
};
|
||||
|
||||
@@ -23,15 +23,18 @@
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cups";
|
||||
version = "2.4.16";
|
||||
version = "2.4.19";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz";
|
||||
hash = "sha256-AzlYcgS0+UKN0FkuswHewL+epuqNzl2WkNVr5YWrqS0=";
|
||||
url = "https://github.com/OpenPrinting/cups/releases/download/v${finalAttrs.version}/cups-${finalAttrs.version}-source.tar.gz";
|
||||
hash = "sha256-ggmEsSpn+YcFeFquLdE0f+CsCXgoAB1Fg/9kV0rtY4k=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"lib"
|
||||
@@ -183,4 +186,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with lib.maintainers; [ matthewbauer ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -86,7 +86,7 @@ assert
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "curl";
|
||||
version = "8.19.0";
|
||||
version = "8.20.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
|
||||
}/curl-${finalAttrs.version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-TrQUiXkNGeGQ16x+GOgoV83Wivj05mspLO1WLTM/Ed8=";
|
||||
hash = "sha256-Y/4twUi6DOromSLvg49+XJRicsLni3xZ+rS3nTziuJY=";
|
||||
};
|
||||
|
||||
# this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "7.1.200";
|
||||
version = "7.1.220";
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-x64.tar.xz";
|
||||
hash = "sha256-FrAFUkxv4/GGhDO/2g+0Kym1LCV+YoIee7rmOAw17/Q=";
|
||||
hash = "sha256-q4j4S88c7xsC+Ax7XY1EVbqRRJXH+JzLrZRRB6rfQOE=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-arm64.tar.xz";
|
||||
hash = "sha256-FcP4jAVvIA71GCtVoWEIA4AynsHOAn0/zt3rNB6Q25Y=";
|
||||
hash = "sha256-g94qn+EHr8Dwn21L7z3W7Z5+LJoVSQcAEXHpJiAdbJg=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "distribution";
|
||||
version = "3.0.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "distribution";
|
||||
repo = "distribution";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-myezQTEdH7kkpCoAeZMf5OBxT4Bz8Qx6vCnwim230RY=";
|
||||
hash = "sha256-KsN3QW71VwGrgrhOmwzzmTm/54+ZaTFj5kNgbta1FmI=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -39,11 +39,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exim";
|
||||
version = "4.99.2";
|
||||
version = "4.99.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.exim.org/pub/exim/exim4/exim-${version}.tar.xz";
|
||||
hash = "sha256-JTZPGZiCcNhGllaJ3SnGYs9d4VJjmHXQ1TUqaf11Okc=";
|
||||
hash = "sha256-Zj520qDZuPxbNz0ACORK4ETxD+sivJ266MfyE0Xr+zs=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
# files.
|
||||
|
||||
let
|
||||
version = "2.7.5";
|
||||
version = "2.8.1";
|
||||
tag = "R_${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url =
|
||||
with finalAttrs;
|
||||
"https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-EDLf70/xf3BGSCfaooNpsg9lhNEIvDbxerFnbh7dL5E=";
|
||||
hash = "sha256-ELGV7ngWCpCDiBgKj+NgPU6aEvR1X79fOBayOp11DaA=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fastnetmon-advanced";
|
||||
version = "2.0.372";
|
||||
version = "2.0.380";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://repo.fastnetmon.com/fastnetmon_ubuntu_jammy/pool/fastnetmon/f/fastnetmon/fastnetmon_${version}_amd64.deb";
|
||||
hash = "sha256-FwYAbTBkk+AciDVxTIimswsB0M3gbzKX+03PD0fLMsY=";
|
||||
url = "https://repo.fastnetmon.com/fastnetmon_ubuntu_noble/pool/fastnetmon/f/fastnetmon/fastnetmon_${version}_amd64.deb";
|
||||
hash = "sha256-4hCrDaFat0kEbyzKg6nHdV+LlqCBYYJEojyvXyPYKD0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
|
||||
let
|
||||
pname = "fflogs";
|
||||
version = "9.0.33";
|
||||
version = "9.3.61";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
|
||||
hash = "sha256-gUIETMc0JQXONBt0+Pw52y37Pw4Wh5CHo1uY6IBhvkc=";
|
||||
hash = "sha256-QBiZR8wjhMsLguzBaM21mADlR1hKHdBuK66DcSzyVtQ=";
|
||||
};
|
||||
extracted = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
|
||||
@@ -52,17 +52,17 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "forgejo-runner";
|
||||
version = "12.10.1";
|
||||
version = "12.10.2";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "code.forgejo.org";
|
||||
owner = "forgejo";
|
||||
repo = "runner";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-OBMduRaGSVPojSAr6DKPbAdUyuw1MSCpipRv+EA5OGw=";
|
||||
hash = "sha256-Uo+x02HgpfOY+KXug7cmnW4d85AlX6wqz+nYGF/JrHk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-V9dEHNp80oS7NfsGIlKgFyHD1PmMm2bCqydVADpphuA=";
|
||||
vendorHash = "sha256-0gOftkxkBPziU0Tm8lIiD72rXcMMY5M57G9/Bt/mneI=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@@ -1,27 +1,31 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
buildGo126Module,
|
||||
installShellFiles,
|
||||
stdenv,
|
||||
testers,
|
||||
gh,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGo126Module rec {
|
||||
pname = "gh";
|
||||
version = "2.83.2";
|
||||
version = "2.93.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YpbxdD+83pK326EmwLCzUh+wASdOjuCqSP2eXIJndxI=";
|
||||
hash = "sha256-r/+JFdMOUIb32St+VkUw+Q7Lb2L6IiPczmONFE4hwDw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-AkcbtVR1+uYy2AtRl1hvUBBF8vI3hH4NXznmgwmAzmw=";
|
||||
vendorHash = "sha256-eMPcla1XKfq+zBb633Zz4cn820FWuEaRrXQJ1TQ8Lkg=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
# N.B.: using the Makefile is intentional.
|
||||
# We pass "nixpkgs" for build.Date to avoid `gh --version` reporting a very old date.
|
||||
@@ -34,6 +38,8 @@ buildGoModule rec {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 bin/gh -t $out/bin
|
||||
wrapProgram $out/bin/gh \
|
||||
--set-default GH_TELEMETRY false
|
||||
''
|
||||
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installManPage share/man/*/*.[1-9]
|
||||
@@ -63,6 +69,7 @@ buildGoModule rec {
|
||||
maintainers = with lib.maintainers; [
|
||||
mdaniels5757
|
||||
zowoq
|
||||
savtrip
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -42,7 +42,8 @@ rustPlatform.buildRustPackage rec {
|
||||
installShellCompletion --cmd git-absorb \
|
||||
--bash <($out/bin/git-absorb --gen-completions bash) \
|
||||
--fish <($out/bin/git-absorb --gen-completions fish) \
|
||||
--zsh <($out/bin/git-absorb --gen-completions zsh)
|
||||
--zsh <($out/bin/git-absorb --gen-completions zsh) \
|
||||
--nushell <($out/bin/git-absorb --gen-completions nushell)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "18.11.3";
|
||||
version = "18.11.4";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
@@ -21,10 +21,10 @@ let
|
||||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oFQevVXbxu9G4LF3BrC0EUUviypSwB4cKRjipdiO3jU=";
|
||||
hash = "sha256-YQpNsSCjcMC1tpwLVN0fCB9T3vBFxp0TyrvxzJfTnFg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-123WUtoUaPIyDywcTKEhiZP2SYYHxAQoOPyCebsHYRI=";
|
||||
vendorHash = "sha256-/RJnCcmUoqGy08MSGEVM/taV1qZK65kiZw19n6S3ZQ0=";
|
||||
|
||||
ldflags = [
|
||||
"-X ${gitaly_package}/internal/version.version=${version}"
|
||||
|
||||
@@ -11,17 +11,17 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitlab-elasticsearch-indexer";
|
||||
version = "5.14.1";
|
||||
version = "5.14.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-elasticsearch-indexer";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-yYl2cSPY5hn1GSda5ioMD3rEectNMtYGstVpz73pi3Y=";
|
||||
hash = "sha256-1fVBCem23X8u1NQ6ph37EiXRvMpzF/8Yac+VefAe9Yg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-yeVEQEXHGAkdkfcnjok8iOvVRxucObVAxhuACmyFDJw=";
|
||||
vendorHash = "sha256-cUHXrUd+pSMiS6iSwKKA+o1B6ZHbaQYHYPeVk1Y6wYM=";
|
||||
|
||||
buildInputs = [ icu ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitlab-pages";
|
||||
version = "18.11.3";
|
||||
version = "18.11.4";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-pages";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ozkrU3QF/LK0uqfF52dnm2MCga+vRD8dGsLNnze6E+Y=";
|
||||
hash = "sha256-tE2PHWk12S482TjNhI0u7Afm0mPAgJWqcJiU5dgqN60=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-PUW4cgAiM1GTtvja894OZ4pe0SWChf5JsL4/fkns2kI=";
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitlab-runner";
|
||||
version = "18.11.2";
|
||||
version = "18.11.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-runner";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TWpIu6LxFX5ssijlYQA/dmAiPrB0nrHtlS2MWEk6C30=";
|
||||
hash = "sha256-/QMmBDZz6nWmc9hODS3yVe9iyNERbebGysZ1Z4B5Gw8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xEvvYAVIwHwQDd38P2i6GcgFqf8FPnflWh5IEqmWQdE=";
|
||||
@@ -125,6 +125,7 @@ buildGoModule (finalAttrs: {
|
||||
meta = {
|
||||
description = "GitLab Runner the continuous integration executor of GitLab";
|
||||
homepage = "https://docs.gitlab.com/runner";
|
||||
changelog = "https://gitlab.com/gitlab-org/gitlab-runner/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "gitlab-runner";
|
||||
maintainers = with lib.maintainers; [ zimbatm ];
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitlab-shell";
|
||||
version = "14.49.0";
|
||||
version = "14.50.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-shell";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-8PnFRwP5vctnOh6t45crxkoVF6Z03bfYry24KfFHCww=";
|
||||
hash = "sha256-a9s+TCm5yKPjNh+BD9fm6iVA4H9KJiMyWNulY+7BKZo=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
|
||||
./remove-hardcoded-locations.patch
|
||||
];
|
||||
|
||||
vendorHash = "sha256-JBKU134/Yyz49HWfU9Dw/EC4bI/o3Hs56Ou7wtzp5qM=";
|
||||
vendorHash = "sha256-ceSnQQTtGdLb0QGR9fDbGC0NtRPGqkyXJ6b0TRXkjQM=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/gitlab-shell"
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
{
|
||||
"version": "18.11.3",
|
||||
"repo_hash": "sha256-QxaLdWErE+b4SpwHtxnCa2tqheWUfEixRcQwYD/A9s8=",
|
||||
"version": "18.11.4",
|
||||
"repo_hash": "sha256-ThtRXdUreorOIea5Izd+zKb88cC4nhitkzqT+Yf5UtU=",
|
||||
"yarn_hash": "sha256-k8JHi0f/XfSV4kICyPW01Erk3YnKw33yeUWYrOaPdTM=",
|
||||
"frontend_islands_yarn_hash": "sha256-EvGQin+5DqqIgM36jlVkVI49WcJzVvceYnkSS9ybfcY=",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v18.11.3-ee",
|
||||
"rev": "v18.11.4-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "18.11.3",
|
||||
"GITLAB_KAS_VERSION": "18.11.3",
|
||||
"GITLAB_PAGES_VERSION": "18.11.3",
|
||||
"GITLAB_SHELL_VERSION": "14.49.0",
|
||||
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.14.1",
|
||||
"GITLAB_WORKHORSE_VERSION": "18.11.3"
|
||||
"GITALY_SERVER_VERSION": "18.11.4",
|
||||
"GITLAB_KAS_VERSION": "18.11.4",
|
||||
"GITLAB_PAGES_VERSION": "18.11.4",
|
||||
"GITLAB_SHELL_VERSION": "14.50.0",
|
||||
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.14.7",
|
||||
"GITLAB_WORKHORSE_VERSION": "18.11.4"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ in
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "18.11.3";
|
||||
version = "18.11.4";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
|
||||
@@ -765,3 +765,6 @@ gem "gitlab-cloud-connector", "~> 1.45", require: 'gitlab/cloud_connector', feat
|
||||
gem "gvltools", "~> 0.4.0", feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
|
||||
gem 'gitlab_query_language', '~> 0.26.0', feature_category: :integrations
|
||||
|
||||
# standard Gem, version increase to resolve vulnerabilities
|
||||
gem "zlib", "~> 3.2", ">= 3.2.3", feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/work_items/596593
|
||||
|
||||
@@ -2174,6 +2174,7 @@ GEM
|
||||
yard-solargraph (0.1.0)
|
||||
yard (~> 0.9)
|
||||
zeitwerk (2.6.18)
|
||||
zlib (3.2.3)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
@@ -2553,6 +2554,7 @@ DEPENDENCIES
|
||||
yajl-ruby (~> 1.4.3)
|
||||
yard (~> 0.9)
|
||||
zeitwerk (= 2.6.18)
|
||||
zlib (~> 3.2, >= 3.2.3)
|
||||
|
||||
BUNDLED WITH
|
||||
2.7.1
|
||||
|
||||
@@ -10473,4 +10473,14 @@ src: {
|
||||
};
|
||||
version = "2.6.18";
|
||||
};
|
||||
zlib = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "084w64p55s3l2rmbs6x84qbclhi451n8n2limdj1mwrjidlidlsv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.3";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -18,16 +18,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gitoxide";
|
||||
version = "0.45.0";
|
||||
version = "0.54.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GitoxideLabs";
|
||||
repo = "gitoxide";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mMmyFFEVvzI5UmpA10XxnfYZiCg3tizplqFVUND/wQc=";
|
||||
hash = "sha256-MkOmxvACroJAB1nQZT1pcJ/Fn9gWNFwKiwVNb9iUlgY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-JMpNe8jg52wDTJkPy4ZnNcLqjH6K1tXo5SFVPJdITdo=";
|
||||
cargoHash = "sha256-bYgGQa8Gym4dzkuTrOSu3NwUhYdZNtq7ACwVwhdKQRI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@@ -60,7 +60,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
mit # or
|
||||
asl20
|
||||
];
|
||||
maintainers = with lib.maintainers; [ syberant ];
|
||||
maintainers = with lib.maintainers; [ hythera ];
|
||||
# NB: `ein` is also provided by this package, but `nix run
|
||||
# nixpkgs#gitoxide` doesn't work at all without this set.
|
||||
mainProgram = "gix";
|
||||
|
||||
@@ -178,11 +178,11 @@ let
|
||||
|
||||
linux = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "148.0.7778.178";
|
||||
version = "149.0.7827.53";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-3iuKxcuwt/+BIcUqC715hbeRLhUjepNU1GbB3daIokI=";
|
||||
hash = "sha256-iqNNjJy9Wje5jcpJrQYHu/gZptaBwZg0WZzbZTKUmPg=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
@@ -292,11 +292,11 @@ let
|
||||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "148.0.7778.179";
|
||||
version = "149.0.7827.54";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/release2/chrome/adxxii2zvsza6zjfnjbfh6fn4tqq_148.0.7778.179/GoogleChrome-148.0.7778.179.dmg";
|
||||
hash = "sha256-QBHyF222wnaEmI79CQFOXQl5WkRNwneCYd/JFNMEEWU=";
|
||||
url = "http://dl.google.com/release2/chrome/dk75rnebngodpmukle2jjrfx6u_149.0.7827.54/GoogleChrome-149.0.7827.54.dmg";
|
||||
hash = "sha256-O48opD0Ea336/mbs5RFjBITjf8MWOL2BAuf6gX+pnmo=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@@ -39,11 +39,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "haproxy";
|
||||
version = "3.2.9";
|
||||
version = "3.2.19";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-5mDRQbKQGfTRmHhbCDTMPpyW787rgHwv/y/JNb0zVMI=";
|
||||
hash = "sha256-sI671X9XUBLkpetbdychUx+6z2kT/9M08CgXNqGteLY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
makeWrapper,
|
||||
chromium,
|
||||
withChromium ? (lib.meta.availableOn stdenv.hostPlatform chromium),
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
@@ -41,6 +42,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
''
|
||||
);
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -213,5 +213,20 @@ buildGoModule (finalAttrs: {
|
||||
teams = [ lib.teams.lxc ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "incus";
|
||||
knownVulnerabilities = lib.optionals (lib.versions.major finalAttrs.version == "6") [
|
||||
"CVE-2026-35527 (Moderate)"
|
||||
"CVE-2026-40195 (Moderate)"
|
||||
"CVE-2026-40197 (Moderate)"
|
||||
"CVE-2026-40251 (Moderate)"
|
||||
"CVE-2026-41647 (Moderate)"
|
||||
"CVE-2026-41684 (Moderate)"
|
||||
"CVE-2026-41685 (Moderate)"
|
||||
"CVE-2026-40243 (Low)"
|
||||
"CVE-2026-41648 (Low)"
|
||||
''
|
||||
incus-lts v6 is no longer supported in nixpkgs given the unpatched security vulnerabilities.
|
||||
Please upgrade to NixOS 26.05 which includes incus-lts v7 or switch to the incus package.
|
||||
''
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -78,6 +78,26 @@ import ./generic.nix {
|
||||
url = "https://github.com/lxc/incus/commit/5b29ecc164ef28239d2e2a874a7c871a2e419083.patch?full_index=1";
|
||||
hash = "sha256-jpyJYjiZvRw/aOGsykEx8uotRBF7p1q5O08PVhyQtvk=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
name = "incusd-storage_Fix-unsafe-access-to-backup-data.patch";
|
||||
url = "https://github.com/lxc/incus/commit/d71c5053a4c8318e6eb07337a7a4a07a6608ef73.patch?full_index=1";
|
||||
hash = "sha256-/mH0/KmX9sG8HZTcdk8MT+QZtNqZa934wcHptvdVtXM=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
name = "incusd-storage_Guard-nil-ExpiresAt-in-CreateCustomVolumeFromBackup.patch";
|
||||
url = "https://github.com/lxc/incus/commit/ab6b7dff0c770044875d9d26a6254a7075b4d00b.patch?full_index=1";
|
||||
hash = "sha256-d7VUetQzUTBq3GLYM1JKy2KDbBxOW5Lg7Di1/JPNzSE=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
name = "incusd-storage_Guard-nil-fields-in-createDependentVolumesFromBackup.patch";
|
||||
url = "https://github.com/lxc/incus/commit/98e64f0a6fcfdc9676eea0246418d490c53297bf.patch?full_index=1";
|
||||
hash = "sha256-+lB7eHsGZ/dW7aL4/wIWD4AF6t7s4QYfAld1bQOw2tQ=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
name = "incusd-storage-s3_Confine-multipart-uploads-with-os.Root.patch";
|
||||
url = "https://github.com/lxc/incus/commit/a6012422b45c86f3b1956788cff5d75c604ad838.patch?full_index=1";
|
||||
hash = "sha256-u3NLKE8Rh8i6HMbJ0KNhH7gbuwIpJ1SPqiyVoiuw9Sc=";
|
||||
})
|
||||
];
|
||||
nixUpdateExtraArgs = [
|
||||
"--override-filename=pkgs/by-name/in/incus/package.nix"
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "jackett";
|
||||
version = "0.24.1879";
|
||||
version = "0.24.1954";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jackett";
|
||||
repo = "jackett";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gtDN77TB1AKLfqtvFPoQ3tatXB63Ajax2j1gokgHX4s=";
|
||||
hash = "sha256-HuMK8nW0PRBmRYUYAr3h/hDkVhUGgQIj+7v60ChuKRw=";
|
||||
};
|
||||
|
||||
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
diff --git a/build.gradle b/build.gradle
|
||||
index 9ce544a..0c77609 100644
|
||||
index 9ce544a..9445e97 100644
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -79,7 +79,7 @@ task copyLibClang(type: Sync) {
|
||||
"libclang.so.${clang_version}" : "*clang*"
|
||||
@@ -76,7 +76,7 @@ task copyLibClang(type: Sync) {
|
||||
// make sure we only pick up the "real" shared library file from LLVM installation
|
||||
// (e.g. exclude symlinks on Linux)
|
||||
def clang_path_include = (Os.isFamily(Os.FAMILY_UNIX) && !Os.isFamily(Os.FAMILY_MAC)) ?
|
||||
- "libclang.so.${clang_version}" : "*clang*"
|
||||
+ "libclang.so*" : "*clang*"
|
||||
|
||||
from("${libclang_dir}") {
|
||||
- include(clang_path_include)
|
||||
+ include("libclang.so*")
|
||||
include("libLLVM.*")
|
||||
exclude("clang.exe")
|
||||
into("libs")
|
||||
include(clang_path_include)
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "karakeep";
|
||||
version = "0.31.0";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "karakeep-app";
|
||||
repo = "karakeep";
|
||||
tag = "cli/v${finalAttrs.version}";
|
||||
hash = "sha256-++aNTkLOkwgkzRxg/WdrHfchXQwUUir0qqmb7WfdZJ0=";
|
||||
hash = "sha256-P88DQi0T7tmBH7cjs8/Hz77bU0oG7u67XPoLsdePNhI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-+MbKG0h3cD0kZua0OkdQsUeTjAY4ysK41KXUSaOSKHA=";
|
||||
hash = "sha256-aT4JPx3iYw4kw8GHXKWMnelSVT0q2S3PK8DgSCQCyKQ=";
|
||||
};
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
@@ -5,12 +5,6 @@ requirement.
|
||||
---
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -32,7 +32,7 @@
|
||||
"turbo": "^2.1.2"
|
||||
},
|
||||
"prettier": "@karakeep/prettier-config",
|
||||
@@ -40 +40 @@
|
||||
- "packageManager": "pnpm@9.15.9",
|
||||
+ "packageManager": "pnpm",
|
||||
"pnpm": {
|
||||
"patchedDependencies": {
|
||||
"xcode@3.0.1": "patches/xcode@3.0.1.patch"
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "kdlfmt";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hougesen";
|
||||
repo = "kdlfmt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-W4a+pPdQv6/XOS3ps1CBCLuspcSAn7FJuvkA5hesvww=";
|
||||
hash = "sha256-Ftzf4gI7E5tPo8U5ZxUMqlY5+AK5IEUUAll+GsEKYpg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VXg7CVsTuAvXrQNAtzlcJvd24BtS/bQYTGselh4Dzyk=";
|
||||
cargoHash = "sha256-B/ir+Sf4uxQ9Fqmy6yEa3DMt0qdpfPrwD8lhUMOEUbo=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -1,20 +1,19 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libaec";
|
||||
version = "1.1.4";
|
||||
version = "1.1.7";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.dkrz.de";
|
||||
owner = "k202009";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Deutsches-Klimarechenzentrum";
|
||||
repo = "libaec";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MJFx0gErfrSK6EeeGDk8CQWj6j4PVvFPJEI/iys3bI8=";
|
||||
sha256 = "sha256-aBm+CXCq7sdJb6Qq9sNuTzNj0nRwTJI20HsqUg1Qi/8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -24,7 +23,8 @@ stdenv.mkDerivation rec {
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://gitlab.dkrz.de/k202009/libaec";
|
||||
changelog = "https://github.com/Deutsches-Klimarechenzentrum/libaec/blob/v${version}/CHANGELOG.md";
|
||||
homepage = "https://github.com/Deutsches-Klimarechenzentrum/libaec";
|
||||
description = "Adaptive Entropy Coding library";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ tbenst ];
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
autoreconfHook,
|
||||
imlib2,
|
||||
xorg,
|
||||
@@ -22,6 +23,14 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-N0Lfi0d4kjxirEbIjdeearYWvStkKMyV6lgeyNKXcVw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2026-42046.patch";
|
||||
url = "https://github.com/cacalabs/libcaca/commit/fb77acff9ba6bb01d53940da34fb10f20b156a23.patch";
|
||||
hash = "sha256-AdpiE5Gw/CVET//7TTYZCb0glW5HY+T8xZkYs1XCBvY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.0.18";
|
||||
version = "1.0.19";
|
||||
pname = "libde265";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "strukturag";
|
||||
repo = "libde265";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-N6K82ElrzrMSNKfPTDsc5onrxucIJ8niwFgbaEPPd2I=";
|
||||
hash = "sha256-77OIclR2TwOigo/k5ps9S0TrDNvEjf290PqZyqBcydo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libexif";
|
||||
version = "0.6.25";
|
||||
version = "0.6.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libexif";
|
||||
repo = "libexif";
|
||||
rev = "libexif-${builtins.replaceStrings [ "." ] [ "_" ] version}-release";
|
||||
sha256 = "sha256-H8YzfNO2FCrYAwEA4bkOpRdxISK9RXaHVuK8zz70TlM=";
|
||||
sha256 = "sha256-H51RlMT3swWF8oLWu70eTnuumee5mRMSCWkMFX7mJSk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,13 +18,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libredwg";
|
||||
version = "0.13.3";
|
||||
version = "0.13.4.8200";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LibreDWG";
|
||||
repo = "libredwg";
|
||||
tag = version;
|
||||
hash = "sha256-FlBHwNsqVSBE8dTDewoKkCbs8Jd/4d69MPpEFzg6Ruc=";
|
||||
hash = "sha256-HaQvJyuEeaTfuUJbmlV4qcfXiLdHJ2vO4EGInwAKJYk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ let
|
||||
|
||||
pname = "librewolf-bin-unwrapped";
|
||||
|
||||
version = "150.0.2-1";
|
||||
version = "151.0.1-2";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -46,8 +46,8 @@ stdenv.mkDerivation {
|
||||
url = "https://codeberg.org/api/packages/librewolf/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz";
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-KMpSMcLJ/wkySo2gbiECJfH2/hcxdTSLXwKcZLMkvhk=";
|
||||
aarch64-linux = "sha256-Dxs7eRN6nj3e/6pQ3z0d27tnTtD6CefhUxPZGwTVL+Y=";
|
||||
x86_64-linux = "sha256-YqFUKUK4GoP2JAIa3aJqz/iAAmD8hh5UqVzbm4jjvm8=";
|
||||
aarch64-linux = "sha256-TIJEiffEa7X51RGmntCAR7NLP51qcJ08aTvKxVAYNsY=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or throwSystem;
|
||||
};
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"packageVersion": "151.0.1-2",
|
||||
"packageVersion": "151.0.2-1",
|
||||
"source": {
|
||||
"rev": "151.0.1-2",
|
||||
"hash": "sha256-6C048VV6NECGTcdGla4qIa88z677ZTjORf5FM0a4xMM="
|
||||
"rev": "151.0.2-1",
|
||||
"hash": "sha256-Iq6Jf8Cw2AgkI5zehV5TJQBFHCGANtj4e13cy+ANoTo="
|
||||
},
|
||||
"firefox": {
|
||||
"version": "151.0.1",
|
||||
"hash": "sha512-hJKhu5VrODcxU5OL0YsOGOOkrQ0qvCAXtF4CvCdoyPRo1cBjKaMkhaA6Z7ucIhAuar/x5zCAx3dkc11DDcdydw=="
|
||||
"version": "151.0.2",
|
||||
"hash": "sha512-hzCJU+01SieZqaRb5AAzv5/42A+iIPA0qs+9bnVHFpAdQWTDf6VgMsZZslkRZgPguitWbB82UaucwINdUCzXOQ=="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
ninja,
|
||||
pkg-config,
|
||||
@@ -17,17 +18,25 @@
|
||||
withConda ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.7.35";
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "0.7.37";
|
||||
pname = "libsolv";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openSUSE";
|
||||
repo = "libsolv";
|
||||
rev = version;
|
||||
hash = "sha256-DHECjda7s12hSysbaXK2+wM/nXpAOpTn+eSf9XGC3z0=";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-hiumMnTJ3eP+acH2V0eNTM71Fw//IWQPechCA0+kH1s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2026-9149";
|
||||
url = "https://github.com/openSUSE/libsolv/commit/210386037c892a720972ad35a3d8f7073b4d763b.patch";
|
||||
hash = "sha256-ju3xn78UGMR5usq1e1ovFTWnKW1TPDA77sNGx8yc8Z8=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_COMPLEX_DEPS=true"
|
||||
(lib.cmakeBool "ENABLE_CONDA" withConda)
|
||||
@@ -68,4 +77,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
38
pkgs/by-name/li/libssh2/CVE-2026-7598.patch
Normal file
38
pkgs/by-name/li/libssh2/CVE-2026-7598.patch
Normal file
@@ -0,0 +1,38 @@
|
||||
diff --git a/src/userauth.c b/src/userauth.c
|
||||
index f8e02651c4..43d9ab9b9d 100644
|
||||
--- a/src/userauth.c
|
||||
+++ b/src/userauth.c
|
||||
@@ -80,6 +80,12 @@ static char *userauth_list(LIBSSH2_SESSION *session, const char *username,
|
||||
memset(&session->userauth_list_packet_requirev_state, 0,
|
||||
sizeof(session->userauth_list_packet_requirev_state));
|
||||
|
||||
+ if(username_len > UINT32_MAX - 27) {
|
||||
+ _libssh2_error(session, LIBSSH2_ERROR_PROTO,
|
||||
+ "username_len out of bounds");
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
session->userauth_list_data_len = username_len + 27;
|
||||
|
||||
if(session->userauth_list_data) {
|
||||
@@ -316,6 +322,11 @@ userauth_password(LIBSSH2_SESSION *session,
|
||||
* 40 = packet_type(1) + username_len(4) + service_len(4) +
|
||||
* service(14)"ssh-connection" + method_len(4) + method(8)"password" +
|
||||
* chgpwdbool(1) + password_len(4) */
|
||||
+ if(username_len > UINT32_MAX - 40) {
|
||||
+ return _libssh2_error(session, LIBSSH2_ERROR_PROTO,
|
||||
+ "username_len out of bounds");
|
||||
+ }
|
||||
+
|
||||
session->userauth_pswd_data_len = username_len + 40;
|
||||
|
||||
session->userauth_pswd_data0 =
|
||||
@@ -456,7 +467,7 @@ userauth_password(LIBSSH2_SESSION *session,
|
||||
}
|
||||
|
||||
/* basic data_len + newpw_len(4) */
|
||||
- if(username_len + password_len + 44 <= UINT_MAX) {
|
||||
+ if(username_len <= UINT32_MAX - password_len - 44) {
|
||||
session->userauth_pswd_data_len =
|
||||
username_len + password_len + 44;
|
||||
s = session->userauth_pswd_data =
|
||||
@@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-2ex2y+NNuY7sNTn+LImdJrDIN8s+tGalaw8QnKv2WPc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/libssh2/libssh2/commit/256d04b60d80bf1190e96b0ad1e91b2174d744b1
|
||||
./CVE-2026-7598.patch
|
||||
];
|
||||
|
||||
# this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
|
||||
# necessary for FreeBSD code path in configure
|
||||
postPatch = ''
|
||||
|
||||
@@ -26,11 +26,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liferea";
|
||||
version = "1.16.9";
|
||||
version = "1.16.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-c4ySTlAfL1Ebs1+pLZd5KidO3UcF9HKhV/RpGLRSlcY=";
|
||||
hash = "sha256-4cprlrp/vCaoUN4HwZFa+H1DW1S5q/byQcd+g/g427g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,15 +1,17 @@
|
||||
diff --git a/BUILD.gn b/BUILD.gn
|
||||
index d5289b8..598bbbc 100644
|
||||
--- a/BUILD.gn
|
||||
+++ b/BUILD.gn
|
||||
@@ -138,8 +138,8 @@ config("library_impl_config") {
|
||||
@@ -143,8 +143,12 @@
|
||||
# target_defaults and direct_dependent_settings.
|
||||
config("common_inherited_config") {
|
||||
defines = []
|
||||
defines = [ "PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII=0" ]
|
||||
- cflags = []
|
||||
- ldflags = []
|
||||
+ cflags = [ "-fvisibility=default" ]
|
||||
+ ldflags = [ "-lavutil", "-lavformat", "-lavcodec" ]
|
||||
|
||||
if (rtc_dlog_always_on) {
|
||||
defines += [ "DLOG_ALWAYS_ON" ]
|
||||
+
|
||||
+ if (is_linux) {
|
||||
+ ldflags += [ "-Wl,--version-script=" + rebase_path("//libwebrtc.version", root_build_dir) ]
|
||||
+ }
|
||||
|
||||
if (rtc_objc_prefix != "") {
|
||||
defines += [ "RTC_OBJC_TYPE_PREFIX=${rtc_objc_prefix}" ]
|
||||
|
||||
21
pkgs/by-name/li/livekit-libwebrtc/chromium-129-rust.patch
Normal file
21
pkgs/by-name/li/livekit-libwebrtc/chromium-129-rust.patch
Normal file
@@ -0,0 +1,21 @@
|
||||
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
|
||||
index 45086d6838cac..81132ad8ecb31 100644
|
||||
--- a/build/config/compiler/BUILD.gn
|
||||
+++ b/build/config/compiler/BUILD.gn
|
||||
@@ -1727,16 +1727,6 @@ config("runtime_library") {
|
||||
configs += [ "//build/config/c++:runtime_library" ]
|
||||
}
|
||||
|
||||
- # Rust and C++ both provide intrinsics for LLVM to call for math operations. We
|
||||
- # want to use the C++ intrinsics, not the ones in the Rust compiler_builtins
|
||||
- # library. The Rust symbols are marked as weak, so that they can be replaced by
|
||||
- # the C++ symbols. This config ensures the C++ symbols exist and are strong in
|
||||
- # order to cause that replacement to occur by explicitly linking in clang's
|
||||
- # compiler-rt library.
|
||||
- if (is_clang && !is_nacl && !is_cronet_build) {
|
||||
- configs += [ "//build/config/clang:compiler_builtins" ]
|
||||
- }
|
||||
-
|
||||
# TODO(crbug.com/40570904): Come up with a better name for is POSIX + Fuchsia
|
||||
# configuration.
|
||||
if (is_posix || is_fuchsia) {
|
||||
22
pkgs/by-name/li/livekit-libwebrtc/libwebrtc.version
Normal file
22
pkgs/by-name/li/livekit-libwebrtc/libwebrtc.version
Normal file
@@ -0,0 +1,22 @@
|
||||
/* Linker version script for libwebrtc.so (Linux only).
|
||||
*
|
||||
* When libwebrtc.so is built with rtc_use_pipewire=true and
|
||||
* -fvisibility=default, PipeWire lazy-load trampoline stubs (pw_*, spa_*)
|
||||
* are exported as weak symbols. If the PipeWire ALSA plugin
|
||||
* (libasound_module_pcm_pipewire.so) is later dlopen'd by libasound,
|
||||
* the dynamic linker may resolve the plugin's pw_* references through
|
||||
* libwebrtc.so's broken trampolines instead of the real libpipewire.so,
|
||||
* causing a SIGSEGV (NULL function pointer dereference).
|
||||
*
|
||||
* This script hides only those third-party symbol namespaces while
|
||||
* keeping every WebRTC / BoringSSL / internal symbol exported (which
|
||||
* the Rust webrtc-sys bindings require).
|
||||
*/
|
||||
{
|
||||
global:
|
||||
*;
|
||||
|
||||
local:
|
||||
pw_*;
|
||||
spa_*;
|
||||
};
|
||||
@@ -10,7 +10,7 @@
|
||||
libxml2,
|
||||
libxslt,
|
||||
minizip,
|
||||
ffmpeg_6,
|
||||
ffmpeg_8,
|
||||
}:
|
||||
{
|
||||
"brotli" = {
|
||||
@@ -58,7 +58,7 @@
|
||||
path = "third_party/zlib/BUILD.gn";
|
||||
};
|
||||
"ffmpeg" = {
|
||||
package = ffmpeg_6;
|
||||
package = ffmpeg_8;
|
||||
path = "third_party/ffmpeg/BUILD.gn";
|
||||
};
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user