mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-06-07 13:53:42 +00:00
Compare commits
652 Commits
master
...
python-upd
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a916df7c89 | ||
|
|
7b925925a5 | ||
|
|
72e057ef7f | ||
|
|
27e7bd6122 | ||
|
|
08996ffcc0 | ||
|
|
e3484937e9 | ||
|
|
d8b6fe97fe | ||
|
|
61727d1d60 | ||
|
|
ccd892abf0 | ||
|
|
d8055d7eba | ||
|
|
d38ef98cda | ||
|
|
df634ceed9 | ||
|
|
eb3b83f357 | ||
|
|
d3ec3c976f | ||
|
|
e8a86698fb | ||
|
|
62a2015059 | ||
|
|
e09d96cba6 | ||
|
|
3bf49825cb | ||
|
|
05c1067067 | ||
|
|
e4599fe4ce | ||
|
|
e00dc7175e | ||
|
|
b77987ff5c | ||
|
|
9d95ab00dc | ||
|
|
0073ff9cf2 | ||
|
|
f90f7a646a | ||
|
|
aaa1dd2051 | ||
|
|
3c1a2152d0 | ||
|
|
cfc4aab349 | ||
|
|
d8e3c88453 | ||
|
|
1010b88845 | ||
|
|
7add03ebc9 | ||
|
|
3d53e58aad | ||
|
|
a41d6b2f06 | ||
|
|
e936451e58 | ||
|
|
16d1c62a28 | ||
|
|
8d493968f5 | ||
|
|
5bb6e1f605 | ||
|
|
cafee09a90 | ||
|
|
292f1bcbd4 | ||
|
|
9c013026b9 | ||
|
|
b56b7a3671 | ||
|
|
4105de0322 | ||
|
|
7676fdd6ad | ||
|
|
1d5c2a8b87 | ||
|
|
e9bb1dd3f3 | ||
|
|
8fc19d25f3 | ||
|
|
ef431c73be | ||
|
|
4f399b1dae | ||
|
|
d5ff76f1cf | ||
|
|
fe760b16bc | ||
|
|
1aaa1baa60 | ||
|
|
eeaaa9d01b | ||
|
|
b473e8448f | ||
|
|
b9c3d1c0ff | ||
|
|
6c81b30e2c | ||
|
|
b4538c1c7c | ||
|
|
158b6a83f7 | ||
|
|
654d103b12 | ||
|
|
9518afa893 | ||
|
|
4b583d748c | ||
|
|
7b235832bc | ||
|
|
e4c7627d6a | ||
|
|
9e8a6e9c9b | ||
|
|
b44ac20dfb | ||
|
|
4143982e36 | ||
|
|
ea45d1e860 | ||
|
|
2b81f14fb4 | ||
|
|
3c13010a19 | ||
|
|
0d33bcce4e | ||
|
|
065869b1b2 | ||
|
|
3dc26f2e52 | ||
|
|
720b51f802 | ||
|
|
fc149bad32 | ||
|
|
116e9f56cc | ||
|
|
47cb1d0c8e | ||
|
|
e4d45548b4 | ||
|
|
a04da3fde4 | ||
|
|
3ccd026063 | ||
|
|
b7a93ec9e6 | ||
|
|
3043c255b3 | ||
|
|
e03a901005 | ||
|
|
3f544ddd49 | ||
|
|
16c4646621 | ||
|
|
b5c57c52c8 | ||
|
|
604a2a80c0 | ||
|
|
f3964c18d6 | ||
|
|
fb8cdd0dba | ||
|
|
1434d0780e | ||
|
|
8ea0b4f255 | ||
|
|
5a1cd9cc55 | ||
|
|
29184d79fa | ||
|
|
73599831a4 | ||
|
|
db883c3f8e | ||
|
|
6b54753cb1 | ||
|
|
ca7a8d5360 | ||
|
|
bc9158e81e | ||
|
|
404b657905 | ||
|
|
04038fded7 | ||
|
|
0bb3a590b3 | ||
|
|
ca8d5fbb3d | ||
|
|
3ca34d25fc | ||
|
|
a9349934d2 | ||
|
|
c5d5b72238 | ||
|
|
d59d282564 | ||
|
|
95dd19e324 | ||
|
|
83fbf8ebee | ||
|
|
2d6cb39369 | ||
|
|
7bd04c0097 | ||
|
|
5addde923d | ||
|
|
ff4c4962d2 | ||
|
|
a03c2ddc0f | ||
|
|
81d9d52bf7 | ||
|
|
527b102631 | ||
|
|
5d71cbbabe | ||
|
|
b8e8ef2793 | ||
|
|
a9b867c25b | ||
|
|
e59adf7226 | ||
|
|
65a18839e7 | ||
|
|
d7aa737a85 | ||
|
|
a0709bc85f | ||
|
|
39e8a44dd3 | ||
|
|
11c393f1bd | ||
|
|
b4b0de8c25 | ||
|
|
e80b4d990b | ||
|
|
ff97264d45 | ||
|
|
d937cb6e2d | ||
|
|
bffbd23fea | ||
|
|
b35c7a1659 | ||
|
|
ec7194a37a | ||
|
|
c04487ac16 | ||
|
|
01204a518c | ||
|
|
53b29af49e | ||
|
|
ddb28fa0cb | ||
|
|
ed3453c694 | ||
|
|
73b7906d92 | ||
|
|
2372f065ad | ||
|
|
729d33e350 | ||
|
|
d00eb26967 | ||
|
|
a03725a6c6 | ||
|
|
388458978c | ||
|
|
a0d82aa876 | ||
|
|
5aba6aebb6 | ||
|
|
a76a96a085 | ||
|
|
202edcd582 | ||
|
|
7385b5369e | ||
|
|
6c1d92dac9 | ||
|
|
2fb194308f | ||
|
|
adb4fccdc7 | ||
|
|
0b45f19bd6 | ||
|
|
2456ad7686 | ||
|
|
1993df86ee | ||
|
|
278d6500cb | ||
|
|
a3c6651274 | ||
|
|
4285107fe5 | ||
|
|
9ce304657f | ||
|
|
3d3dd88063 | ||
|
|
e64abb9c87 | ||
|
|
342ad3e865 | ||
|
|
26312595da | ||
|
|
6e701ed561 | ||
|
|
8cd7c741b0 | ||
|
|
783dea20a2 | ||
|
|
12f71eff46 | ||
|
|
eda09a0827 | ||
|
|
6f50cf3efa | ||
|
|
a2eb7c909f | ||
|
|
37ff020c2f | ||
|
|
ef96ca88e4 | ||
|
|
6280a651b7 | ||
|
|
cfd6c76775 | ||
|
|
f3275a1555 | ||
|
|
a2e41bb76c | ||
|
|
afcb4734bf | ||
|
|
9e3b121780 | ||
|
|
5d7b849458 | ||
|
|
b84bd317d0 | ||
|
|
3bef031c68 | ||
|
|
35072876b9 | ||
|
|
f50dc660d4 | ||
|
|
ec819f00ba | ||
|
|
94520475ea | ||
|
|
fd4f373715 | ||
|
|
b62d8df99d | ||
|
|
ff2586646f | ||
|
|
c8ec502c8c | ||
|
|
459c74978b | ||
|
|
20c65e5616 | ||
|
|
760ac2002c | ||
|
|
7bbe929cc6 | ||
|
|
6612d42fd7 | ||
|
|
3596c328a9 | ||
|
|
c7a6a52f55 | ||
|
|
8ffb17ff46 | ||
|
|
4e29289792 | ||
|
|
577b46653a | ||
|
|
b814de41e9 | ||
|
|
fea17e2a81 | ||
|
|
3df6346483 | ||
|
|
324582dd86 | ||
|
|
2391366a06 | ||
|
|
400425f0d3 | ||
|
|
b1cbd6ae06 | ||
|
|
fcd03d68c9 | ||
|
|
481208bdff | ||
|
|
0741a14c06 | ||
|
|
70bf138dfe | ||
|
|
c4c64d910d | ||
|
|
a0e1d3b559 | ||
|
|
1bc735714a | ||
|
|
3c6858c436 | ||
|
|
6f04e4e702 | ||
|
|
563bd7dc9a | ||
|
|
ee7865b736 | ||
|
|
057bd4a56c | ||
|
|
e38a2c4175 | ||
|
|
f21fec3871 | ||
|
|
2417edca23 | ||
|
|
a90757c3af | ||
|
|
7630f30ebb | ||
|
|
073fe89510 | ||
|
|
8bde521f6b | ||
|
|
2f5aab8072 | ||
|
|
6ff74b714e | ||
|
|
0bd70de85e | ||
|
|
07e44fb25f | ||
|
|
91518f18f5 | ||
|
|
bd840aa72d | ||
|
|
d28f57cdff | ||
|
|
47ef28e66a | ||
|
|
adeae1c6ff | ||
|
|
160ca6558e | ||
|
|
4a101f0ce8 | ||
|
|
b95ccd5ade | ||
|
|
1a5dbf0996 | ||
|
|
f6b6b9799f | ||
|
|
02d0ef1ce0 | ||
|
|
be1f6a3373 | ||
|
|
c0495d494a | ||
|
|
8d2dbc322b | ||
|
|
1716d7bdb9 | ||
|
|
99ee8ec2db | ||
|
|
dd67d4aa01 | ||
|
|
81d174f747 | ||
|
|
b481729faf | ||
|
|
83ece5c3a1 | ||
|
|
b5ea1ced76 | ||
|
|
b77f6372bd | ||
|
|
eac9e2e2e7 | ||
|
|
62af8f1f8e | ||
|
|
30e1feaf5b | ||
|
|
b5a01befc3 | ||
|
|
f7a6250311 | ||
|
|
5c516d1cc2 | ||
|
|
caf3bd82f0 | ||
|
|
ec681ffc8f | ||
|
|
e698b5cc76 | ||
|
|
3d799a0c8f | ||
|
|
977386e002 | ||
|
|
a471f525f5 | ||
|
|
b2f8d104ab | ||
|
|
2a75446283 | ||
|
|
1c0ff7c776 | ||
|
|
5d6baef1d0 | ||
|
|
e456e5c07f | ||
|
|
017e5f8917 | ||
|
|
cd56efc1ea | ||
|
|
3d5bbecf93 | ||
|
|
13e9f64a65 | ||
|
|
93dff12487 | ||
|
|
51f6d0a44c | ||
|
|
1b231bee0e | ||
|
|
94f850a330 | ||
|
|
503dba3369 | ||
|
|
eeb96138cf | ||
|
|
0079cdc240 | ||
|
|
c898a19e6f | ||
|
|
340e995628 | ||
|
|
61b9864f0a | ||
|
|
a5fb403769 | ||
|
|
eb99a69943 | ||
|
|
ff78dd1e7b | ||
|
|
adbc77087e | ||
|
|
d2a5f7f0ca | ||
|
|
e708eaa2be | ||
|
|
77ab227942 | ||
|
|
e5a050cf5f | ||
|
|
75ab3c83b6 | ||
|
|
a84547aa74 | ||
|
|
d40d2aaddf | ||
|
|
a17a97fe7e | ||
|
|
948ae444f2 | ||
|
|
931eb28b62 | ||
|
|
e65398379c | ||
|
|
3c5b8bbdba | ||
|
|
2c5487ea1b | ||
|
|
bcfd4c65e9 | ||
|
|
9305bbec01 | ||
|
|
37d330411d | ||
|
|
8aead29dd7 | ||
|
|
c0067ed7f1 | ||
|
|
a8643c6277 | ||
|
|
30a78f2925 | ||
|
|
c146bd0855 | ||
|
|
b0f921c994 | ||
|
|
b353c0a0f8 | ||
|
|
5f3abe53c3 | ||
|
|
16d4c544c0 | ||
|
|
128c058fbe | ||
|
|
4878607c11 | ||
|
|
9846aa1e24 | ||
|
|
22645d28ca | ||
|
|
d76fea6479 | ||
|
|
9c70d57566 | ||
|
|
bc17bf4707 | ||
|
|
bb9fb0a2eb | ||
|
|
39d6b81582 | ||
|
|
3dd8c8415d | ||
|
|
ca62933c89 | ||
|
|
9d229c780e | ||
|
|
217e47b25e | ||
|
|
be978ce805 | ||
|
|
e00d6205ee | ||
|
|
86ef4085ab | ||
|
|
db72d619cf | ||
|
|
e4c77a1938 | ||
|
|
1b3320b2d9 | ||
|
|
66adfb9dab | ||
|
|
ce3f5238f0 | ||
|
|
963d350eec | ||
|
|
b039ab1fbc | ||
|
|
b571e1e110 | ||
|
|
40bb25a9e2 | ||
|
|
2c3fd1eeee | ||
|
|
db9ec4692a | ||
|
|
b1310343e6 | ||
|
|
bae9d3752c | ||
|
|
84b1ec46c8 | ||
|
|
ed19f48ea3 | ||
|
|
5084cf5f34 | ||
|
|
578b082cb4 | ||
|
|
a53c6a3897 | ||
|
|
87761ef0f1 | ||
|
|
0c3b177d31 | ||
|
|
07905f823e | ||
|
|
c8983be99d | ||
|
|
8e470ec7e1 | ||
|
|
ace84983c4 | ||
|
|
1f09b80385 | ||
|
|
6a792a71bf | ||
|
|
2fe5055395 | ||
|
|
fe58890ad0 | ||
|
|
b96e407672 | ||
|
|
f36a4ec94b | ||
|
|
6404ef005b | ||
|
|
aac6f377a0 | ||
|
|
fb1fdb4992 | ||
|
|
e9b7cf2133 | ||
|
|
9251797ce5 | ||
|
|
5423b34576 | ||
|
|
8961042e84 | ||
|
|
52afc5fa58 | ||
|
|
df3fec7639 | ||
|
|
0c98395be2 | ||
|
|
026e06d881 | ||
|
|
e79630333e | ||
|
|
d95537ccb5 | ||
|
|
18524bc0e1 | ||
|
|
5dc0e319f9 | ||
|
|
1245f97300 | ||
|
|
199460a31b | ||
|
|
6481565e50 | ||
|
|
470b4097c3 | ||
|
|
71f929daa0 | ||
|
|
bedc0b9a8e | ||
|
|
e0cac2e814 | ||
|
|
db738de1ef | ||
|
|
4d80938179 | ||
|
|
ba2df560b6 | ||
|
|
1e642406fb | ||
|
|
edb6bba7ba | ||
|
|
7aa8fe7238 | ||
|
|
2318abaa0b | ||
|
|
cdd93936e4 | ||
|
|
9ff1583136 | ||
|
|
74aedbf137 | ||
|
|
c1d20030a6 | ||
|
|
8a73709324 | ||
|
|
1355d225b6 | ||
|
|
83594b9031 | ||
|
|
b5ece28d47 | ||
|
|
8aa7c75b47 | ||
|
|
153a3b2f55 | ||
|
|
7096ab788f | ||
|
|
bce93d9b7f | ||
|
|
c0f94ebd66 | ||
|
|
eaff4a2799 | ||
|
|
93991aecc6 | ||
|
|
3c93dce979 | ||
|
|
58055f0e1b | ||
|
|
70d339f357 | ||
|
|
78f51bc5bc | ||
|
|
c4b9cbf9c2 | ||
|
|
f39c427320 | ||
|
|
2658a75f9b | ||
|
|
b78a27fcb0 | ||
|
|
0d82881a6a | ||
|
|
4a8e8392a4 | ||
|
|
3ca5f391be | ||
|
|
1eee517037 | ||
|
|
b54e4a6c05 | ||
|
|
e11a56768f | ||
|
|
8e788a4315 | ||
|
|
28dd6b9df1 | ||
|
|
a74e4f1c48 | ||
|
|
f25f9861cd | ||
|
|
d9fa10a7c3 | ||
|
|
ce52fbf057 | ||
|
|
fb0f146a68 | ||
|
|
789f939dcb | ||
|
|
acfa851ea8 | ||
|
|
736f893b3d | ||
|
|
0ddb2c508c | ||
|
|
a0ee897044 | ||
|
|
fea908fde9 | ||
|
|
030523c9b8 | ||
|
|
963f597bc3 | ||
|
|
14b995ab3a | ||
|
|
db34c90d52 | ||
|
|
98b4a0dd74 | ||
|
|
19dc45ca66 | ||
|
|
bbad6942e5 | ||
|
|
f6172a101f | ||
|
|
85c7278348 | ||
|
|
b2214d36ec | ||
|
|
d6937f6ae7 | ||
|
|
85e94b2f06 | ||
|
|
111b00907e | ||
|
|
8a93a5d60f | ||
|
|
facfd506e2 | ||
|
|
40bea35ab9 | ||
|
|
516deee1c1 | ||
|
|
a81408d15c | ||
|
|
127450a4fc | ||
|
|
976af9cac6 | ||
|
|
7a1aca1601 | ||
|
|
4c232cc266 | ||
|
|
03761fb93a | ||
|
|
b850d4728a | ||
|
|
68030807a1 | ||
|
|
857fccfb37 | ||
|
|
362d374daf | ||
|
|
a90fc62793 | ||
|
|
11e1634997 | ||
|
|
0d5d9a5129 | ||
|
|
6575bc0242 | ||
|
|
4c124e96a8 | ||
|
|
ca6d6d5817 | ||
|
|
ad15de5dbd | ||
|
|
3ea2eff071 | ||
|
|
89251e8199 | ||
|
|
10bb94fb92 | ||
|
|
63d7cdac01 | ||
|
|
5663b16973 | ||
|
|
033d41e2e5 | ||
|
|
171926f883 | ||
|
|
329b59d07d | ||
|
|
555679dce0 | ||
|
|
c7c2309c84 | ||
|
|
e7c432489f | ||
|
|
b57ce3da32 | ||
|
|
5ace9a580a | ||
|
|
4e8be57041 | ||
|
|
f590b9073a | ||
|
|
52a17d7994 | ||
|
|
097b8a0ef0 | ||
|
|
01e4dac6b3 | ||
|
|
f6308ed8d8 | ||
|
|
65c17bdbe0 | ||
|
|
e32227d764 | ||
|
|
69e1440389 | ||
|
|
08a50cd5bf | ||
|
|
9ac429d201 | ||
|
|
96c4cc3ed0 | ||
|
|
53cf53f325 | ||
|
|
7ff61b993c | ||
|
|
81f99d0950 | ||
|
|
32d627d3ec | ||
|
|
c8a15a9b70 | ||
|
|
7ed3aaf7d1 | ||
|
|
cf485ae973 | ||
|
|
92473b6b22 | ||
|
|
20ddeb9aec | ||
|
|
060365b716 | ||
|
|
78bcf97feb | ||
|
|
fd8778e01f | ||
|
|
c943c9fcaa | ||
|
|
a7daddef5b | ||
|
|
757acf21b8 | ||
|
|
0b1741a3bf | ||
|
|
5e438cd865 | ||
|
|
997d0d965a | ||
|
|
bb0b78e03c | ||
|
|
c30663ac35 | ||
|
|
a0bfe88698 | ||
|
|
f50c15cdec | ||
|
|
d8be957ee6 | ||
|
|
8e730cb760 | ||
|
|
b7da8e825d | ||
|
|
2cbff54512 | ||
|
|
dbe5bc6b9b | ||
|
|
a14b8f95cc | ||
|
|
fbe8954313 | ||
|
|
61b63e8b5a | ||
|
|
8edd789084 | ||
|
|
fad1bd870d | ||
|
|
5925bc2814 | ||
|
|
3b9aea2467 | ||
|
|
f2616dece0 | ||
|
|
ea3998dd43 | ||
|
|
b0cff5e20f | ||
|
|
bbfc13f3fe | ||
|
|
c832986da6 | ||
|
|
e494c9581f | ||
|
|
8924c245e7 | ||
|
|
de214862bb | ||
|
|
f86d7dfdee | ||
|
|
353dd30c46 | ||
|
|
c2b36e9c51 | ||
|
|
b3147b179a | ||
|
|
6c0ee88732 | ||
|
|
eb35d7b10b | ||
|
|
c607e6b765 | ||
|
|
2b8ed1fe21 | ||
|
|
1cbc55c0aa | ||
|
|
5198c49a5a | ||
|
|
037d37f1c2 | ||
|
|
b2e8b0c602 | ||
|
|
7f86fc0805 | ||
|
|
37cad8f4e3 | ||
|
|
6b3f846515 | ||
|
|
59edd93aa9 | ||
|
|
1860b778a5 | ||
|
|
2ebfb968a8 | ||
|
|
00cd8e646c | ||
|
|
ac65a7e592 | ||
|
|
ef4c55c372 | ||
|
|
438e9657d0 | ||
|
|
b9c225f730 | ||
|
|
c313740449 | ||
|
|
46ddcd22da | ||
|
|
18366e70a8 | ||
|
|
fe1ca2c575 | ||
|
|
3803be5263 | ||
|
|
eb68fe007d | ||
|
|
9bca079625 | ||
|
|
d2a5a9c051 | ||
|
|
aed6125c35 | ||
|
|
f58e9393ed | ||
|
|
b78dd5d217 | ||
|
|
662aab8cd3 | ||
|
|
39e6088d45 | ||
|
|
4ed3b8cbf6 | ||
|
|
9dfd86f788 | ||
|
|
778a572c94 | ||
|
|
e1db70ea0b | ||
|
|
384c44e341 | ||
|
|
194e729c3a | ||
|
|
04928a6180 | ||
|
|
32f67f000b | ||
|
|
d3d27dcd8c | ||
|
|
c8a10555ad | ||
|
|
5e1b98759e | ||
|
|
85e02aa77c | ||
|
|
787d140ba2 | ||
|
|
dab7de05a9 | ||
|
|
3ba0bab909 | ||
|
|
50ff08747b | ||
|
|
a7d3ea5470 | ||
|
|
3b60bf2f1a | ||
|
|
91fdc48f20 | ||
|
|
6cf5d0644f | ||
|
|
da140d2dca | ||
|
|
8942d5b6f4 | ||
|
|
4cdf41c344 | ||
|
|
d37588dfa3 | ||
|
|
02d2fdd686 | ||
|
|
7a36cf26ec | ||
|
|
9fafdc761f | ||
|
|
92e74fa5c2 | ||
|
|
1b5c3778e5 | ||
|
|
5f6d7f2e26 | ||
|
|
aa90f52c51 | ||
|
|
2bb9b3d166 | ||
|
|
dd91387877 | ||
|
|
b90c84b5cb | ||
|
|
f21faaf8ab | ||
|
|
49cc946faf | ||
|
|
a6a281823a | ||
|
|
957d744345 | ||
|
|
8a07895dc2 | ||
|
|
6517fae64e | ||
|
|
04d4126705 | ||
|
|
0571f521a8 | ||
|
|
9ced5a330a | ||
|
|
1ea118f2b0 | ||
|
|
4791df2472 | ||
|
|
9eb073dafa | ||
|
|
08521f3b58 | ||
|
|
dd134e69e6 | ||
|
|
16ed2d7344 | ||
|
|
19df48b95a | ||
|
|
230567bf2b | ||
|
|
eeb1649a2f | ||
|
|
09bb0b6ec4 | ||
|
|
7e8258d3af | ||
|
|
1ba36147a8 | ||
|
|
324f837bf1 | ||
|
|
6014579a95 | ||
|
|
b926d50aaf | ||
|
|
efdf5458bd | ||
|
|
21622bac70 | ||
|
|
63147b12a5 | ||
|
|
c74cade494 | ||
|
|
1665623390 | ||
|
|
0bfe3de9ed | ||
|
|
feb7c9ff78 | ||
|
|
f0847890f4 | ||
|
|
fc513d020b | ||
|
|
b0af552236 | ||
|
|
7bd3d8daf2 | ||
|
|
57cd8cc8a3 | ||
|
|
2ba029a78e | ||
|
|
a0329b88ae | ||
|
|
9dbaf2b09f | ||
|
|
75eb347675 | ||
|
|
4f72341536 | ||
|
|
4ec33b014e | ||
|
|
95f82fa6e7 | ||
|
|
40041739c7 | ||
|
|
2b8ae0a0f1 | ||
|
|
e7d1fca56e | ||
|
|
623ec633ba | ||
|
|
8b7658bfa5 | ||
|
|
216e73bd0f | ||
|
|
63ac700b30 | ||
|
|
f6da919839 | ||
|
|
23c46c60c0 | ||
|
|
b6254c48df | ||
|
|
9088b3d167 | ||
|
|
f33cf3c09e | ||
|
|
c4831d5909 | ||
|
|
470cbe3d39 |
@@ -78,16 +78,13 @@ rec {
|
|||||||
{
|
{
|
||||||
preferLocalBuild = true;
|
preferLocalBuild = true;
|
||||||
allowSubstitutes = false;
|
allowSubstitutes = false;
|
||||||
# unit.text can be null. But variables that are null listed in
|
text = unit.text or "";
|
||||||
# passAsFile are ignored by nix, resulting in no file being created,
|
__structuredAttrs = true;
|
||||||
# making the mv operation fail.
|
|
||||||
text = optionalString (unit.text != null) unit.text;
|
|
||||||
passAsFile = [ "text" ];
|
|
||||||
}
|
}
|
||||||
''
|
''
|
||||||
name=${shellEscape name}
|
name=${shellEscape name}
|
||||||
mkdir -p "$out/$(dirname -- "$name")"
|
mkdir -p "$out/$(dirname -- "$name")"
|
||||||
mv "$textPath" "$out/$name"
|
printf "%s" "$text" > "$out/$name"
|
||||||
''
|
''
|
||||||
else
|
else
|
||||||
pkgs.runCommand "unit-${mkPathSafeName name}-disabled"
|
pkgs.runCommand "unit-${mkPathSafeName name}-disabled"
|
||||||
|
|||||||
@@ -505,7 +505,7 @@ EOF
|
|||||||
# This should work for single and multi-device systems.
|
# This should work for single and multi-device systems.
|
||||||
# still needs subvolume support
|
# still needs subvolume support
|
||||||
if ($fsType eq "bcachefs") {
|
if ($fsType eq "bcachefs") {
|
||||||
my ($status, @info) = runCommand("bcachefs fs usage $rootDir$mountPoint");
|
my ($status, @info) = runCommand("@bcachefs@ fs usage $rootDir$mountPoint");
|
||||||
my $UUID = $info[0];
|
my $UUID = $info[0];
|
||||||
|
|
||||||
if ($status == 0 && $UUID =~ /^Filesystem:[ \t\n]*([0-9a-z-]+)/) {
|
if ($status == 0 && $UUID =~ /^Filesystem:[ \t\n]*([0-9a-z-]+)/) {
|
||||||
|
|||||||
@@ -30,15 +30,20 @@ let
|
|||||||
name = "nixos-generate-config";
|
name = "nixos-generate-config";
|
||||||
src = ./nixos-generate-config.pl;
|
src = ./nixos-generate-config.pl;
|
||||||
replacements = {
|
replacements = {
|
||||||
perl = "${
|
perl = lib.getExe (
|
||||||
pkgs.perl.withPackages (p: [
|
pkgs.perl.withPackages (p: [
|
||||||
p.FileSlurp
|
p.FileSlurp
|
||||||
p.ConfigIniFiles
|
p.ConfigIniFiles
|
||||||
])
|
])
|
||||||
}/bin/perl";
|
);
|
||||||
hostPlatformSystem = pkgs.stdenv.hostPlatform.system;
|
hostPlatformSystem = pkgs.stdenv.hostPlatform.system;
|
||||||
detectvirt = "${config.systemd.package}/bin/systemd-detect-virt";
|
detectvirt = lib.getExe' config.systemd.package "systemd-detect-virt";
|
||||||
btrfs = "${pkgs.btrfs-progs}/bin/btrfs";
|
bcachefs =
|
||||||
|
if pkgs.bcachefs-tools.meta.broken then
|
||||||
|
lib.getExe' pkgs.coreutils "false"
|
||||||
|
else
|
||||||
|
lib.getExe pkgs.bcachefs-tools;
|
||||||
|
btrfs = lib.getExe pkgs.btrfs-progs;
|
||||||
inherit (config.system.nixos-generate-config) configuration desktopConfiguration flake;
|
inherit (config.system.nixos-generate-config) configuration desktopConfiguration flake;
|
||||||
xserverEnabled = config.services.xserver.enable;
|
xserverEnabled = config.services.xserver.enable;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -21,11 +21,11 @@ assert withConplay -> !libOnly;
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "${lib.optionalString libOnly "lib"}mpg123";
|
pname = "${lib.optionalString libOnly "lib"}mpg123";
|
||||||
version = "1.33.4";
|
version = "1.33.5";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/mpg123/mpg123-${finalAttrs.version}.tar.bz2";
|
url = "mirror://sourceforge/mpg123/mpg123-${finalAttrs.version}.tar.bz2";
|
||||||
hash = "sha256-OujJ/4Cpe/wOIuifvNdGh+yk/B2zFbEmB/J/ActaR9k=";
|
hash = "sha256-DX68jaCv88o4PIxrWmrb5ALuW7JWaFuMVJnzpzn51t0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
stdenv,
|
stdenv,
|
||||||
}:
|
}:
|
||||||
rec {
|
rec {
|
||||||
version = "9.2.0389";
|
version = "9.2.0541";
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
@@ -15,7 +15,7 @@ rec {
|
|||||||
owner = "vim";
|
owner = "vim";
|
||||||
repo = "vim";
|
repo = "vim";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-shhdJn1bPJ/68a54UZMn1fla7P4tjVUN4DGLbx3ohOg=";
|
hash = "sha256-M2vdIAM3P2MZdcMvFX/3/fixliTosR06nvPIX7NXFNo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchpatch,
|
|
||||||
fetchurl,
|
fetchurl,
|
||||||
updateAutotoolsGnuConfigScriptsHook,
|
updateAutotoolsGnuConfigScriptsHook,
|
||||||
perl,
|
perl,
|
||||||
|
python3,
|
||||||
libiconv,
|
libiconv,
|
||||||
zlib,
|
zlib,
|
||||||
popt,
|
popt,
|
||||||
@@ -23,23 +23,17 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "rsync";
|
pname = "rsync";
|
||||||
version = "3.4.1";
|
version = "3.4.3";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
# signed with key 9FEF 112D CE19 A0DC 7E88 2CB8 1BB2 4997 A853 5F6F
|
# signed with key 9FEF 112D CE19 A0DC 7E88 2CB8 1BB2 4997 A853 5F6F
|
||||||
url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
|
url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
|
||||||
hash = "sha256-KSS8s6Hti1UfwQH3QLnw/gogKxFQJ2R89phQ1l/YjFI=";
|
hash = "sha256-xy5jyjAhy8gLqG7DAQJ3P0xWMfvEkrUudzs5WPgqU9M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
preBuild = ''
|
||||||
# See: <https://github.com/RsyncProject/rsync/pull/790>
|
patchShebangs ./runtests.py
|
||||||
./fix-tests-in-darwin-sandbox.patch
|
'';
|
||||||
# fix compilation with gcc15
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/RsyncProject/rsync/commit/a4b926dcdce96b0f2cc0dc7744e95747b233500a.patch";
|
|
||||||
hash = "sha256-UiEQJ+p2gtIDYNJqnxx4qKgItKIZzCpkHnvsgoxBmSE=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
updateAutotoolsGnuConfigScriptsHook
|
updateAutotoolsGnuConfigScriptsHook
|
||||||
@@ -80,6 +74,15 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
passthru.tests = { inherit (nixosTests) rsyncd; };
|
passthru.tests = { inherit (nixosTests) rsyncd; };
|
||||||
|
|
||||||
|
nativeCheckInputs = [
|
||||||
|
python3
|
||||||
|
];
|
||||||
|
|
||||||
|
# Test fails when built in a chroot store
|
||||||
|
preCheck = ''
|
||||||
|
rm testsuite/chgrp.test
|
||||||
|
'';
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
__darwinAllowLocalNetworking = true;
|
__darwinAllowLocalNetworking = true;
|
||||||
|
|||||||
@@ -1,56 +0,0 @@
|
|||||||
From 9b104ed9859f17b6ed4c4ad01806c75a0c197dd7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Emily <hello@emily.moe>
|
|
||||||
Date: Tue, 5 Aug 2025 15:55:24 +0100
|
|
||||||
Subject: [PATCH] Allow `ls(1)` to fail in test setup
|
|
||||||
|
|
||||||
This can happen when the tests are unable to `stat(2)` some files in
|
|
||||||
`/etc`, `/bin`, or `/`, due to Unix permissions or other sandboxing. We
|
|
||||||
still guard against serious errors, which use exit code 2.
|
|
||||||
---
|
|
||||||
testsuite/longdir.test | 4 ++--
|
|
||||||
testsuite/rsync.fns | 8 ++++----
|
|
||||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/testsuite/longdir.test b/testsuite/longdir.test
|
|
||||||
index 8d66bb5f..26747292 100644
|
|
||||||
--- a/testsuite/longdir.test
|
|
||||||
+++ b/testsuite/longdir.test
|
|
||||||
@@ -16,9 +16,9 @@ makepath "$longdir" || test_skipped "unable to create long directory"
|
|
||||||
touch "$longdir/1" || test_skipped "unable to create files in long directory"
|
|
||||||
date > "$longdir/1"
|
|
||||||
if [ -r /etc ]; then
|
|
||||||
- ls -la /etc >"$longdir/2"
|
|
||||||
+ ls -la /etc >"$longdir/2" || [ $? -eq 1 ]
|
|
||||||
else
|
|
||||||
- ls -la / >"$longdir/2"
|
|
||||||
+ ls -la / >"$longdir/2" || [ $? -eq 1 ]
|
|
||||||
fi
|
|
||||||
checkit "$RSYNC --delete -avH '$fromdir/' '$todir'" "$fromdir/" "$todir"
|
|
||||||
|
|
||||||
diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
|
|
||||||
index 2ab97b69..f7da363f 100644
|
|
||||||
--- a/testsuite/rsync.fns
|
|
||||||
+++ b/testsuite/rsync.fns
|
|
||||||
@@ -195,15 +195,15 @@ hands_setup() {
|
|
||||||
echo some data > "$fromdir/dir/subdir/foobar.baz"
|
|
||||||
mkdir "$fromdir/dir/subdir/subsubdir"
|
|
||||||
if [ -r /etc ]; then
|
|
||||||
- ls -ltr /etc > "$fromdir/dir/subdir/subsubdir/etc-ltr-list"
|
|
||||||
+ ls -ltr /etc > "$fromdir/dir/subdir/subsubdir/etc-ltr-list" || [ $? -eq 1 ]
|
|
||||||
else
|
|
||||||
- ls -ltr / > "$fromdir/dir/subdir/subsubdir/etc-ltr-list"
|
|
||||||
+ ls -ltr / > "$fromdir/dir/subdir/subsubdir/etc-ltr-list" || [ $? -eq 1 ]
|
|
||||||
fi
|
|
||||||
mkdir "$fromdir/dir/subdir/subsubdir2"
|
|
||||||
if [ -r /bin ]; then
|
|
||||||
- ls -lt /bin > "$fromdir/dir/subdir/subsubdir2/bin-lt-list"
|
|
||||||
+ ls -lt /bin > "$fromdir/dir/subdir/subsubdir2/bin-lt-list" || [ $? -eq 1 ]
|
|
||||||
else
|
|
||||||
- ls -lt / > "$fromdir/dir/subdir/subsubdir2/bin-lt-list"
|
|
||||||
+ ls -lt / > "$fromdir/dir/subdir/subsubdir2/bin-lt-list" || [ $? -eq 1 ]
|
|
||||||
fi
|
|
||||||
|
|
||||||
# echo testing head:
|
|
||||||
--
|
|
||||||
2.50.1
|
|
||||||
|
|
||||||
@@ -60,7 +60,8 @@ do
|
|||||||
if
|
if
|
||||||
PATH=$_PATH type -p "@targetPrefix@${cmd}" > /dev/null
|
PATH=$_PATH type -p "@targetPrefix@${cmd}" > /dev/null
|
||||||
then
|
then
|
||||||
export "${cmd^^}${role_post}=@targetPrefix@${cmd}";
|
upper_case="$(echo "$cmd" | tr "a-z" "A-Z")"
|
||||||
|
export "${upper_case}${role_post}=@targetPrefix@${cmd}";
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ in
|
|||||||
pkg-config,
|
pkg-config,
|
||||||
pkgsCross, # wasm32 rlbox
|
pkgsCross, # wasm32 rlbox
|
||||||
python3,
|
python3,
|
||||||
|
python313,
|
||||||
runCommand,
|
runCommand,
|
||||||
rustc,
|
rustc,
|
||||||
rust-cbindgen,
|
rust-cbindgen,
|
||||||
@@ -364,7 +365,7 @@ buildStdenv.mkDerivation {
|
|||||||
makeBinaryWrapper
|
makeBinaryWrapper
|
||||||
nodejs
|
nodejs
|
||||||
perl
|
perl
|
||||||
python3
|
(if lib.versionAtLeast version "143.0" then python3 else python313)
|
||||||
rust-cbindgen
|
rust-cbindgen
|
||||||
rustPlatform.bindgenHook
|
rustPlatform.bindgenHook
|
||||||
rustc
|
rustc
|
||||||
|
|||||||
@@ -36,6 +36,6 @@ elif [[ $0 != *cpp ]]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "@darwinMinVersion@" ]]; then
|
if [[ "@darwinMinVersion@" ]] && [ "@isFlang@" != 1 ]; then
|
||||||
extraBefore+=(-Werror=unguarded-availability)
|
extraBefore+=(-Werror=unguarded-availability)
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ var_templates_list=(
|
|||||||
NIX_CXXSTDLIB_COMPILE
|
NIX_CXXSTDLIB_COMPILE
|
||||||
NIX_CXXSTDLIB_LINK
|
NIX_CXXSTDLIB_LINK
|
||||||
NIX_GNATFLAGS_COMPILE
|
NIX_GNATFLAGS_COMPILE
|
||||||
|
NIX_FFLAGS_COMPILE
|
||||||
|
NIX_FFLAGS_COMPILE_BEFORE
|
||||||
)
|
)
|
||||||
var_templates_bool=(
|
var_templates_bool=(
|
||||||
NIX_ENFORCE_NO_NATIVE
|
NIX_ENFORCE_NO_NATIVE
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ while (( "$n" < "$nParams" )); do
|
|||||||
|
|
||||||
case "$p" in
|
case "$p" in
|
||||||
-[cSEM] | -MM) dontLink=1 ;;
|
-[cSEM] | -MM) dontLink=1 ;;
|
||||||
-cc1) cc1=1 ;;
|
-cc1 | -fc1 ) cc1=1 ;;
|
||||||
-nostdinc) cInclude=0 cxxInclude=0 ;;
|
-nostdinc) cInclude=0 cxxInclude=0 ;;
|
||||||
-nostdinc++) cxxInclude=0 ;;
|
-nostdinc++) cxxInclude=0 ;;
|
||||||
-nostdlib) cxxLibrary=0 ;;
|
-nostdlib) cxxLibrary=0 ;;
|
||||||
@@ -185,9 +185,19 @@ fi
|
|||||||
|
|
||||||
source @out@/nix-support/add-hardening.sh
|
source @out@/nix-support/add-hardening.sh
|
||||||
|
|
||||||
# Add the flags for the C compiler proper.
|
# Add the flags for the compiler proper. Flang reads its user-supplied
|
||||||
extraAfter=(${hardeningCFlagsAfter[@]+"${hardeningCFlagsAfter[@]}"} $NIX_CFLAGS_COMPILE_@suffixSalt@)
|
# flags from the Fortran-specific NIX_FFLAGS_COMPILE channel so that
|
||||||
extraBefore=(${hardeningCFlagsBefore[@]+"${hardeningCFlagsBefore[@]}"} $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@)
|
# C-only flags injected by setup hooks (e.g. -frandom-seed= from
|
||||||
|
# reproducible-builds.sh, which Flang does not accept) never reach the
|
||||||
|
# Fortran driver. This mirrors the NIX_GNATFLAGS_COMPILE channel that
|
||||||
|
# the Ada/GNAT wrapper uses for the same reason.
|
||||||
|
if [ "@isFlang@" = 1 ]; then
|
||||||
|
extraAfter=(${hardeningCFlagsAfter[@]+"${hardeningCFlagsAfter[@]}"} $NIX_FFLAGS_COMPILE_@suffixSalt@)
|
||||||
|
extraBefore=(${hardeningCFlagsBefore[@]+"${hardeningCFlagsBefore[@]}"} $NIX_FFLAGS_COMPILE_BEFORE_@suffixSalt@)
|
||||||
|
else
|
||||||
|
extraAfter=(${hardeningCFlagsAfter[@]+"${hardeningCFlagsAfter[@]}"} $NIX_CFLAGS_COMPILE_@suffixSalt@)
|
||||||
|
extraBefore=(${hardeningCFlagsBefore[@]+"${hardeningCFlagsBefore[@]}"} $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@)
|
||||||
|
fi
|
||||||
|
|
||||||
if [ "$dontLink" != 1 ]; then
|
if [ "$dontLink" != 1 ]; then
|
||||||
linkType=$(checkLinkType $NIX_LDFLAGS_BEFORE_@suffixSalt@ "${params[@]}" ${NIX_CFLAGS_LINK_@suffixSalt@:-} $NIX_LDFLAGS_@suffixSalt@)
|
linkType=$(checkLinkType $NIX_LDFLAGS_BEFORE_@suffixSalt@ "${params[@]}" ${NIX_CFLAGS_LINK_@suffixSalt@:-} $NIX_LDFLAGS_@suffixSalt@)
|
||||||
|
|||||||
@@ -26,6 +26,8 @@
|
|||||||
nixSupport ? { },
|
nixSupport ? { },
|
||||||
isGNU ? false,
|
isGNU ? false,
|
||||||
isClang ? cc.isClang or false,
|
isClang ? cc.isClang or false,
|
||||||
|
isFlang ? cc.isFlang or false,
|
||||||
|
isAlireGNAT ? false,
|
||||||
isZig ? cc.isZig or false,
|
isZig ? cc.isZig or false,
|
||||||
isArocc ? cc.isArocc or false,
|
isArocc ? cc.isArocc or false,
|
||||||
isCcache ? cc.isCcache or false,
|
isCcache ? cc.isCcache or false,
|
||||||
@@ -387,7 +389,9 @@ let
|
|||||||
#
|
#
|
||||||
# TODO: Drop `mangle-NIX_STORE-in-__FILE__.patch` from GCC and make
|
# TODO: Drop `mangle-NIX_STORE-in-__FILE__.patch` from GCC and make
|
||||||
# this unconditional once the upstream bug is fixed.
|
# this unconditional once the upstream bug is fixed.
|
||||||
useMacroPrefixMap = !isGNU;
|
useMacroPrefixMap = !isGNU && !isFlang;
|
||||||
|
systemIncludeFlag = if isFlang || isArocc then "-I" else "-idirafter";
|
||||||
|
fortifyIncludeFlag = if isFlang then "-I" else "-isystem";
|
||||||
in
|
in
|
||||||
|
|
||||||
assert includeFortifyHeaders' -> fortify-headers != null;
|
assert includeFortifyHeaders' -> fortify-headers != null;
|
||||||
@@ -574,10 +578,18 @@ stdenvNoCC.mkDerivation {
|
|||||||
''
|
''
|
||||||
|
|
||||||
+ optionalString cc.langFortran or false ''
|
+ optionalString cc.langFortran or false ''
|
||||||
wrap ${targetPrefix}gfortran $wrapper $ccPath/${targetPrefix}gfortran
|
if [ -e $ccPath/${targetPrefix}gfortran ]; then
|
||||||
ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}g77
|
wrap ${targetPrefix}gfortran $wrapper $ccPath/${targetPrefix}gfortran
|
||||||
ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}f77
|
ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}g77
|
||||||
export named_fc=${targetPrefix}gfortran
|
ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}f77
|
||||||
|
export named_fc=${targetPrefix}gfortran
|
||||||
|
elif [ -e $ccPath/${targetPrefix}flang ]; then
|
||||||
|
wrap ${targetPrefix}flang $wrapper $ccPath/${targetPrefix}flang
|
||||||
|
export named_fc=${targetPrefix}flang
|
||||||
|
elif [ -e $ccPath/flang ]; then
|
||||||
|
wrap ${targetPrefix}flang $wrapper $ccPath/flang
|
||||||
|
export named_fc=${targetPrefix}flang
|
||||||
|
fi
|
||||||
''
|
''
|
||||||
|
|
||||||
+ optionalString cc.langGo or false ''
|
+ optionalString cc.langGo or false ''
|
||||||
@@ -709,13 +721,11 @@ stdenvNoCC.mkDerivation {
|
|||||||
touch "$out/nix-support/libc-cflags"
|
touch "$out/nix-support/libc-cflags"
|
||||||
touch "$out/nix-support/libc-ldflags"
|
touch "$out/nix-support/libc-ldflags"
|
||||||
''
|
''
|
||||||
+ optionalString (!isArocc) ''
|
+ optionalString (!isArocc && !(isAlireGNAT && targetPlatform.isDarwin)) ''
|
||||||
echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-crt1-cflags
|
echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-crt1-cflags
|
||||||
''
|
''
|
||||||
+ ''
|
+ ''
|
||||||
include "-${
|
include "${systemIncludeFlag}" "${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags
|
||||||
if isArocc then "I" else "idirafter"
|
|
||||||
}" "${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags
|
|
||||||
''
|
''
|
||||||
+ optionalString isGNU ''
|
+ optionalString isGNU ''
|
||||||
for dir in "${cc}"/lib/gcc/*/*/include-fixed; do
|
for dir in "${cc}"/lib/gcc/*/*/include-fixed; do
|
||||||
@@ -723,9 +733,9 @@ stdenvNoCC.mkDerivation {
|
|||||||
done
|
done
|
||||||
''
|
''
|
||||||
+ optionalString (libc.w32api or null != null) ''
|
+ optionalString (libc.w32api or null != null) ''
|
||||||
echo '-idirafter ${lib.getDev libc.w32api}${
|
include "${systemIncludeFlag}" "${lib.getDev libc.w32api}${
|
||||||
libc.incdir or "/include/w32api"
|
libc.incdir or "/include/w32api"
|
||||||
}' >> $out/nix-support/libc-cflags
|
}" >> $out/nix-support/libc-cflags
|
||||||
''
|
''
|
||||||
+ ''
|
+ ''
|
||||||
|
|
||||||
@@ -740,7 +750,7 @@ stdenvNoCC.mkDerivation {
|
|||||||
# like option that forces the libc headers before all -idirafter,
|
# like option that forces the libc headers before all -idirafter,
|
||||||
# hence -isystem here.
|
# hence -isystem here.
|
||||||
+ optionalString includeFortifyHeaders' ''
|
+ optionalString includeFortifyHeaders' ''
|
||||||
include -isystem "${fortify-headers}/include" >> $out/nix-support/libc-cflags
|
include "${fortifyIncludeFlag}" "${fortify-headers}/include" >> $out/nix-support/libc-cflags
|
||||||
''
|
''
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -761,7 +771,7 @@ stdenvNoCC.mkDerivation {
|
|||||||
# already knows how to find its own libstdc++, and adding
|
# already knows how to find its own libstdc++, and adding
|
||||||
# additional -isystem flags will confuse gfortran (see
|
# additional -isystem flags will confuse gfortran (see
|
||||||
# https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903)
|
# https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903)
|
||||||
+ optionalString (libcxx == null && isClang && (useGccForLibs && gccForLibs.langCC or false)) ''
|
+ optionalString (libcxx == null && isClang && useGccForLibs && (cc.langCC or false)) ''
|
||||||
for dir in ${gccForLibs}/include/c++/*; do
|
for dir in ${gccForLibs}/include/c++/*; do
|
||||||
include -cxx-isystem "$dir" >> $out/nix-support/libcxx-cxxflags
|
include -cxx-isystem "$dir" >> $out/nix-support/libcxx-cxxflags
|
||||||
done
|
done
|
||||||
@@ -786,7 +796,9 @@ stdenvNoCC.mkDerivation {
|
|||||||
# ${cc_solib}/lib64 (even though it does actually search there...)..
|
# ${cc_solib}/lib64 (even though it does actually search there...)..
|
||||||
# This confuses libtool. So add it to the compiler tool search
|
# This confuses libtool. So add it to the compiler tool search
|
||||||
# path explicitly.
|
# path explicitly.
|
||||||
+ optionalString (!nativeTools && !isArocc) ''
|
# Injecting CFlags and LDFlags causes duplicate rpath at linking
|
||||||
|
# stage for Alire GNAT. Skip adding flags here.
|
||||||
|
+ optionalString (!nativeTools && !isArocc && !isAlireGNAT) ''
|
||||||
ccLDFlags=()
|
ccLDFlags=()
|
||||||
ccCFlags=()
|
ccCFlags=()
|
||||||
if [ -e "${cc_solib}/lib64" -a ! -L "${cc_solib}/lib64" ]; then
|
if [ -e "${cc_solib}/lib64" -a ! -L "${cc_solib}/lib64" ]; then
|
||||||
@@ -801,7 +813,6 @@ stdenvNoCC.mkDerivation {
|
|||||||
touch "$out/nix-support/gnat-cflags"
|
touch "$out/nix-support/gnat-cflags"
|
||||||
touch "$out/nix-support/gnat-ldflags"
|
touch "$out/nix-support/gnat-ldflags"
|
||||||
basePath=$(echo $cc/lib/*/*/*)
|
basePath=$(echo $cc/lib/*/*/*)
|
||||||
ccCFlags+=("-B$basePath" "-I$basePath/adainclude")
|
|
||||||
gnatCFlags="-I$basePath/adainclude -I$basePath/adalib"
|
gnatCFlags="-I$basePath/adainclude -I$basePath/adalib"
|
||||||
|
|
||||||
echo "$gnatCFlags" >> $out/nix-support/gnat-cflags
|
echo "$gnatCFlags" >> $out/nix-support/gnat-cflags
|
||||||
@@ -828,6 +839,7 @@ stdenvNoCC.mkDerivation {
|
|||||||
optionalString
|
optionalString
|
||||||
(
|
(
|
||||||
(cc.isClang or false)
|
(cc.isClang or false)
|
||||||
|
&& !isFlang
|
||||||
&& !(cc.isROCm or false)
|
&& !(cc.isROCm or false)
|
||||||
&& !targetPlatform.isDarwin
|
&& !targetPlatform.isDarwin
|
||||||
&& !targetPlatform.isAndroid
|
&& !targetPlatform.isAndroid
|
||||||
@@ -862,7 +874,8 @@ stdenvNoCC.mkDerivation {
|
|||||||
let
|
let
|
||||||
enable_fp = !targetPlatform.isx86_32 && !targetPlatform.isS390;
|
enable_fp = !targetPlatform.isx86_32 && !targetPlatform.isS390;
|
||||||
enable_leaf_fp =
|
enable_leaf_fp =
|
||||||
enable_fp
|
!isFlang
|
||||||
|
&& enable_fp
|
||||||
&& (
|
&& (
|
||||||
targetPlatform.isx86_64
|
targetPlatform.isx86_64
|
||||||
|| targetPlatform.isAarch64
|
|| targetPlatform.isAarch64
|
||||||
@@ -928,7 +941,7 @@ stdenvNoCC.mkDerivation {
|
|||||||
# well with multi line flags, so make the flags single line again
|
# well with multi line flags, so make the flags single line again
|
||||||
+ ''
|
+ ''
|
||||||
for flags in "$out/nix-support"/*flags*; do
|
for flags in "$out/nix-support"/*flags*; do
|
||||||
substituteInPlace "$flags" --replace $'\n' ' '
|
substituteInPlace "$flags" --replace-quiet $'\n' ' '
|
||||||
done
|
done
|
||||||
|
|
||||||
substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
|
substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
|
||||||
@@ -974,6 +987,7 @@ stdenvNoCC.mkDerivation {
|
|||||||
|
|
||||||
env = {
|
env = {
|
||||||
inherit isClang;
|
inherit isClang;
|
||||||
|
inherit isFlang;
|
||||||
|
|
||||||
# for substitution in utils.bash
|
# for substitution in utils.bash
|
||||||
# TODO(@sternenseemann): invent something cleaner than passing in "" in case of absence
|
# TODO(@sternenseemann): invent something cleaner than passing in "" in case of absence
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
stdenvNoCC,
|
stdenvNoCC,
|
||||||
runCommand,
|
runCommand,
|
||||||
writers,
|
writers,
|
||||||
python3Packages,
|
python3,
|
||||||
cargo,
|
cargo,
|
||||||
gitMinimal,
|
gitMinimal,
|
||||||
nix-prefetch-git,
|
nix-prefetch-git,
|
||||||
@@ -11,6 +11,16 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
python = python3.override {
|
||||||
|
self = python;
|
||||||
|
packageOverrides = final: prev: {
|
||||||
|
# The ast-serialize package, a dependency for mypy, depends on
|
||||||
|
# fetchCargoVendor and is part of the bootstrap chain for requests.
|
||||||
|
charset-normalizer = prev.charset-normalizer.override { withMypyc = false; };
|
||||||
|
};
|
||||||
|
};
|
||||||
|
python3Packages = python.pkgs;
|
||||||
|
|
||||||
replaceWorkspaceValues = writers.writePython3Bin "replace-workspace-values" {
|
replaceWorkspaceValues = writers.writePython3Bin "replace-workspace-values" {
|
||||||
libraries = with python3Packages; [
|
libraries = with python3Packages; [
|
||||||
tomli
|
tomli
|
||||||
|
|||||||
@@ -42,11 +42,13 @@ wrapGApp() {
|
|||||||
wrapProgram "$program" "${gappsWrapperArgs[@]}" "$@"
|
wrapProgram "$program" "${gappsWrapperArgs[@]}" "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
declare -gA wrapGAppsHookHasRunForOutput
|
||||||
|
|
||||||
# Note: $gappsWrapperArgs still gets defined even if ${dontWrapGApps-} is set.
|
# Note: $gappsWrapperArgs still gets defined even if ${dontWrapGApps-} is set.
|
||||||
wrapGAppsHook() {
|
wrapGAppsHook() {
|
||||||
# guard against running multiple times (e.g. due to propagation)
|
# guard against running multiple times for the same output (e.g. due to propagation)
|
||||||
[ -z "$wrapGAppsHookHasRun" ] || return 0
|
[ "${wrapGAppsHookHasRunForOutput["$output"]:-}" = 1 ] && return 0
|
||||||
wrapGAppsHookHasRun=1
|
wrapGAppsHookHasRunForOutput["$output"]=1
|
||||||
|
|
||||||
if [[ -z "${dontWrapGApps:-}" ]]; then
|
if [[ -z "${dontWrapGApps:-}" ]]; then
|
||||||
targetDirsThatExist=()
|
targetDirsThatExist=()
|
||||||
|
|||||||
@@ -6,6 +6,8 @@
|
|||||||
gtest,
|
gtest,
|
||||||
static ? stdenv.hostPlatform.isStatic,
|
static ? stdenv.hostPlatform.isStatic,
|
||||||
cxxStandard ? null,
|
cxxStandard ? null,
|
||||||
|
testers,
|
||||||
|
validatePkgConfig,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
@@ -30,10 +32,19 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
|
validatePkgConfig
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs = [ gtest ];
|
buildInputs = [ gtest ];
|
||||||
|
|
||||||
|
passthru.tests = {
|
||||||
|
pkg-config = testers.hasPkgConfigModules {
|
||||||
|
package = finalAttrs.finalPackage;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Open-source collection of C++ code designed to augment the C++ standard library";
|
description = "Open-source collection of C++ code designed to augment the C++ standard library";
|
||||||
homepage = "https://abseil.io/";
|
homepage = "https://abseil.io/";
|
||||||
@@ -41,5 +52,208 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
license = lib.licenses.asl20;
|
license = lib.licenses.asl20;
|
||||||
platforms = lib.platforms.all;
|
platforms = lib.platforms.all;
|
||||||
maintainers = [ lib.maintainers.GaetanLepage ];
|
maintainers = [ lib.maintainers.GaetanLepage ];
|
||||||
|
pkgConfigModules = [
|
||||||
|
"absl_log_internal_check_op"
|
||||||
|
"absl_absl_check"
|
||||||
|
"absl_strerror"
|
||||||
|
"absl_common_policy_traits"
|
||||||
|
"absl_graphcycles_internal"
|
||||||
|
"absl_raw_hash_set"
|
||||||
|
"absl_random_internal_entropy_pool"
|
||||||
|
"absl_time_zone"
|
||||||
|
"absl_prefetch"
|
||||||
|
"absl_compressed_tuple"
|
||||||
|
"absl_nullability"
|
||||||
|
"absl_vlog_is_on"
|
||||||
|
"absl_utf8_for_code_point"
|
||||||
|
"absl_base_internal"
|
||||||
|
"absl_bad_variant_access"
|
||||||
|
"absl_flags_parse"
|
||||||
|
"absl_exponential_biased"
|
||||||
|
"absl_log_internal_nullstream"
|
||||||
|
"absl_log_internal_structured_proto"
|
||||||
|
"absl_log_internal_check_impl"
|
||||||
|
"absl_tracing_internal"
|
||||||
|
"absl_random_bit_gen_ref"
|
||||||
|
"absl_meta"
|
||||||
|
"absl_random_distributions"
|
||||||
|
"absl_numeric"
|
||||||
|
"absl_flat_hash_set"
|
||||||
|
"absl_random_internal_randen_hwaes_impl"
|
||||||
|
"absl_malloc_internal"
|
||||||
|
"absl_layout"
|
||||||
|
"absl_type_traits"
|
||||||
|
"absl_random_internal_mock_helpers"
|
||||||
|
"absl_log_streamer"
|
||||||
|
"absl_function_ref"
|
||||||
|
"absl_log"
|
||||||
|
"absl_dynamic_annotations"
|
||||||
|
"absl_non_temporal_memcpy"
|
||||||
|
"absl_random_internal_randen"
|
||||||
|
"absl_stacktrace"
|
||||||
|
"absl_log_internal_globals"
|
||||||
|
"absl_log_internal_strip"
|
||||||
|
"absl_atomic_hook"
|
||||||
|
"absl_flags_usage_internal"
|
||||||
|
"absl_log_internal_voidify"
|
||||||
|
"absl_synchronization"
|
||||||
|
"absl_debugging_internal"
|
||||||
|
"absl_bind_front"
|
||||||
|
"absl_crc_internal"
|
||||||
|
"absl_random_internal_platform"
|
||||||
|
"absl_flags_path_util"
|
||||||
|
"absl_hash_testing"
|
||||||
|
"absl_flags_commandlineflag_internal"
|
||||||
|
"absl_hashtable_debug"
|
||||||
|
"absl_hashtablez_sampler"
|
||||||
|
"absl_random_internal_randen_engine"
|
||||||
|
"absl_log_globals"
|
||||||
|
"absl_optional"
|
||||||
|
"absl_crc_cpu_detect"
|
||||||
|
"absl_demangle_internal"
|
||||||
|
"absl_node_hash_map"
|
||||||
|
"absl_core_headers"
|
||||||
|
"absl_statusor"
|
||||||
|
"absl_str_format_internal"
|
||||||
|
"absl_crc32c"
|
||||||
|
"absl_cordz_update_scope"
|
||||||
|
"absl_cordz_handle"
|
||||||
|
"absl_log_internal_nullguard"
|
||||||
|
"absl_numeric_representation"
|
||||||
|
"absl_log_internal_log_impl"
|
||||||
|
"absl_raw_hash_set_resize_impl"
|
||||||
|
"absl_random_internal_distribution_test_util"
|
||||||
|
"absl_kernel_timeout_internal"
|
||||||
|
"absl_random_internal_uniform_helper"
|
||||||
|
"absl_random_seed_sequences"
|
||||||
|
"absl_cordz_info"
|
||||||
|
"absl_spy_hash_state"
|
||||||
|
"absl_vlog_config_internal"
|
||||||
|
"absl_flags_program_name"
|
||||||
|
"absl_hashtable_debug_hooks"
|
||||||
|
"absl_crc_cord_state"
|
||||||
|
"absl_decode_rust_punycode"
|
||||||
|
"absl_debugging"
|
||||||
|
"absl_overload"
|
||||||
|
"absl_config"
|
||||||
|
"absl_random_internal_fast_uniform_bits"
|
||||||
|
"absl_raw_hash_map"
|
||||||
|
"absl_random_internal_randen_hwaes"
|
||||||
|
"absl_bad_any_cast"
|
||||||
|
"absl_variant"
|
||||||
|
"absl_has_ostream_operator"
|
||||||
|
"absl_span"
|
||||||
|
"absl_btree"
|
||||||
|
"absl_random_internal_distribution_caller"
|
||||||
|
"absl_failure_signal_handler"
|
||||||
|
"absl_any"
|
||||||
|
"absl_poison"
|
||||||
|
"absl_str_format"
|
||||||
|
"absl_cord"
|
||||||
|
"absl_random_internal_wide_multiply"
|
||||||
|
"absl_random_internal_pcg_engine"
|
||||||
|
"absl_flags_internal"
|
||||||
|
"absl_check"
|
||||||
|
"absl_random_internal_seed_material"
|
||||||
|
"absl_log_flags"
|
||||||
|
"absl_no_destructor"
|
||||||
|
"absl_low_level_hash"
|
||||||
|
"absl_hashtable_control_bytes"
|
||||||
|
"absl_periodic_sampler"
|
||||||
|
"absl_log_internal_format"
|
||||||
|
"absl_log_initialize"
|
||||||
|
"absl_random_internal_generate_real"
|
||||||
|
"absl_raw_logging_internal"
|
||||||
|
"absl_inlined_vector"
|
||||||
|
"absl_log_internal_log_sink_set"
|
||||||
|
"absl_log_internal_flags"
|
||||||
|
"absl_flat_hash_map"
|
||||||
|
"absl_scoped_mock_log"
|
||||||
|
"absl_cordz_functions"
|
||||||
|
"absl_random_mocking_bit_gen"
|
||||||
|
"absl_fast_type_id"
|
||||||
|
"absl_sample_recorder"
|
||||||
|
"absl_log_internal_message"
|
||||||
|
"absl_bits"
|
||||||
|
"absl_random_seed_gen_exception"
|
||||||
|
"absl_log_sink_registry"
|
||||||
|
"absl_flags_marshalling"
|
||||||
|
"absl_leak_check"
|
||||||
|
"absl_examine_stack"
|
||||||
|
"absl_status_matchers"
|
||||||
|
"absl_flags_commandlineflag"
|
||||||
|
"absl_absl_vlog_is_on"
|
||||||
|
"absl_any_invocable"
|
||||||
|
"absl_cleanup_internal"
|
||||||
|
"absl_log_severity"
|
||||||
|
"absl_random_internal_salted_seed_seq"
|
||||||
|
"absl_flags_config"
|
||||||
|
"absl_log_structured"
|
||||||
|
"absl_die_if_null"
|
||||||
|
"absl_fixed_array"
|
||||||
|
"absl_cord_internal"
|
||||||
|
"absl_endian"
|
||||||
|
"absl_strings_internal"
|
||||||
|
"absl_symbolize"
|
||||||
|
"absl_log_internal_config"
|
||||||
|
"absl_absl_log"
|
||||||
|
"absl_memory"
|
||||||
|
"absl_container_common"
|
||||||
|
"absl_compare"
|
||||||
|
"absl_civil_time"
|
||||||
|
"absl_int128"
|
||||||
|
"absl_log_internal_append_truncated"
|
||||||
|
"absl_cordz_statistics"
|
||||||
|
"absl_log_internal_fnmatch"
|
||||||
|
"absl_flags"
|
||||||
|
"absl_non_temporal_arm_intrinsics"
|
||||||
|
"absl_random_internal_traits"
|
||||||
|
"absl_base"
|
||||||
|
"absl_algorithm_container"
|
||||||
|
"absl_hash"
|
||||||
|
"absl_log_internal_conditions"
|
||||||
|
"absl_time"
|
||||||
|
"absl_node_slot_policy"
|
||||||
|
"absl_errno_saver"
|
||||||
|
"absl_random_internal_randen_slow"
|
||||||
|
"absl_charset"
|
||||||
|
"absl_bounded_utf8_length_sequence"
|
||||||
|
"absl_city"
|
||||||
|
"absl_bad_optional_access"
|
||||||
|
"absl_random_internal_nonsecure_base"
|
||||||
|
"absl_flags_usage"
|
||||||
|
"absl_utility"
|
||||||
|
"absl_iterator_traits_internal"
|
||||||
|
"absl_spinlock_wait"
|
||||||
|
"absl_pretty_function"
|
||||||
|
"absl_algorithm"
|
||||||
|
"absl_log_sink"
|
||||||
|
"absl_status"
|
||||||
|
"absl_demangle_rust"
|
||||||
|
"absl_node_hash_set"
|
||||||
|
"absl_hash_policy_traits"
|
||||||
|
"absl_flags_private_handle_accessor"
|
||||||
|
"absl_cord_test_helpers"
|
||||||
|
"absl_strings"
|
||||||
|
"absl_log_internal_proto"
|
||||||
|
"absl_inlined_vector_internal"
|
||||||
|
"absl_iterator_traits_test_helper_internal"
|
||||||
|
"absl_random_random"
|
||||||
|
"absl_flags_reflection"
|
||||||
|
"absl_scoped_set_env"
|
||||||
|
"absl_throw_delegate"
|
||||||
|
"absl_hash_function_defaults"
|
||||||
|
"absl_weakly_mixed_integer"
|
||||||
|
"absl_cleanup"
|
||||||
|
"absl_random_internal_iostream_state_saver"
|
||||||
|
"absl_cordz_sample_token"
|
||||||
|
"absl_cordz_update_tracker"
|
||||||
|
"absl_string_view"
|
||||||
|
"absl_hash_container_defaults"
|
||||||
|
"absl_random_internal_fastmath"
|
||||||
|
"absl_log_internal_structured"
|
||||||
|
"absl_container_memory"
|
||||||
|
"absl_log_entry"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -6,6 +6,8 @@
|
|||||||
gtest,
|
gtest,
|
||||||
static ? stdenv.hostPlatform.isStatic,
|
static ? stdenv.hostPlatform.isStatic,
|
||||||
cxxStandard ? null,
|
cxxStandard ? null,
|
||||||
|
testers,
|
||||||
|
validatePkgConfig,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
@@ -35,10 +37,19 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
|
validatePkgConfig
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs = [ gtest ];
|
buildInputs = [ gtest ];
|
||||||
|
|
||||||
|
passthru.tests = {
|
||||||
|
pkg-config = testers.hasPkgConfigModules {
|
||||||
|
package = finalAttrs.finalPackage.dev;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Open-source collection of C++ code designed to augment the C++ standard library";
|
description = "Open-source collection of C++ code designed to augment the C++ standard library";
|
||||||
homepage = "https://abseil.io/";
|
homepage = "https://abseil.io/";
|
||||||
@@ -46,5 +57,99 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
license = lib.licenses.asl20;
|
license = lib.licenses.asl20;
|
||||||
platforms = lib.platforms.all;
|
platforms = lib.platforms.all;
|
||||||
maintainers = [ lib.maintainers.GaetanLepage ];
|
maintainers = [ lib.maintainers.GaetanLepage ];
|
||||||
|
pkgConfigModules = [
|
||||||
|
"absl_base"
|
||||||
|
"absl_city"
|
||||||
|
"absl_civil_time"
|
||||||
|
"absl_cord_internal"
|
||||||
|
"absl_cord"
|
||||||
|
"absl_cordz_functions"
|
||||||
|
"absl_cordz_handle"
|
||||||
|
"absl_cordz_info"
|
||||||
|
"absl_cordz_sample_token"
|
||||||
|
"absl_crc_cord_state"
|
||||||
|
"absl_crc_cpu_detect"
|
||||||
|
"absl_crc_internal"
|
||||||
|
"absl_crc32c"
|
||||||
|
"absl_debugging_internal"
|
||||||
|
"absl_decode_rust_punycode"
|
||||||
|
"absl_demangle_internal"
|
||||||
|
"absl_demangle_rust"
|
||||||
|
"absl_die_if_null"
|
||||||
|
"absl_examine_stack"
|
||||||
|
"absl_exponential_biased"
|
||||||
|
"absl_failure_signal_handler"
|
||||||
|
"absl_flags_commandlineflag_internal"
|
||||||
|
"absl_flags_commandlineflag"
|
||||||
|
"absl_flags_config"
|
||||||
|
"absl_flags_internal"
|
||||||
|
"absl_flags_marshalling"
|
||||||
|
"absl_flags_parse"
|
||||||
|
"absl_flags_private_handle_accessor"
|
||||||
|
"absl_flags_program_name"
|
||||||
|
"absl_flags_reflection"
|
||||||
|
"absl_flags_usage_internal"
|
||||||
|
"absl_flags_usage"
|
||||||
|
"absl_graphcycles_internal"
|
||||||
|
"absl_hash"
|
||||||
|
"absl_hashtable_profiler"
|
||||||
|
"absl_hashtablez_sampler"
|
||||||
|
"absl_int128"
|
||||||
|
"absl_kernel_timeout_internal"
|
||||||
|
"absl_leak_check"
|
||||||
|
"absl_log_entry"
|
||||||
|
"absl_log_flags"
|
||||||
|
"absl_log_globals"
|
||||||
|
"absl_log_initialize"
|
||||||
|
"absl_log_internal_check_op"
|
||||||
|
"absl_log_internal_conditions"
|
||||||
|
"absl_log_internal_fnmatch"
|
||||||
|
"absl_log_internal_format"
|
||||||
|
"absl_log_internal_globals"
|
||||||
|
"absl_log_internal_log_sink_set"
|
||||||
|
"absl_log_internal_message"
|
||||||
|
"absl_log_internal_nullguard"
|
||||||
|
"absl_log_internal_proto"
|
||||||
|
"absl_log_internal_structured_proto"
|
||||||
|
"absl_log_severity"
|
||||||
|
"absl_log_sink"
|
||||||
|
"absl_malloc_internal"
|
||||||
|
"absl_periodic_sampler"
|
||||||
|
"absl_poison"
|
||||||
|
"absl_profile_builder"
|
||||||
|
"absl_random_distributions"
|
||||||
|
"absl_random_internal_distribution_test_util"
|
||||||
|
"absl_random_internal_entropy_pool"
|
||||||
|
"absl_random_internal_platform"
|
||||||
|
"absl_random_internal_randen_hwaes_impl"
|
||||||
|
"absl_random_internal_randen_hwaes"
|
||||||
|
"absl_random_internal_randen_slow"
|
||||||
|
"absl_random_internal_randen"
|
||||||
|
"absl_random_internal_seed_material"
|
||||||
|
"absl_random_seed_gen_exception"
|
||||||
|
"absl_random_seed_sequences"
|
||||||
|
"absl_raw_hash_set"
|
||||||
|
"absl_raw_logging_internal"
|
||||||
|
"absl_scoped_mock_log"
|
||||||
|
"absl_scoped_set_env"
|
||||||
|
"absl_spinlock_wait"
|
||||||
|
"absl_stacktrace"
|
||||||
|
"absl_status_matchers"
|
||||||
|
"absl_status"
|
||||||
|
"absl_statusor"
|
||||||
|
"absl_str_format_internal"
|
||||||
|
"absl_strerror"
|
||||||
|
"absl_string_view"
|
||||||
|
"absl_strings_internal"
|
||||||
|
"absl_strings"
|
||||||
|
"absl_symbolize"
|
||||||
|
"absl_synchronization"
|
||||||
|
"absl_throw_delegate"
|
||||||
|
"absl_time_zone"
|
||||||
|
"absl_time"
|
||||||
|
"absl_tracing_internal"
|
||||||
|
"absl_utf8_for_code_point"
|
||||||
|
"absl_vlog_config_internal"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
|||||||
|
|
||||||
nativeBuildInputs = with python3Packages; [
|
nativeBuildInputs = with python3Packages; [
|
||||||
sphinxHook
|
sphinxHook
|
||||||
setuptools
|
setuptools_80
|
||||||
setuptools-scm
|
setuptools-scm
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -7,14 +7,16 @@
|
|||||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||||
pname = "alerta-server";
|
pname = "alerta-server";
|
||||||
version = "9.0.1";
|
version = "9.0.1";
|
||||||
format = "setuptools";
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit (finalAttrs) pname version;
|
inherit (finalAttrs) pname version;
|
||||||
hash = "sha256-v4+0l5Sx9RTxmNFnKCoKrWFl1xu1JIRZ/kiI6zi/y0I=";
|
hash = "sha256-v4+0l5Sx9RTxmNFnKCoKrWFl1xu1JIRZ/kiI6zi/y0I=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = with python3.pkgs; [
|
build-system = [ python3.pkgs.setuptools_80 ];
|
||||||
|
|
||||||
|
dependencies = with python3.pkgs; [
|
||||||
bcrypt
|
bcrypt
|
||||||
blinker
|
blinker
|
||||||
cryptography
|
cryptography
|
||||||
|
|||||||
@@ -6,13 +6,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "amf-headers";
|
pname = "amf-headers";
|
||||||
version = "1.5.0";
|
version = "1.5.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "GPUOpen-LibrariesAndSDKs";
|
owner = "GPUOpen-LibrariesAndSDKs";
|
||||||
repo = "AMF";
|
repo = "AMF";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
sha256 = "sha256-ZVC1e4S5CNpfl3ewHR9aVfYwxDBE7/BJ6OyH2kF00fQ=";
|
sha256 = "sha256-+jVYm/Zmt+1bzKnKTiClgoMRsyhqpuKZj79DvGHpPTM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|||||||
@@ -17,10 +17,10 @@
|
|||||||
},
|
},
|
||||||
"26": {
|
"26": {
|
||||||
"urls": [
|
"urls": [
|
||||||
"https://swcdn.apple.com/content/downloads/32/53/047-96692-A_OAHIHT53YB/ybtshxmrcju8m2qvw3w5elr4rajtg1x3y3/CLTools_macOSNMOS_SDK.pkg",
|
"https://swcdn.apple.com/content/downloads/09/08/047-91568-A_Y1CFZWQCD4/4xekpyz43i26dbp4enxfro8eb1q7wiujh5/CLTools_macOSNMOS_SDK.pkg",
|
||||||
"https://web.archive.org/web/20260406133131/https://swcdn.apple.com/content/downloads/32/53/047-96692-A_OAHIHT53YB/ybtshxmrcju8m2qvw3w5elr4rajtg1x3y3/CLTools_macOSNMOS_SDK.pkg"
|
"https://web.archive.org/web/20260512015547/https://swcdn.apple.com/content/downloads/09/08/047-91568-A_Y1CFZWQCD4/4xekpyz43i26dbp4enxfro8eb1q7wiujh5/CLTools_macOSNMOS_SDK.pkg"
|
||||||
],
|
],
|
||||||
"version": "26.4",
|
"version": "26.5",
|
||||||
"hash": "sha256-7nrbCv1pNlpzEqwZWVfUPCvDfXEJJNOl7ApkeFpIOC0="
|
"hash": "sha256-IkDNtiO7PP4GI6OszCNWE1Xb4iepCUKwQHYUyc9NgNA="
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "assimp";
|
pname = "assimp";
|
||||||
version = "6.0.4";
|
version = "6.0.5";
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
"lib"
|
"lib"
|
||||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
owner = "assimp";
|
owner = "assimp";
|
||||||
repo = "assimp";
|
repo = "assimp";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-ryTgsN0z9BZBz7i9aUMKuneN5oqfxpduwJlb+Q0q3Mk=";
|
hash = "sha256-QWBi1pl5C76UtPhB6SmFipm9oEdnfhELMT3MqfV6oxg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "at-spi2-core";
|
pname = "at-spi2-core";
|
||||||
version = "2.60.1";
|
version = "2.60.4";
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/at-spi2-core/${lib.versions.majorMinor finalAttrs.version}/at-spi2-core-${finalAttrs.version}.tar.xz";
|
url = "mirror://gnome/sources/at-spi2-core/${lib.versions.majorMinor finalAttrs.version}/at-spi2-core-${finalAttrs.version}.tar.xz";
|
||||||
hash = "sha256-+ZuH48FnT1+8QXzJwdniYcDymqsFUK1jaYBQMdEvaFI=";
|
hash = "sha256-Gh9bqYBZF/QfxqpoI9z4h6KR1gekJ+LVr7a136ZQcMc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|||||||
@@ -30,13 +30,13 @@
|
|||||||
}:
|
}:
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "audit";
|
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 {
|
src = fetchFromGitHub {
|
||||||
owner = "linux-audit";
|
owner = "linux-audit";
|
||||||
repo = "audit-userspace";
|
repo = "audit-userspace";
|
||||||
rev = "cb13fe75ee2c36d5c525ed9de22aae10dbc8caf4";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-NX0TWA+LtcZgbM9aQfokWv2rGNAAb3ksGqAH8URAkYM=";
|
hash = "sha256-GdJ9nzlDAdOazOHH/YWuEoELrJh+G5ZJUKwIqAKAzpo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
@@ -132,10 +132,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
# Instead, we load audit rules in a dedicated module.
|
# Instead, we load audit rules in a dedicated module.
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
moveToOutput bin/augenrules $scripts
|
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 \
|
wrapProgram $scripts/bin/augenrules \
|
||||||
--prefix PATH : ${
|
--prefix PATH : ${
|
||||||
lib.makeBinPath [
|
lib.makeBinPath [
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
expat,
|
expat,
|
||||||
gettext,
|
gettext,
|
||||||
glib,
|
glib,
|
||||||
|
autoconf-archive,
|
||||||
autoreconfHook,
|
autoreconfHook,
|
||||||
libiconv,
|
libiconv,
|
||||||
libevent,
|
libevent,
|
||||||
@@ -180,6 +181,12 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
# Remove the vendored ACX_PTHREAD macro in favor of the more up-to-date
|
||||||
|
# implementation from autoconf-archive, especially to support static builds.
|
||||||
|
rm common/acx_pthread.m4
|
||||||
|
'';
|
||||||
|
|
||||||
depsBuildBuild = [
|
depsBuildBuild = [
|
||||||
pkg-config
|
pkg-config
|
||||||
];
|
];
|
||||||
@@ -188,6 +195,7 @@ stdenv.mkDerivation rec {
|
|||||||
pkg-config
|
pkg-config
|
||||||
gettext
|
gettext
|
||||||
glib
|
glib
|
||||||
|
autoconf-archive
|
||||||
autoreconfHook
|
autoreconfHook
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -67,6 +67,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
) "export"
|
) "export"
|
||||||
);
|
);
|
||||||
|
|
||||||
|
__structuredAttrs = true;
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
@@ -93,7 +95,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
||||||
./boot-strap --prefix=$out -o . op=install
|
# `boot-strap op=install` runs the built bmake, which breaks cross builds.
|
||||||
|
install -Dm755 bmake $out/bin/bmake
|
||||||
|
install -Dm644 bmake.1 $man/share/man/man1/bmake.1
|
||||||
|
install -Dm755 -d $out/share/mk
|
||||||
|
sh mk/install-mk -v -m 444 $out/share/mk
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|||||||
@@ -35,7 +35,9 @@ stdenv.mkDerivation {
|
|||||||
patches =
|
patches =
|
||||||
useBoost.boostBuildPatches or [ ]
|
useBoost.boostBuildPatches or [ ]
|
||||||
++ lib.optional (
|
++ lib.optional (
|
||||||
useBoost ? version && lib.versionAtLeast useBoost.version "1.81"
|
useBoost ? version
|
||||||
|
&& lib.versionAtLeast useBoost.version "1.81"
|
||||||
|
&& lib.versionOlder useBoost.version "1.88"
|
||||||
) ./fix-clang-target.patch;
|
) ./fix-clang-target.patch;
|
||||||
|
|
||||||
postPatch =
|
postPatch =
|
||||||
|
|||||||
@@ -6,14 +6,14 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "byacc";
|
pname = "byacc";
|
||||||
version = "20241231";
|
version = "20260126";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
urls = [
|
urls = [
|
||||||
"https://invisible-mirror.net/archives/byacc/byacc-${finalAttrs.version}.tgz"
|
"https://invisible-mirror.net/archives/byacc/byacc-${finalAttrs.version}.tgz"
|
||||||
"https://invisible-island.net/archives/byacc/byacc-${finalAttrs.version}.tgz"
|
"https://invisible-island.net/archives/byacc/byacc-${finalAttrs.version}.tgz"
|
||||||
];
|
];
|
||||||
hash = "sha256-GSwvrgSNTn9RS6RRYn+cTmEnZQmfgZwZGR+f3j5glnM=";
|
hash = "sha256-thjF+0TC9fBIhD25D30bJPePR7B5E8jHuoyULT6ySwA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
|
|||||||
@@ -12,19 +12,19 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
# this version may need to be updated along with package version
|
# this version may need to be updated along with package version
|
||||||
cargoVersion = "0.93.0";
|
cargoVersion = "0.96.0";
|
||||||
in
|
in
|
||||||
rustPlatform.buildRustPackage (finalAttrs: {
|
rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
pname = "cargo-c";
|
pname = "cargo-c";
|
||||||
version = "0.10.19";
|
version = "0.10.22";
|
||||||
|
|
||||||
src = fetchCrate {
|
src = fetchCrate {
|
||||||
inherit (finalAttrs) pname;
|
inherit (finalAttrs) pname;
|
||||||
version = "${finalAttrs.version}+cargo-${cargoVersion}";
|
version = "${finalAttrs.version}+cargo-${cargoVersion}";
|
||||||
hash = "sha256-PrBmB+0tmU2MAUnRr+wx4g9hu0Y9i6WfR8U89bwiLVY=";
|
hash = "sha256-yqSrpBZUa0NmsPawYKKgywmbbG4zgguwfDF667s7zdo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-EM/vAfW/ucOfK/XmAQn9Zk75eFb7pp8uZoByKbALCyo=";
|
cargoHash = "sha256-yeJWZtkgCRB0ipyTslsGcJi9Fi/XoWziuv74exRhAIk=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|||||||
@@ -9,13 +9,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "catch2";
|
pname = "catch2";
|
||||||
version = "3.14.0";
|
version = "3.15.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "catchorg";
|
owner = "catchorg";
|
||||||
repo = "Catch2";
|
repo = "Catch2";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-tegAa+cNF7pJcW33B+VZ86ZlDG7dwS3o6QnN/XvTI2A=";
|
hash = "sha256-1GBzS8jgJXb82BMMRuHWqszB1Xwg6wohmCuINWE7QoU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = lib.optionals stdenv.cc.isClang [
|
patches = lib.optionals stdenv.cc.isClang [
|
||||||
|
|||||||
@@ -7,11 +7,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "cmocka";
|
pname = "cmocka";
|
||||||
version = "2.0.1";
|
version = "2.0.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://cmocka.org/files/${lib.versions.majorMinor finalAttrs.version}/cmocka-${finalAttrs.version}.tar.xz";
|
url = "https://cmocka.org/files/${lib.versions.majorMinor finalAttrs.version}/cmocka-${finalAttrs.version}.tar.xz";
|
||||||
hash = "sha256-PzUzOCuimrOr9cT0snt50WXw31HqWH3nSbEbaLQBkYA=";
|
hash = "sha256-OfkvNmvfPxoCr02nW0pcUt9sn35zbH1l3hMoP58O9BY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|||||||
@@ -115,6 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
__structuredAttrs = true;
|
||||||
|
|
||||||
env = {
|
env = {
|
||||||
CXX = "${stdenv.cc.targetPrefix}c++";
|
CXX = "${stdenv.cc.targetPrefix}c++";
|
||||||
|
|||||||
@@ -129,6 +129,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
"-Dselinux=disabled"
|
"-Dselinux=disabled"
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
|
# D-Bus defaults to launchd-activation on Darwin, but that requires the launch agent be installed. It also breaks
|
||||||
|
# anything that uses `dbus-run-session` in tests. Changing the default aligns Darwin with other UNIX platforms.
|
||||||
|
"-Ddbus_session_bus_listen_address=unix:tmpdir=/tmp"
|
||||||
# `launchctl` is only needed at runtime. Lie to `find_program` because it will always be present on a Darwin host.
|
# `launchctl` is only needed at runtime. Lie to `find_program` because it will always be present on a Darwin host.
|
||||||
"--cross-file=${writeText "darwin.ini" ''
|
"--cross-file=${writeText "darwin.ini" ''
|
||||||
[binaries]
|
[binaries]
|
||||||
@@ -156,6 +159,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
--replace-fail 'DBUS_DAEMONDIR"/dbus-daemon"' '"/run/current-system/sw/bin/dbus-daemon"'
|
--replace-fail 'DBUS_DAEMONDIR"/dbus-daemon"' '"/run/current-system/sw/bin/dbus-daemon"'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||||
|
# For some reason, only these binaries reference the dylib by rpath instead of by an absolute install name.
|
||||||
|
for exe in bin/dbus-daemon bin/dbus-run-session libexec/dbus-daemon-launch-helper; do
|
||||||
|
install_name_tool "$out/$exe" \
|
||||||
|
-change "@rpath/libdbus-1.3.dylib" "$lib/lib/libdbus-1.3.dylib"
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
# It's executed from $lib by absolute path
|
# It's executed from $lib by absolute path
|
||||||
moveToOutput bin/dbus-launch "$lib"
|
moveToOutput bin/dbus-launch "$lib"
|
||||||
|
|||||||
@@ -11,11 +11,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "djvulibre";
|
pname = "djvulibre";
|
||||||
version = "3.5.29";
|
version = "3.5.30";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/djvu/djvulibre-${finalAttrs.version}.tar.gz";
|
url = "mirror://sourceforge/djvu/djvulibre-${finalAttrs.version}.tar.gz";
|
||||||
hash = "sha256-07SwOuK9yoUWo2726ye3d/BSjJ7aJnRdmWKCSj/f7M8=";
|
hash = "sha256-7l5FfUz+vlZvlLmeXj08x/XHndt0HCrCui5FbwAylkQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
|
|||||||
@@ -7,13 +7,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "doctest";
|
pname = "doctest";
|
||||||
version = "2.5.0";
|
version = "2.5.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "doctest";
|
owner = "doctest";
|
||||||
repo = "doctest";
|
repo = "doctest";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-7t/eknv7VtHoBgcuJmI07x//HIyqzE9HUuH5u2y7X8A=";
|
hash = "sha256-4jW6xPFCFxk1l47EkSUVojhycrtluPhOc5Adf/25R7M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
@@ -27,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
changelog = "https://github.com/doctest/doctest/releases/tag/${finalAttrs.src.tag}";
|
||||||
homepage = "https://github.com/doctest/doctest";
|
homepage = "https://github.com/doctest/doctest";
|
||||||
description = "Fastest feature-rich C++11/14/17/20 single-header testing framework";
|
description = "Fastest feature-rich C++11/14/17/20 single-header testing framework";
|
||||||
platforms = lib.platforms.all;
|
platforms = lib.platforms.all;
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
stdenv,
|
stdenv,
|
||||||
lib,
|
lib,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
fetchpatch,
|
|
||||||
cmake,
|
cmake,
|
||||||
ninja,
|
ninja,
|
||||||
ctestCheckHook,
|
ctestCheckHook,
|
||||||
@@ -11,34 +10,15 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "double-conversion";
|
pname = "double-conversion";
|
||||||
version = "3.3.1";
|
version = "3.4.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "google";
|
owner = "google";
|
||||||
repo = "double-conversion";
|
repo = "double-conversion";
|
||||||
rev = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
sha256 = "sha256-M80H+azCzQYa4/gBLWv5GNNhEuHsH7LbJ/ajwmACnrM=";
|
hash = "sha256-gxaPqQ51RyXZaTHkvh4RBpedPopcRiuWDoT+PPbI1uw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Fix the build with CMake 4.
|
|
||||||
(fetchpatch {
|
|
||||||
name = "double-conversion-fix-cmake-4-1.patch";
|
|
||||||
url = "https://github.com/google/double-conversion/commit/101e1ba89dc41ceb75090831da97c43a76cd2906.patch";
|
|
||||||
hash = "sha256-VRmuNXdzt/I+gWbz5mwWkx5IGn8Vsl9WkdwRsuwZdkU=";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
name = "double-conversion-fix-cmake-4-2.patch";
|
|
||||||
url = "https://github.com/google/double-conversion/commit/0604b4c18815aadcf7f4b78dfa6bfcb91a634ed7.patch";
|
|
||||||
hash = "sha256-cJBp1ou1O/bMQ/7kvcX52dWbUdhmPfQ9aWmEhQdyhis=";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
name = "double-conversion-add-pkg-config.patch";
|
|
||||||
url = "https://github.com/google/double-conversion/commit/ddfd18c58ecc32fc74afc1083bb8774240b54efb.patch";
|
|
||||||
hash = "sha256-/pKCL19vS8fNwCm27yTNP+32ApHTH5dEGpnsMI11Lf4=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
"dev"
|
"dev"
|
||||||
@@ -68,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
pkgConfigModules = [ "double-conversion" ];
|
pkgConfigModules = [ "double-conversion" ];
|
||||||
|
changelog = "https://github.com/google/double-conversion/blob/${finalAttrs.src.tag}/Changelog";
|
||||||
description = "Binary-decimal and decimal-binary routines for IEEE doubles";
|
description = "Binary-decimal and decimal-binary routines for IEEE doubles";
|
||||||
homepage = "https://github.com/google/double-conversion";
|
homepage = "https://github.com/google/double-conversion";
|
||||||
license = lib.licenses.bsd3;
|
license = lib.licenses.bsd3;
|
||||||
|
|||||||
@@ -16,13 +16,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "doxygen";
|
pname = "doxygen";
|
||||||
version = "1.16.1";
|
version = "1.17.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "doxygen";
|
owner = "doxygen";
|
||||||
repo = "doxygen";
|
repo = "doxygen";
|
||||||
tag = "Release_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
|
tag = "Release_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
|
||||||
hash = "sha256-MszJpYdXaC8BYK1lSV1LpJncKN1LrFoyJXZajpz0HIA=";
|
hash = "sha256-SSq/sFB9y2CFMeL58vgcHa2ulo+tPPUGT347ABoHoD4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# https://github.com/doxygen/doxygen/issues/10928#issuecomment-2179320509
|
# https://github.com/doxygen/doxygen/issues/10928#issuecomment-2179320509
|
||||||
|
|||||||
@@ -75,20 +75,17 @@ let
|
|||||||
glib
|
glib
|
||||||
];
|
];
|
||||||
|
|
||||||
pythonPath =
|
pythonPath = with python3.pkgs; [
|
||||||
with python3.pkgs;
|
b2sdk
|
||||||
[
|
boto3
|
||||||
b2sdk
|
idna
|
||||||
boto3
|
pygobject3
|
||||||
idna
|
fasteners
|
||||||
pygobject3
|
paramiko
|
||||||
fasteners
|
pexpect
|
||||||
paramiko
|
# Currently marked as broken.
|
||||||
pexpect
|
# pydrive2
|
||||||
# Currently marked as broken.
|
];
|
||||||
# pydrive2
|
|
||||||
]
|
|
||||||
++ paramiko.optional-dependencies.invoke;
|
|
||||||
|
|
||||||
nativeCheckInputs = [
|
nativeCheckInputs = [
|
||||||
gnupg # Add 'gpg' to PATH.
|
gnupg # Add 'gpg' to PATH.
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
stdenv,
|
stdenv,
|
||||||
buildPackages,
|
buildPackages,
|
||||||
fetchurl,
|
fetchurl,
|
||||||
fetchpatch,
|
|
||||||
pkg-config,
|
pkg-config,
|
||||||
libuuid,
|
libuuid,
|
||||||
gettext,
|
gettext,
|
||||||
@@ -20,25 +19,15 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "e2fsprogs";
|
pname = "e2fsprogs";
|
||||||
version = "1.47.3";
|
version = "1.47.4";
|
||||||
|
|
||||||
__structuredAttrs = true;
|
__structuredAttrs = true;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz";
|
url = "mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz";
|
||||||
hash = "sha256-hX5u+AD+qiu0V4+8gQIUvl08iLBy6lPFOEczqWVzcyk=";
|
hash = "sha256-/VvziMvb4Aaj07MY2YOylIOCRArMhah/Hn0QhlPo2ws=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Upstream patch that fixes musl build (and probably others).
|
|
||||||
# Should be included in next release after 1.47.3.
|
|
||||||
(fetchpatch {
|
|
||||||
name = "stdio-portability.patch";
|
|
||||||
url = "https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/patch/?id=f79abd8554e600eacc2a7c864a8332b670c9e262";
|
|
||||||
hash = "sha256-zZ7zmSMTwGyS3X3b/D/mVG0bV2ul5xtY5DJx9YUvQO8=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
# fuse2fs adds 14mb of dependencies
|
# fuse2fs adds 14mb of dependencies
|
||||||
outputs = [
|
outputs = [
|
||||||
"bin"
|
"bin"
|
||||||
|
|||||||
@@ -28,11 +28,11 @@
|
|||||||
# TODO: Look at the hardcoded paths to kernel, modules etc.
|
# TODO: Look at the hardcoded paths to kernel, modules etc.
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "elfutils";
|
pname = "elfutils";
|
||||||
version = "0.194";
|
version = "0.195";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://sourceware.org/elfutils/ftp/${finalAttrs.version}/elfutils-${finalAttrs.version}.tar.bz2";
|
url = "https://sourceware.org/elfutils/ftp/${finalAttrs.version}/elfutils-${finalAttrs.version}.tar.bz2";
|
||||||
hash = "sha256-CeL/Az05uqiziKLX+8U5C/3pmuO3xnx9qvdDP7zw8B4=";
|
hash = "sha256-N2Kf338fPcKBjhOPyiuAlBd9bC0PcB07tlClYSGNwCY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
@@ -57,13 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
|
url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
|
||||||
sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0=";
|
sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0=";
|
||||||
})
|
})
|
||||||
(fetchpatch {
|
|
||||||
name = "fix-aarch64_attributes.patch";
|
|
||||||
url = "https://sourceware.org/git/?p=elfutils.git;a=patch;h=b27adc5262e807f341ca0a4910ce04294144f79a";
|
|
||||||
hash = "sha256-hksO5HXL9Jv5E4o2rI4NAgQp+4z+Lg7Wn/AdW7fpr0c=";
|
|
||||||
})
|
|
||||||
# https://patchwork.sourceware.org/project/elfutils/patch/20251205145241.1165646-1-arnout@bzzt.net/
|
|
||||||
./test-run-sysroot-reliability.patch
|
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ];
|
++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ];
|
||||||
|
|
||||||
|
|||||||
@@ -1,44 +0,0 @@
|
|||||||
commit 898804bed022d1ef26e5c0b12550f87fc86f29ed
|
|
||||||
Author: Arnout Engelen <arnout@bzzt.net>
|
|
||||||
Date: Thu Dec 4 21:42:40 2025 +0100
|
|
||||||
|
|
||||||
tests: improve reliability of run-sysroot.sh
|
|
||||||
|
|
||||||
Previously, the 'second' test would test the `RESOLVE_IN_ROOT` feature
|
|
||||||
when the current libc supports it, even when the currently running
|
|
||||||
kernel did not yet support it.
|
|
||||||
|
|
||||||
Signed-off-by: Arnout Engelen <arnout@bzzt.net>
|
|
||||||
|
|
||||||
diff --git a/tests/run-sysroot.sh b/tests/run-sysroot.sh
|
|
||||||
index fe302446..d2041e8a 100755
|
|
||||||
--- a/tests/run-sysroot.sh
|
|
||||||
+++ b/tests/run-sysroot.sh
|
|
||||||
@@ -46,10 +46,14 @@ TID 431185:
|
|
||||||
#8 0x0000aaaae56127f0 _start
|
|
||||||
EOF
|
|
||||||
|
|
||||||
-HAVE_OPENAT2=$(grep '^#define HAVE_OPENAT2_RESOLVE_IN_ROOT' \
|
|
||||||
- ${abs_builddir}/../config.h | awk '{print $3}')
|
|
||||||
+libc_has_openat2_resolve_in_root() {
|
|
||||||
+ grep '^#define HAVE_OPENAT2_RESOLVE_IN_ROOT' ${abs_builddir}/../config.h | awk '{print $3}'
|
|
||||||
+}
|
|
||||||
+kernel_has_openat2_resolve_in_root() {
|
|
||||||
+ printf "%s\n%s" "5.6.0" "$(uname -r)" | sort -V -C
|
|
||||||
+}
|
|
||||||
|
|
||||||
-if [[ "$HAVE_OPENAT2" = 1 ]]; then
|
|
||||||
+if libc_has_openat2_resolve_in_root && kernel_has_openat2_resolve_in_root; then
|
|
||||||
# Change the layout of files in sysroot to test symlink escape scenario
|
|
||||||
rm -f "${tmpdir}/sysroot/bin"
|
|
||||||
mkdir "${tmpdir}/sysroot/bin"
|
|
||||||
@@ -57,7 +61,8 @@ if [[ "$HAVE_OPENAT2" = 1 ]]; then
|
|
||||||
ln -s /bin/bash "${tmpdir}/sysroot/usr/bin/bash"
|
|
||||||
|
|
||||||
# Check that stack with --sysroot generates correct backtrace even if target
|
|
||||||
- # binary is actually absolute symlink pointing outside of sysroot directory
|
|
||||||
+ # binary is actually absolute symlink to be interpreted relative to the sysroot
|
|
||||||
+ # directory
|
|
||||||
testrun "${abs_top_builddir}"/src/stack --core "${tmpdir}/core.bash" \
|
|
||||||
--sysroot "${tmpdir}/sysroot" >"${tmpdir}/stack.out"
|
|
||||||
|
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
# files.
|
# files.
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "2.8.0";
|
version = "2.8.1";
|
||||||
tag = "R_${lib.replaceStrings [ "." ] [ "_" ] version}";
|
tag = "R_${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
url =
|
url =
|
||||||
with finalAttrs;
|
with finalAttrs;
|
||||||
"https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz";
|
"https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz";
|
||||||
hash = "sha256-o3v64KqXdb2FIevYXcRW1Ibw/zETj2yR/ZAupzJiRUI=";
|
hash = "sha256-ELGV7ngWCpCDiBgKj+NgPU6aEvR1X79fOBayOp11DaA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
{
|
{
|
||||||
fetchurl,
|
fetchurl,
|
||||||
fetchpatch,
|
|
||||||
stdenv,
|
stdenv,
|
||||||
lib,
|
lib,
|
||||||
gfortran,
|
gfortran,
|
||||||
@@ -22,24 +21,16 @@ assert lib.elem precision [
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "fftw-${precision}";
|
pname = "fftw-${precision}";
|
||||||
version = "3.3.10";
|
version = "3.3.11";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
urls = [
|
urls = [
|
||||||
"https://fftw.org/fftw-${finalAttrs.version}.tar.gz"
|
"https://fftw.org/fftw-${finalAttrs.version}.tar.gz"
|
||||||
"ftp://ftp.fftw.org/pub/fftw/fftw-${finalAttrs.version}.tar.gz"
|
"ftp://ftp.fftw.org/pub/fftw/fftw-${finalAttrs.version}.tar.gz"
|
||||||
];
|
];
|
||||||
hash = "sha256-VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc=";
|
hash = "sha256-VjDCTN6zOxMWEvfrSxqZNCNHVPnziP+GF0WNC+byOaE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
name = "remove_missing_FFTW3LibraryDepends.patch";
|
|
||||||
url = "https://github.com/FFTW/fftw3/pull/338/commits/f69fef7aa546d4477a2a3fd7f13fa8b2f6c54af7.patch";
|
|
||||||
hash = "sha256-lzX9kAHDMY4A3Td8necXwYLcN6j8Wcegi3A7OIECKeU=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
"dev"
|
"dev"
|
||||||
@@ -107,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
__structuredAttrs = true;
|
__structuredAttrs = true;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
changelog = "https://github.com/FFTW/fftw3/blob/fftw-${finalAttrs.version}/NEWS";
|
||||||
description = "Fastest Fourier Transform in the West library";
|
description = "Fastest Fourier Transform in the West library";
|
||||||
homepage = "https://www.fftw.org/";
|
homepage = "https://www.fftw.org/";
|
||||||
license = lib.licenses.gpl2Plus;
|
license = lib.licenses.gpl2Plus;
|
||||||
|
|||||||
@@ -13,13 +13,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "fluidsynth";
|
pname = "fluidsynth";
|
||||||
version = "2.5.3";
|
version = "2.5.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "FluidSynth";
|
owner = "FluidSynth";
|
||||||
repo = "fluidsynth";
|
repo = "fluidsynth";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-k8IHS6Mh1b1iMSuBg3svlf7A2dsg6VHEKqlDhvyJnbo=";
|
hash = "sha256-uL9K2Bc5PA6qm/QVFvEUDyGBst9L/sNP0+HculCWCZk=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -39,7 +39,7 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "freetype";
|
pname = "freetype";
|
||||||
version = "2.14.2";
|
version = "2.14.3";
|
||||||
|
|
||||||
src =
|
src =
|
||||||
let
|
let
|
||||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
in
|
in
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "mirror://savannah/freetype/freetype-${version}.tar.xz";
|
url = "mirror://savannah/freetype/freetype-${version}.tar.xz";
|
||||||
sha256 = "sha256-S2Lcq0ySChqGA2mTMiGBQ2LmmeJvVXklFtZx5v9VteE=";
|
sha256 = "sha256-NrxPHMQTM1No7mVsQq/KZcWjmH6HaMwozxG6d154Wl8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|||||||
@@ -5,18 +5,19 @@
|
|||||||
cmake,
|
cmake,
|
||||||
ninja,
|
ninja,
|
||||||
gtest,
|
gtest,
|
||||||
|
glibcLocales,
|
||||||
prometheus-cpp,
|
prometheus-cpp,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "gbenchmark";
|
pname = "gbenchmark";
|
||||||
version = "1.9.4";
|
version = "1.9.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "google";
|
owner = "google";
|
||||||
repo = "benchmark";
|
repo = "benchmark";
|
||||||
rev = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-P7wJcKkIBoWtN9FCRticpBzYbEZPq71a0iW/2oDTZRU=";
|
hash = "sha256-Mm4pG7zMB00iof32CxreoNBFnduPZTMp3reHMCIAFPQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
@@ -26,20 +27,30 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
|
|
||||||
buildInputs = [ gtest ];
|
buildInputs = [ gtest ];
|
||||||
|
|
||||||
|
nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [ glibcLocales ];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
(lib.cmakeBool "BENCHMARK_USE_BUNDLED_GTEST" false)
|
(lib.cmakeBool "BENCHMARK_USE_BUNDLED_GTEST" false)
|
||||||
(lib.cmakeBool "BENCHMARK_ENABLE_WERROR" false)
|
(lib.cmakeBool "BENCHMARK_ENABLE_WERROR" false)
|
||||||
];
|
];
|
||||||
|
|
||||||
# We ran into issues with gtest 1.8.5 conditioning on
|
env = {
|
||||||
# `#if __has_cpp_attribute(maybe_unused)`, which was, for some
|
# We ran into issues with gtest 1.8.5 conditioning on
|
||||||
# reason, going through even when C++14 was being used and
|
# `#if __has_cpp_attribute(maybe_unused)`, which was, for some
|
||||||
# breaking the build on Darwin by triggering errors about using
|
# reason, going through even when C++14 was being used and
|
||||||
# C++17 features.
|
# breaking the build on Darwin by triggering errors about using
|
||||||
#
|
# C++17 features.
|
||||||
# This might be a problem with our Clang, as it does not reproduce
|
#
|
||||||
# with Xcode, but we just work around it by silencing the warning.
|
# This might be a problem with our Clang, as it does not reproduce
|
||||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-c++17-attribute-extensions";
|
# with Xcode, but we just work around it by silencing the warning.
|
||||||
|
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-c++17-attribute-extensions";
|
||||||
|
}
|
||||||
|
// lib.optionalAttrs stdenv.hostPlatform.isLinux {
|
||||||
|
# For test:locale_impermeability_test
|
||||||
|
LANG = "en_US.UTF-8";
|
||||||
|
LC_ALL = "en_US.UTF-8";
|
||||||
|
LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive";
|
||||||
|
};
|
||||||
|
|
||||||
# Tests fail on 32-bit due to not enough precision
|
# Tests fail on 32-bit due to not enough precision
|
||||||
doCheck = stdenv.hostPlatform.is64bit;
|
doCheck = stdenv.hostPlatform.is64bit;
|
||||||
@@ -53,6 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
homepage = "https://github.com/google/benchmark";
|
homepage = "https://github.com/google/benchmark";
|
||||||
license = lib.licenses.asl20;
|
license = lib.licenses.asl20;
|
||||||
platforms = lib.platforms.linux ++ lib.platforms.darwin ++ lib.platforms.freebsd;
|
platforms = lib.platforms.linux ++ lib.platforms.darwin ++ lib.platforms.freebsd;
|
||||||
maintainers = [ ];
|
maintainers = with lib.maintainers; [ miniharinn ];
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
# Build time
|
# Build time
|
||||||
fetchurl,
|
fetchurl,
|
||||||
fetchpatch,
|
|
||||||
pkg-config,
|
pkg-config,
|
||||||
perl,
|
perl,
|
||||||
texinfo,
|
texinfo,
|
||||||
@@ -68,11 +67,11 @@ in
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
inherit pname;
|
inherit pname;
|
||||||
version = "17.1";
|
version = "17.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnu/gdb/gdb-${finalAttrs.version}.tar.xz";
|
url = "mirror://gnu/gdb/gdb-${finalAttrs.version}.tar.xz";
|
||||||
hash = "sha256-FJlvX3TJ9o9aVD/cRbyngAIH+R+SrupsLnkYIsfG2HY=";
|
hash = "sha256-HANsDXLks9H7XJTIhjKt1vnXb018TS6nk8EqnxmjIow=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch =
|
postPatch =
|
||||||
@@ -90,17 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./debug-info-from-env.patch
|
./debug-info-from-env.patch
|
||||||
|
|
||||||
(fetchurl {
|
|
||||||
name = "musl.patch";
|
|
||||||
url = "https://inbox.sourceware.org/gdb-patches/20260324164527.1446549-2-sunilkumar.dora@windriver.com/raw";
|
|
||||||
hash = "sha256-FC4DDVS4wtE/HXtbUqvkxu9+e7nE3DYi1zIuQP9yQO8=";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
name = "musl-aarch64.patch";
|
|
||||||
url = "https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=1ccc3f6a2e28fa1f3357826374cba165b3ba3ff7";
|
|
||||||
hash = "sha256-Q2oTo2b+9yNN3PSsxqgxV4/9/05uFE/JMLe1CPs9Y7I=";
|
|
||||||
})
|
|
||||||
]
|
]
|
||||||
++ optionals stdenv.hostPlatform.isDarwin [
|
++ optionals stdenv.hostPlatform.isDarwin [
|
||||||
./darwin-target-match.patch
|
./darwin-target-match.patch
|
||||||
|
|||||||
@@ -1,69 +0,0 @@
|
|||||||
From ab20ba112e6fa5117bfeadde199fdc6c18cbdfb5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: OPNA2608 <opna2608@protonmail.com>
|
|
||||||
Date: Mon, 12 Jan 2026 16:41:53 +0100
|
|
||||||
Subject: [PATCH] Look for external gtest build, if not building in-tree
|
|
||||||
|
|
||||||
---
|
|
||||||
CMakeLists.txt | 12 ++++++++++++
|
|
||||||
gtests/CMakeLists.txt | 8 +++-----
|
|
||||||
2 files changed, 15 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 1e7d3ec9..ecda9c53 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -321,6 +321,18 @@ if(ENABLE_GLSLANG_BINARIES)
|
|
||||||
add_subdirectory(StandAlone)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
+option(ALLOW_EXTERNAL_GTEST "Allows to build against installed googletest. This is unsupported if the commit isn't the one in known_good.json")
|
|
||||||
+set(GMOCK_TARGET gmock)
|
|
||||||
+if(NOT TARGET ${GMOCK_TARGET})
|
|
||||||
+ if(ALLOW_EXTERNAL_GTEST)
|
|
||||||
+ message(STATUS "Trying to find local googletest")
|
|
||||||
+ find_package(GTest)
|
|
||||||
+ if(TARGET GTest::gmock)
|
|
||||||
+ set(GMOCK_TARGET GTest::gmock)
|
|
||||||
+ endif()
|
|
||||||
+ endif()
|
|
||||||
+endif()
|
|
||||||
+
|
|
||||||
if(GLSLANG_TESTS)
|
|
||||||
enable_testing()
|
|
||||||
add_subdirectory(gtests)
|
|
||||||
diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt
|
|
||||||
index 27a5500c..21125775 100644
|
|
||||||
--- a/gtests/CMakeLists.txt
|
|
||||||
+++ b/gtests/CMakeLists.txt
|
|
||||||
@@ -32,7 +32,7 @@
|
|
||||||
# POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
|
|
||||||
if(GLSLANG_TESTS)
|
|
||||||
- if(TARGET gmock)
|
|
||||||
+ if(TARGET ${GMOCK_TARGET})
|
|
||||||
message(STATUS "Google Mock found - building tests")
|
|
||||||
|
|
||||||
set(TEST_SOURCES
|
|
||||||
@@ -76,9 +76,7 @@ if(GLSLANG_TESTS)
|
|
||||||
PRIVATE GLSLANG_TEST_BUILD=1)
|
|
||||||
target_include_directories(glslangtests PRIVATE
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}
|
|
||||||
- ${PROJECT_SOURCE_DIR}
|
|
||||||
- ${gmock_SOURCE_DIR}/include
|
|
||||||
- ${gtest_SOURCE_DIR}/include)
|
|
||||||
+ ${PROJECT_SOURCE_DIR})
|
|
||||||
|
|
||||||
if(ENABLE_OPT)
|
|
||||||
target_link_libraries(glslangtests
|
|
||||||
@@ -90,7 +88,7 @@ if(GLSLANG_TESTS)
|
|
||||||
glslang glslang-default-resource-limits
|
|
||||||
$<$<AND:$<CXX_COMPILER_ID:GNU>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9.0>>:stdc++fs>)
|
|
||||||
|
|
||||||
- target_link_libraries(glslangtests PRIVATE ${LIBRARIES} gmock)
|
|
||||||
+ target_link_libraries(glslangtests PRIVATE ${LIBRARIES} ${GMOCK_TARGET})
|
|
||||||
|
|
||||||
# The TARGET_RUNTIME_DLL_DIRS feature requires CMake 3.27 or greater.
|
|
||||||
if(WIN32 AND BUILD_SHARED_LIBS AND CMAKE_VERSION VERSION_LESS "3.27")
|
|
||||||
--
|
|
||||||
2.51.2
|
|
||||||
|
|
||||||
@@ -12,21 +12,15 @@
|
|||||||
}:
|
}:
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "glslang";
|
pname = "glslang";
|
||||||
version = "16.2.0";
|
version = "16.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "KhronosGroup";
|
owner = "KhronosGroup";
|
||||||
repo = "glslang";
|
repo = "glslang";
|
||||||
tag = finalAttrs.version;
|
tag = finalAttrs.version;
|
||||||
hash = "sha256-2uWnZZNGdZorHaiLzMb/rpM6bL9oBClKqiFkUH3krJQ=";
|
hash = "sha256-wclcJ0NfqFXSUHGVsxjn2I8XxWbrkzOB4WXqsN1XtmE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Allow building against our already-built gtest, without eating a rebuild
|
|
||||||
# https://github.com/KhronosGroup/glslang/pull/4140
|
|
||||||
./external-gtest.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"bin"
|
"bin"
|
||||||
"out"
|
"out"
|
||||||
|
|||||||
@@ -11,11 +11,11 @@
|
|||||||
version ?
|
version ?
|
||||||
# This is a workaround for update-source-version to be able to update this
|
# This is a workaround for update-source-version to be able to update this
|
||||||
let
|
let
|
||||||
_version = "0-unstable-2026-03-05";
|
_version = "0-unstable-2026-04-01";
|
||||||
in
|
in
|
||||||
_version,
|
_version,
|
||||||
rev ? "d8c2f07d653520568da7cace755a87dad241b72d",
|
rev ? "6e8dcdebbadf4f8aa75e6a4b6e0bdf89dce1513a",
|
||||||
hash ? "sha256-3AfExm7NL5GJXyC5JCPbGC70D59doRfIZIgpt6MLy9Y=",
|
hash ? "sha256-BTPD8WM1pVAMkFDlHekMdWFGyf63KdhKkKwsqikqoBQ=",
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
buildPackages,
|
|
||||||
fetchurl,
|
fetchurl,
|
||||||
zlib,
|
zlib,
|
||||||
libtasn1,
|
libtasn1,
|
||||||
@@ -9,7 +8,6 @@
|
|||||||
pkg-config,
|
pkg-config,
|
||||||
perl,
|
perl,
|
||||||
gmp,
|
gmp,
|
||||||
automake,
|
|
||||||
libidn2,
|
libidn2,
|
||||||
libiconv,
|
libiconv,
|
||||||
texinfo,
|
texinfo,
|
||||||
@@ -167,10 +165,6 @@ stdenv.mkDerivation rec {
|
|||||||
pkg-config
|
pkg-config
|
||||||
texinfo
|
texinfo
|
||||||
]
|
]
|
||||||
++ [
|
|
||||||
buildPackages.autoconf269
|
|
||||||
automake
|
|
||||||
]
|
|
||||||
++ lib.optionals doCheck [
|
++ lib.optionals doCheck [
|
||||||
which
|
which
|
||||||
net-tools
|
net-tools
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "gpgme";
|
pname = "gpgme";
|
||||||
version = "2.0.1";
|
version = "2.1.0";
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnupg/gpgme/gpgme-${finalAttrs.version}.tar.bz2";
|
url = "mirror://gnupg/gpgme/gpgme-${finalAttrs.version}.tar.bz2";
|
||||||
hash = "sha256-ghqwaVyELqtRdSqBmAySsEEMfq3QQQP3kdXSpSZ4SWY=";
|
hash = "sha256-hBxepT/CYln0+/DovemC3qG4ocoMt35oHIKwUFZr+Ss=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
@@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "https://gnupg.org/software/gpgme/index.html";
|
homepage = "https://gnupg.org/software/gpgme/index.html";
|
||||||
changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;f=NEWS;hb=gpgme-${finalAttrs.version}";
|
changelog = "https://dev.gnupg.org/source/gpgme/browse/master/NEWS;gpgme-${finalAttrs.version}?as=remarkup";
|
||||||
description = "Library for making GnuPG easier to use";
|
description = "Library for making GnuPG easier to use";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
|
GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
|
||||||
|
|||||||
@@ -10,11 +10,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "gpgmepp";
|
pname = "gpgmepp";
|
||||||
version = "2.0.0";
|
version = "2.1.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnupg/gpgmepp/gpgmepp-${finalAttrs.version}.tar.xz";
|
url = "mirror://gnupg/gpgmepp/gpgmepp-${finalAttrs.version}.tar.xz";
|
||||||
hash = "sha256-1HlgScBnCKJvMJb3SO8JU0fho8HlcFYXAf6VLD9WU4I=";
|
hash = "sha256-V/gERo8CBFBLFyxrE5ywUSS0JjvnrVFJMsfExQYqFuI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|||||||
@@ -48,8 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
hash = "sha256-dOKBl5W2r/QxrqyYPWOpyJaO6roqLrp9+LpMe0Hnz9g=";
|
hash = "sha256-dOKBl5W2r/QxrqyYPWOpyJaO6roqLrp9+LpMe0Hnz9g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = lib.optionals stdenv.isLinux [
|
patches = [
|
||||||
# TODO: apply everywhere on rebuild
|
|
||||||
# This revert a upstream refactor in continuous rendering mode, but this
|
# This revert a upstream refactor in continuous rendering mode, but this
|
||||||
# causes a big performance regression for big manpages like
|
# causes a big performance regression for big manpages like
|
||||||
# `man 5 configuration.nix`.
|
# `man 5 configuration.nix`.
|
||||||
|
|||||||
@@ -95,11 +95,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
hash = "sha256-Ub2fYMfSOmZaVWxzZMIfsuTiglZrPn4JJFXo+RAzCJM=";
|
hash = "sha256-Ub2fYMfSOmZaVWxzZMIfsuTiglZrPn4JJFXo+RAzCJM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = lib.optional stdenv.hostPlatform.is32bit (fetchpatch {
|
patches = [
|
||||||
name = "fix-32bit-VkImage-null.patch";
|
(fetchpatch {
|
||||||
url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/10d43de8f4f942cb591ada3103474bd7213425f1.patch";
|
name = "fix-32bit-VkImage-null.patch";
|
||||||
hash = "sha256-DJIL6M3XcsjBoMO77OxNi84d1DxAphAfot3N7Nq1QqQ=";
|
url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/10d43de8f4f942cb591ada3103474bd7213425f1.patch";
|
||||||
});
|
hash = "sha256-DJIL6M3XcsjBoMO77OxNi84d1DxAphAfot3N7Nq1QqQ=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
depsBuildBuild = [
|
depsBuildBuild = [
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|||||||
@@ -10,7 +10,10 @@
|
|||||||
{
|
{
|
||||||
stdenv,
|
stdenv,
|
||||||
lib,
|
lib,
|
||||||
|
applyPatches,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
|
fetchFromGitLab,
|
||||||
|
fetchpatch2,
|
||||||
# For tests
|
# For tests
|
||||||
testers,
|
testers,
|
||||||
runCommand,
|
runCommand,
|
||||||
@@ -26,7 +29,7 @@
|
|||||||
numactl,
|
numactl,
|
||||||
writeText,
|
writeText,
|
||||||
# Processing, video codecs, containers
|
# Processing, video codecs, containers
|
||||||
ffmpeg_7-full,
|
ffmpeg_8-full,
|
||||||
nv-codec-headers,
|
nv-codec-headers,
|
||||||
libogg,
|
libogg,
|
||||||
x264,
|
x264,
|
||||||
@@ -85,14 +88,35 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "1.10.2";
|
version = "1.11.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = applyPatches {
|
||||||
owner = "HandBrake";
|
src = fetchFromGitHub {
|
||||||
repo = "HandBrake";
|
owner = "HandBrake";
|
||||||
# uses version commit for logic in version.txt
|
repo = "HandBrake";
|
||||||
rev = "dddf75f756e56d2b8dbb0609175bc12047a4841d";
|
# uses version commit for logic in version.txt
|
||||||
hash = "sha256-CIMpJDJ0IIz95f3/zxeQqpCFpHWEmdgA+VaaUDY516A=";
|
rev = "4ce99a885cde39b3511016efdb5124726819defb";
|
||||||
|
hash = "sha256-oWXNiRK0wbmINnjM3GrOIawcSULTuy3yANfgW8li9F0=";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Only needed so the subsequent patch applies
|
||||||
|
(fetchpatch2 {
|
||||||
|
url = "https://github.com/HandBrake/HandBrake/commit/c8e16778a330881af36fa32004f887bd73874d15.patch";
|
||||||
|
hash = "sha256-i3/X9opDzsZIO7bjLHHZltuQH93uENRF0t7FP7DDdBM=";
|
||||||
|
})
|
||||||
|
# Update x265 submodule to v4.2, drop in next release
|
||||||
|
(fetchpatch2 {
|
||||||
|
url = "https://github.com/HandBrake/HandBrake/commit/432514bf839e7280511e4a7afc35fb4868ef4d0b.patch";
|
||||||
|
excludes = [
|
||||||
|
"contrib/x265/module.defs"
|
||||||
|
"contrib/x265_8bit/module.defs"
|
||||||
|
"contrib/x265_10bit/module.defs"
|
||||||
|
"contrib/x265_12bit/module.defs"
|
||||||
|
];
|
||||||
|
hash = "sha256-xwIY1pO9mKbrQFjQCENuvntIoiZTHeUVg8axrl3zxxo=";
|
||||||
|
})
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Handbrake maintains a set of ffmpeg patches. In particular, these
|
# Handbrake maintains a set of ffmpeg patches. In particular, these
|
||||||
@@ -100,70 +124,67 @@ let
|
|||||||
# https://github.com/HandBrake/HandBrake/issues/4029
|
# https://github.com/HandBrake/HandBrake/issues/4029
|
||||||
# base ffmpeg version is specified in:
|
# base ffmpeg version is specified in:
|
||||||
# https://github.com/HandBrake/HandBrake/blob/master/contrib/ffmpeg/module.defs
|
# https://github.com/HandBrake/HandBrake/blob/master/contrib/ffmpeg/module.defs
|
||||||
ffmpeg-version = "7.1.1";
|
ffmpeg-hb = ffmpeg_8-full.overrideAttrs (old: {
|
||||||
ffmpeg-hb =
|
patches = (old.patches or [ ]) ++ [
|
||||||
(ffmpeg_7-full.override {
|
"${src}/contrib/ffmpeg/A01-mov-read-name-track-tag-written-by-movenc.patch"
|
||||||
version = ffmpeg-version;
|
"${src}/contrib/ffmpeg/A02-movenc-write-3gpp-track-titl-tag.patch"
|
||||||
hash = "sha256-GyS8imOqfOUPxXrzCiQtzCQIIH6bvWmQAB0fKUcRsW4=";
|
"${src}/contrib/ffmpeg/A03-mov-read-3gpp-udta-tags.patch"
|
||||||
}).overrideAttrs
|
"${src}/contrib/ffmpeg/A04-movenc-write-3gpp-track-names-tags-for-all-available.patch"
|
||||||
(old: {
|
"${src}/contrib/ffmpeg/A05-avformat-mov-add-support-audio-fallback-track-ref.patch"
|
||||||
patches = (old.patches or [ ]) ++ [
|
"${src}/contrib/ffmpeg/A06-avformat-mov-read-and-write-additional-iTunes-style-.patch"
|
||||||
"${src}/contrib/ffmpeg/A01-mov-read-name-track-tag-written-by-movenc.patch"
|
"${src}/contrib/ffmpeg/A07-avformat-movenc-write-iTunEXTC-and-iTunMOVI-metadata.patch"
|
||||||
"${src}/contrib/ffmpeg/A02-movenc-write-3gpp-track-titl-tag.patch"
|
"${src}/contrib/ffmpeg/A08-dvdsubdec-fix-processing-of-partial-packets.patch"
|
||||||
"${src}/contrib/ffmpeg/A03-mov-read-3gpp-udta-tags.patch"
|
"${src}/contrib/ffmpeg/A09-dvdsubdec-return-number-of-bytes-used.patch"
|
||||||
"${src}/contrib/ffmpeg/A04-movenc-write-3gpp-track-names-tags-for-all-available.patch"
|
"${src}/contrib/ffmpeg/A10-dvdsubdec-use-pts-of-initial-packet.patch"
|
||||||
"${src}/contrib/ffmpeg/A05-avformat-mov-add-support-audio-fallback-track-ref.patch"
|
"${src}/contrib/ffmpeg/A11-dvdsubdec-add-an-option-to-output-subtitles-with-emp.patch"
|
||||||
"${src}/contrib/ffmpeg/A06-dvdsubdec-fix-processing-of-partial-packets.patch"
|
"${src}/contrib/ffmpeg/A12-ccaption_dec-fix-pts-in-real_time-mode.patch"
|
||||||
"${src}/contrib/ffmpeg/A07-dvdsubdec-return-number-of-bytes-used.patch"
|
"${src}/contrib/ffmpeg/A13-avformat-matroskaenc-return-error-if-aac-extradata-c.patch"
|
||||||
"${src}/contrib/ffmpeg/A08-dvdsubdec-use-pts-of-initial-packet.patch"
|
"${src}/contrib/ffmpeg/A14-Expose-the-unmodified-Dolby-Vision-RPU-T35-buffers.patch"
|
||||||
"${src}/contrib/ffmpeg/A09-dvdsubdec-add-an-option-to-output-subtitles-with-emp.patch"
|
"${src}/contrib/ffmpeg/A15-lavc-pgssubdec-Add-graphic-plane-and-cropping.patch"
|
||||||
"${src}/contrib/ffmpeg/A10-ccaption_dec-fix-pts-in-real_time-mode.patch"
|
"${src}/contrib/ffmpeg/A16-libavcodec-qsvenc.c-update-has_b_frames-value-after-.patch"
|
||||||
"${src}/contrib/ffmpeg/A11-avformat-matroskaenc-return-error-if-aac-extradata-c.patch"
|
"${src}/contrib/ffmpeg/A17-qsv-enable-av1-scc.patch"
|
||||||
"${src}/contrib/ffmpeg/A12-videotoolbox-disable-H.264-10-bit-on-Intel-macOS-it-.patch"
|
"${src}/contrib/ffmpeg/A18-fixed-BT2020-BT709-conversion-via-VPP.patch"
|
||||||
|
"${src}/contrib/ffmpeg/A19-videotoolbox-disable-H.264-10-bit-on-Intel-macOS-it-.patch"
|
||||||
# patch to fix <https://github.com/HandBrake/HandBrake/issues/5011>
|
"${src}/contrib/ffmpeg/A20-videotoolbox-speedup-decoding.patch"
|
||||||
# commented out because it causes ffmpeg's filter-pixdesc-p010le test to fail.
|
"${src}/contrib/ffmpeg/A21-Revert-avcodec-amfenc-GPU-driver-version-check.patch"
|
||||||
# "${src}/contrib/ffmpeg/A13-libswscale-fix-yuv420p-to-p01xle-color-conversion-bu.patch"
|
"${src}/contrib/ffmpeg/A22-fix-d3d11-static-pool-size-error.patch"
|
||||||
|
"${src}/contrib/ffmpeg/A23-movenc-set-the-chapters-track-language-to-the-same-a.patch"
|
||||||
"${src}/contrib/ffmpeg/A14-hevc_mp4toannexb.c-fix-qsv-decode-of-10bit-hdr.patch"
|
"${src}/contrib/ffmpeg/A24-movenc-use-version-2-audio-descriptor-for-2-channels.patch"
|
||||||
"${src}/contrib/ffmpeg/A15-Expose-the-unmodified-Dolby-Vision-RPU-T35-buffers.patch"
|
];
|
||||||
"${src}/contrib/ffmpeg/A16-avcodec-amfenc-Add-support-for-on-demand-key-frames.patch"
|
});
|
||||||
"${src}/contrib/ffmpeg/A17-avcodec-amfenc-properly-set-primaries-transfer-and-m.patch"
|
|
||||||
"${src}/contrib/ffmpeg/A18-libavcodec-qsvenc-update-has_b_frames-value.patch"
|
|
||||||
"${src}/contrib/ffmpeg/A19-libavcodec-qsv-enable-av1-scc.patch"
|
|
||||||
"${src}/contrib/ffmpeg/A20-Revert-avcodec-amfenc-GPU-driver-version-check.patch"
|
|
||||||
"${src}/contrib/ffmpeg/A21-lavc-pgssubdec-Add-graphic-plane-and-cropping.patch"
|
|
||||||
"${src}/contrib/ffmpeg/A22-avformat-mov-read-and-write-additional-iTunes-style-.patch"
|
|
||||||
"${src}/contrib/ffmpeg/A23-avformat-movenc-write-iTunEXTC-and-iTunMOVI-metadata.patch"
|
|
||||||
"${src}/contrib/ffmpeg/A24-AV1-videotoolbox.patch"
|
|
||||||
"${src}/contrib/ffmpeg/A25-videotoolbox-speedup-decoding.patch"
|
|
||||||
"${src}/contrib/ffmpeg/A28-enable-av1_mf-encoder.patch"
|
|
||||||
"${src}/contrib/ffmpeg/A30-qsv-fixed-BT2020-BT709-conversion.patch"
|
|
||||||
"${src}/contrib/ffmpeg/A31-Parse-EAC3-Atmos-ComplexityIndex-for-MP4-remuxing.patch"
|
|
||||||
];
|
|
||||||
});
|
|
||||||
|
|
||||||
x265-hb = x265.overrideAttrs (old: {
|
x265-hb = x265.overrideAttrs (old: {
|
||||||
version = "4.1";
|
version = "4.2";
|
||||||
sourceRoot = "x265_4.1/source";
|
sourceRoot = "x265_4.2/source";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://bitbucket.org/multicoreware/x265_git/downloads/x265_4.1.tar.gz";
|
url = "https://bitbucket.org/multicoreware/x265_git/downloads/x265_4.2.tar.gz";
|
||||||
hash = "sha256-oxaZxqiYBrdLAVHl5qffZd5LSQUEgv5ev4pDedevjyk=";
|
hash = "sha256-QLHqBFPgMJ8OupNODd9TP49ilZZmeeiJTo8cHI1eEhA=";
|
||||||
};
|
};
|
||||||
# nixpkgs' x265 sourceRoot is x265-.../source whereas handbrake's x265 patches
|
# nixpkgs' x265 sourceRoot is x265-.../source whereas handbrake's x265 patches
|
||||||
# are written with respect to the parent directory instead of that source directory.
|
# are written with respect to the parent directory instead of that source directory.
|
||||||
# patches which don't cleanly apply are commented out.
|
# patches which don't cleanly apply are commented out.
|
||||||
postPatch = (old.postPatch or "") + ''
|
postPatch = (old.postPatch or "") + ''
|
||||||
pushd ..
|
pushd ..
|
||||||
patch -p1 < ${src}/contrib/x265/A01-Do-not-set-thread-priority-on-Windows.patch
|
for p in ${src}/contrib/x265/*.patch; do
|
||||||
patch -p1 < ${src}/contrib/x265/A02-Apple-Silicon-tuning.patch
|
patch -p1 < "$p"
|
||||||
patch -p1 < ${src}/contrib/x265/A03-Implement-ambient-viewing-environment-sei.patch
|
done
|
||||||
patch -p1 < ${src}/contrib/x265/A04-add-new-matrix-coefficients-from-H.273-v3.patch
|
popd
|
||||||
patch -p1 < ${src}/contrib/x265/A05-Fix-Dolby-Vision-RPU-memory-management.patch
|
'';
|
||||||
# patch -p1 < ${src}/contrib/x265/A06-Update-version-strings.patch
|
});
|
||||||
patch -p1 < ${src}/contrib/x265/A07-Fix-macOS-cross-compilation.patch
|
|
||||||
# patch -p1 < ${src}/contrib/x265/A08-Fix-inconsistent-bitrate-in-second-pass.patch
|
svt-av1-hb = svt-av1.overrideAttrs (old: rec {
|
||||||
patch -p1 < ${src}/contrib/x265/A09-Ensuring-the-mvdLX-is-compliant.patch
|
version = "4.0.1";
|
||||||
|
src = fetchFromGitLab {
|
||||||
|
owner = "AOMediaCodec";
|
||||||
|
repo = "SVT-AV1";
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-7krVkLZxgolqPTkuyKAx07BekAPacftcGZ44lQTQFZQ=";
|
||||||
|
};
|
||||||
|
postPatch = (old.postPatch or "") + ''
|
||||||
|
pushd ..
|
||||||
|
for p in ${src}/contrib/svt-av1/*.patch; do
|
||||||
|
patch -p1 < "$p"
|
||||||
|
done
|
||||||
popd
|
popd
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
@@ -268,7 +289,7 @@ let
|
|||||||
libvpx
|
libvpx
|
||||||
libxml2
|
libxml2
|
||||||
speex
|
speex
|
||||||
svt-av1
|
svt-av1-hb
|
||||||
x264
|
x264
|
||||||
x265-hb
|
x265-hb
|
||||||
xz
|
xz
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "hunspell";
|
pname = "hunspell";
|
||||||
version = "1.7.2";
|
version = "1.7.3";
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"bin"
|
"bin"
|
||||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
owner = "hunspell";
|
owner = "hunspell";
|
||||||
repo = "hunspell";
|
repo = "hunspell";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
sha256 = "sha256-x2FXxnVIqsf5/UEQcvchAndXBv/3mW8Z55djQAFgNA8=";
|
hash = "sha256-NoLlH+4Hb6w+HYl2fSBzroav1Pb3GojFSTJGBxlteBM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch ];
|
patches = [ ./0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch ];
|
||||||
|
|||||||
@@ -88,13 +88,13 @@ in
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "imagemagick";
|
pname = "imagemagick";
|
||||||
version = "7.1.2-23";
|
version = "7.1.2-24";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ImageMagick";
|
owner = "ImageMagick";
|
||||||
repo = "ImageMagick";
|
repo = "ImageMagick";
|
||||||
tag = finalAttrs.version;
|
tag = finalAttrs.version;
|
||||||
hash = "sha256-zYk75q+EyWq5g/AHFU6v8a7gye0aDAEe/ZZvjqR9ZTc=";
|
hash = "sha256-oSH0dsQ3cuFNYJIIr6LHbv82FbFxxcmkjQ5csTNsYCA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "ld64";
|
pname = "ld64";
|
||||||
version = "956.6";
|
version = "957.1";
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
owner = "apple-oss-distributions";
|
owner = "apple-oss-distributions";
|
||||||
repo = "ld64";
|
repo = "ld64";
|
||||||
tag = "ld64-${finalAttrs.version}";
|
tag = "ld64-${finalAttrs.version}";
|
||||||
hash = "sha256-2VlBjlCZ+ZPKGZ0f5UuG3jJTLZIBXf8IZOiD6snheh4=";
|
hash = "sha256-KUkEKz2jQq815ls25u0JMYmad4cN9PS/nC3E5eV19co=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "libadwaita";
|
pname = "libadwaita";
|
||||||
version = "1.9.0";
|
version = "1.9.1";
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
owner = "GNOME";
|
owner = "GNOME";
|
||||||
repo = "libadwaita";
|
repo = "libadwaita";
|
||||||
tag = finalAttrs.version;
|
tag = finalAttrs.version;
|
||||||
hash = "sha256-JAKP8CjLCKGZvHoB26ih/J3xAru4wiVf/ObG0L8r4pY=";
|
hash = "sha256-Oy3WcsymNbbmAacm5hEOrorI1wKXjSp063mh4jCJRAE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
depsBuildBuild = [
|
depsBuildBuild = [
|
||||||
|
|||||||
@@ -7,13 +7,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "libaec";
|
pname = "libaec";
|
||||||
version = "1.1.6";
|
version = "1.1.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Deutsches-Klimarechenzentrum";
|
owner = "Deutsches-Klimarechenzentrum";
|
||||||
repo = "libaec";
|
repo = "libaec";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-cxDP+JNwokxgzH9hO2zw+rIcz8XG7E8ujbAbWpgUEW8=";
|
hash = "sha256-aBm+CXCq7sdJb6Qq9sNuTzNj0nRwTJI20HsqUg1Qi/8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|||||||
@@ -44,9 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
fribidi
|
fribidi
|
||||||
harfbuzz
|
harfbuzz
|
||||||
]
|
]
|
||||||
++ lib.optional fontconfigSupport fontconfig
|
++ lib.optional fontconfigSupport fontconfig;
|
||||||
# TODO: remove dep after branchoff (in darwin stdenv)
|
|
||||||
++ lib.optional stdenv.hostPlatform.isDarwin libiconv.out;
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Portable ASS/SSA subtitle renderer";
|
description = "Portable ASS/SSA subtitle renderer";
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
|
fetchpatch,
|
||||||
autoreconfHook,
|
autoreconfHook,
|
||||||
imlib2,
|
imlib2,
|
||||||
libxext,
|
libxext,
|
||||||
@@ -23,6 +24,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
hash = "sha256-N0Lfi0d4kjxirEbIjdeearYWvStkKMyV6lgeyNKXcVw=";
|
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 = [
|
nativeBuildInputs = [
|
||||||
autoreconfHook
|
autoreconfHook
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
lib,
|
lib,
|
||||||
buildPackages,
|
buildPackages,
|
||||||
fetchurl,
|
fetchurl,
|
||||||
fetchpatch,
|
|
||||||
runtimeShell,
|
runtimeShell,
|
||||||
pkgsBuildHost,
|
pkgsBuildHost,
|
||||||
usePam ? !isStatic,
|
usePam ? !isStatic,
|
||||||
@@ -31,11 +30,11 @@ assert usePam -> pam != null;
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libcap";
|
pname = "libcap";
|
||||||
version = "2.77";
|
version = "2.78";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz";
|
url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz";
|
||||||
hash = "sha256-iXvBi0Svwmxw54zq09uzHhVKzCS+4IWloJB5qI2/b1I=";
|
hash = "sha256-DWIeVi/ZMsz2e5Zg+wGORopoPXuCdUHfJ4EyKMmWuxE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
@@ -76,13 +75,6 @@ stdenv.mkDerivation rec {
|
|||||||
"LIBCSTATIC=yes"
|
"LIBCSTATIC=yes"
|
||||||
];
|
];
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://git.kernel.org/pub/scm/libs/libcap/libcap.git/patch/?id=d628b3bfe40338d4efff6b0ae50f250a0eb884c7";
|
|
||||||
hash = "sha256-Eiv/BOJZkduL+hOEJd8K1LQd9wvOeCKchE2GaLcerVc=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs ./progs/mkcapshdoc.sh
|
patchShebangs ./progs/mkcapshdoc.sh
|
||||||
|
|
||||||
|
|||||||
@@ -15,14 +15,14 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
version = "1.0.18";
|
version = "1.0.19";
|
||||||
pname = "libde265";
|
pname = "libde265";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "strukturag";
|
owner = "strukturag";
|
||||||
repo = "libde265";
|
repo = "libde265";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-N6K82ElrzrMSNKfPTDsc5onrxucIJ8niwFgbaEPPd2I=";
|
hash = "sha256-77OIclR2TwOigo/k5ps9S0TrDNvEjf290PqZyqBcydo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|||||||
@@ -8,11 +8,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "libedit";
|
pname = "libedit";
|
||||||
version = "20251016-3.1";
|
version = "20260508-3.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://thrysoee.dk/editline/libedit-${finalAttrs.version}.tar.gz";
|
url = "https://thrysoee.dk/editline/libedit-${finalAttrs.version}.tar.gz";
|
||||||
hash = "sha256-ITYrAGU7v8HHH3GnV42ma1tSA1WdQxNNLddxnjE84EE=";
|
hash = "sha256-kfQtZXHdjZL67dE0ETTOWrygxdC0s1KBQYbTPysRJy4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
|
|||||||
@@ -27,14 +27,14 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "libei";
|
pname = "libei";
|
||||||
version = "1.5.0";
|
version = "1.6.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.freedesktop.org";
|
domain = "gitlab.freedesktop.org";
|
||||||
owner = "libinput";
|
owner = "libinput";
|
||||||
repo = "libei";
|
repo = "libei";
|
||||||
rev = finalAttrs.version;
|
rev = finalAttrs.version;
|
||||||
hash = "sha256-PqQpJz88tDzjwsBuwxpWcGAWz6Gp6A/oAOS87uxGOGs=";
|
hash = "sha256-fUeMdRK7uoRvgvY3INMorwnTleLrLA5xOeYBFp1qXeI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = lib.optionals stdenv.hostPlatform.isBSD [
|
patches = lib.optionals stdenv.hostPlatform.isBSD [
|
||||||
|
|||||||
@@ -25,10 +25,29 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
url = "https://github.com/pantoniou/libfyaml/commit/0982fcefc6a16d4c8cb5b06747d3fc8e630de3ae.diff";
|
url = "https://github.com/pantoniou/libfyaml/commit/0982fcefc6a16d4c8cb5b06747d3fc8e630de3ae.diff";
|
||||||
hash = "sha256-aDubIn+et+1fWE7XU7a5AGZVacVFbAbC1PoSDrA6hXw=";
|
hash = "sha256-aDubIn+et+1fWE7XU7a5AGZVacVFbAbC1PoSDrA6hXw=";
|
||||||
})
|
})
|
||||||
|
# backport "Fix C11 atomics detection and buggy macros for C++ compatibility"
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/pantoniou/libfyaml/commit/1026d76850909dc9b1c5f95b8cd94e865a313fd5.diff";
|
||||||
|
hash = "sha256-0YfOqdqHdELFMqr52TDAC3BNFLkcuxvuJY5b9yZ7NFk=";
|
||||||
|
})
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = "https://github.com/pantoniou/libfyaml/commit/9192deaac095f9881cc1e5756dede683f36b09d6.diff";
|
url = "https://github.com/pantoniou/libfyaml/commit/9192deaac095f9881cc1e5756dede683f36b09d6.diff";
|
||||||
hash = "sha256-cNL9wQtxIRg/ShZLJP4qHYNFRrYo9kRG+/U+3FiUeaI=";
|
hash = "sha256-cNL9wQtxIRg/ShZLJP4qHYNFRrYo9kRG+/U+3FiUeaI=";
|
||||||
})
|
})
|
||||||
|
# On Darwin, AX_PTHREAD returns empty PTHREAD_LIBS with -pthread in PTHREAD_CFLAGS;
|
||||||
|
# don't force -lpthread when PTHREAD_CFLAGS already provides pthread support.
|
||||||
|
# Pending PR: https://github.com/pantoniou/libfyaml/pull/294
|
||||||
|
./pthread-darwin.patch
|
||||||
|
|
||||||
|
# backport "build: don't output 'none required' to LIBM if no linker flags needed for it"
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/pantoniou/libfyaml/commit/24b18e7363b336962fe160c1dc05ca57ba95783c.diff";
|
||||||
|
hash = "sha256-g5QKI4HuS8MEQ9ddIQNC0j+28Dh9zLAp5RaZX5SWBHk=";
|
||||||
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/pantoniou/libfyaml/commit/9f2492ca27bb1fda64f2b12edc2da17406208b93.diff";
|
||||||
|
hash = "sha256-E4wS+P7R3VGrBpD7swWMMi/QPTF+9rzAeEyxhbmdiwk=";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|||||||
12
pkgs/by-name/li/libfyaml/pthread-darwin.patch
Normal file
12
pkgs/by-name/li/libfyaml/pthread-darwin.patch
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -99,6 +99,7 @@
|
||||||
|
AX_PTHREAD([], [AC_MSG_ERROR("Missing required pthread support")])
|
||||||
|
|
||||||
|
-# in some cases PTHREAD_LIBS is empty - force -lpthread */
|
||||||
|
-if test "x$PTHREAD_LIBS" = "x"; then
|
||||||
|
+# In some cases PTHREAD_LIBS is empty; force -lpthread only when PTHREAD_CFLAGS
|
||||||
|
+# also provides no pthread support (e.g. on Darwin, -pthread in CFLAGS suffices).
|
||||||
|
+if test "x$PTHREAD_LIBS" = "x" && test "x$PTHREAD_CFLAGS" = "x"; then
|
||||||
|
PTHREAD_LIBS="-lpthread"
|
||||||
|
fi
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "libheif";
|
pname = "libheif";
|
||||||
version = "1.21.2";
|
version = "1.22.2";
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"bin"
|
"bin"
|
||||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
owner = "strukturag";
|
owner = "strukturag";
|
||||||
repo = "libheif";
|
repo = "libheif";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-odkJ0wZSGoZ7mX9fkaNREDpMvQuQA9HKaf3so1dYrbc=";
|
hash = "sha256-z5vTfZATfwDn8Zwqt3piS7PaOQQ3UG+u20sR6j+dsUg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|||||||
@@ -5,36 +5,19 @@
|
|||||||
ninja,
|
ninja,
|
||||||
gtest,
|
gtest,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
fetchpatch,
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libhwy";
|
pname = "libhwy";
|
||||||
version = "1.3.0";
|
version = "1.4.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "google";
|
owner = "google";
|
||||||
repo = "highway";
|
repo = "highway";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-8QOk96Y3GIIvBUGIDikMgTylx8y5aCyr68/TP5w5ha4=";
|
hash = "sha256-YUYZO9KLffczjwIz3mBBceD6oM1giLCFLDHgDCevdRA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Apply upstream workaround for gcc-15 bug:
|
|
||||||
# https://github.com/google/highway/issues/2813
|
|
||||||
# https://github.com/google/highway/pull/2824
|
|
||||||
(fetchpatch {
|
|
||||||
name = "gcc-15-clone-hack-prerequisite.patch";
|
|
||||||
url = "https://github.com/google/highway/commit/3b680cde3a556bead9cc23c8f595d07a44d5a0d5.patch";
|
|
||||||
hash = "sha256-8xBPuhsifalhzKgeEOQq6yZw2NWas+SFQrNIaMicRnY=";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
name = "gcc-15-clone-hack.patch";
|
|
||||||
url = "https://github.com/google/highway/commit/5af21b8a9078330a3d7456d855e69245bb87bc7a.patch";
|
|
||||||
hash = "sha256-hC/oEdxHsdZKlLFIw929ZHjffPURGzk9jiKz6iGSLkY=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
hardeningDisable = lib.optionals stdenv.hostPlatform.isAarch64 [
|
hardeningDisable = lib.optionals stdenv.hostPlatform.isAarch64 [
|
||||||
# aarch64-specific code gets:
|
# aarch64-specific code gets:
|
||||||
# __builtin_clear_padding not supported for variable length aggregates
|
# __builtin_clear_padding not supported for variable length aggregates
|
||||||
|
|||||||
@@ -14,11 +14,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "libmpc";
|
pname = "libmpc";
|
||||||
version = "1.4.0"; # to avoid clash with the MPD client
|
version = "1.4.1"; # to avoid clash with the MPD client
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnu/mpc/mpc-${finalAttrs.version}.tar.xz";
|
url = "mirror://gnu/mpc/mpc-${finalAttrs.version}.tar.xz";
|
||||||
hash = "sha256-MhCzpUaxywDClso2CJHXdA7m/wbesCono1sgzTwLsaU=";
|
hash = "sha256-kSBM0y8WS9O3yZLUpqjOZRlRGq2rMPeLaYLQv41z6TE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|||||||
@@ -23,6 +23,9 @@ let
|
|||||||
pname = "libressl";
|
pname = "libressl";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
|
__structuredAttrs = true;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://openbsd/LibreSSL/libressl-${version}.tar.gz";
|
url = "mirror://openbsd/LibreSSL/libressl-${version}.tar.gz";
|
||||||
inherit hash;
|
inherit hash;
|
||||||
@@ -58,6 +61,22 @@ let
|
|||||||
|
|
||||||
doCheck = !(stdenv.hostPlatform.isPower64 || stdenv.hostPlatform.isRiscV);
|
doCheck = !(stdenv.hostPlatform.isPower64 || stdenv.hostPlatform.isRiscV);
|
||||||
preCheck = ''
|
preCheck = ''
|
||||||
|
# Bail if any shared object has executable stack enabled. This can
|
||||||
|
# happen when an object produced from an assmbly file in libcrypto is
|
||||||
|
# missing a .note.GNU-stack section. An executable stack is dangerous
|
||||||
|
# and unintentional, but without this check the derivation will build
|
||||||
|
# and even run if W^X is not enforced; it would fail dangerously.
|
||||||
|
objdump -p **/*.so | awk '
|
||||||
|
BEGIN { res = 0 }
|
||||||
|
/file format/ { file = $1 }
|
||||||
|
/STACK/ { stack = 1; next }
|
||||||
|
stack {
|
||||||
|
if ($0 ~ /flags.*x/) { print file " has executable stack"; res = 1 }
|
||||||
|
stack = 0
|
||||||
|
}
|
||||||
|
END { exit res }
|
||||||
|
'
|
||||||
|
|
||||||
export PREVIOUS_${ldLibPathEnvName}=$${ldLibPathEnvName}
|
export PREVIOUS_${ldLibPathEnvName}=$${ldLibPathEnvName}
|
||||||
export ${ldLibPathEnvName}="$${ldLibPathEnvName}:$(realpath tls/):$(realpath ssl/):$(realpath crypto/)"
|
export ${ldLibPathEnvName}="$${ldLibPathEnvName}:$(realpath tls/):$(realpath ssl/):$(realpath crypto/)"
|
||||||
'';
|
'';
|
||||||
@@ -96,6 +115,7 @@ let
|
|||||||
maintainers = with lib.maintainers; [
|
maintainers = with lib.maintainers; [
|
||||||
thoughtpolice
|
thoughtpolice
|
||||||
fpletz
|
fpletz
|
||||||
|
ruuda
|
||||||
];
|
];
|
||||||
inherit knownVulnerabilities;
|
inherit knownVulnerabilities;
|
||||||
|
|
||||||
@@ -111,32 +131,17 @@ let
|
|||||||
identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "openbsd" version;
|
identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "openbsd" version;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# https://github.com/libressl/portable/pull/1206
|
# https://github.com/libressl/portable/pull/1206
|
||||||
|
# This got merged in February 2026 and is included as of LibreSSL 4.3.0.
|
||||||
common-cmake-install-full-dirs-patch = fetchpatch {
|
common-cmake-install-full-dirs-patch = fetchpatch {
|
||||||
url = "https://github.com/libressl/portable/commit/a15ea0710398eaeed3be53cf643e80a1e80c981d.patch";
|
url = "https://github.com/libressl/portable/commit/a15ea0710398eaeed3be53cf643e80a1e80c981d.patch";
|
||||||
hash = "sha256-Mlf4SrGCCqALQicbGtmVGdkdfcE8DEGYkOuVyG2CozM=";
|
hash = "sha256-Mlf4SrGCCqALQicbGtmVGdkdfcE8DEGYkOuVyG2CozM=";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
libressl_4_1 = generic {
|
# 4.2 was released October 2025 and will become unsupported on October 22,
|
||||||
version = "4.1.2";
|
# 2026, one year after the release of OpenBSD 7.8.
|
||||||
hash = "sha256-+6Ti+ip/UjBt96OJlwoQ6YuX6w7bKZqf252/SZmcYeE=";
|
|
||||||
# Fixes build on loongarch64
|
|
||||||
# https://github.com/libressl/portable/pull/1184
|
|
||||||
postPatch = ''
|
|
||||||
mkdir -p include/arch/loongarch64
|
|
||||||
cp ${
|
|
||||||
fetchurl {
|
|
||||||
url = "https://github.com/libressl/portable/raw/refs/tags/v4.1.0/include/arch/loongarch64/opensslconf.h";
|
|
||||||
hash = "sha256-68dw5syUy1z6GadCMR4TR9+0UQX6Lw/CbPWvjHGAhgo=";
|
|
||||||
}
|
|
||||||
} include/arch/loongarch64/opensslconf.h
|
|
||||||
'';
|
|
||||||
patches = [
|
|
||||||
common-cmake-install-full-dirs-patch
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
libressl_4_2 = generic {
|
libressl_4_2 = generic {
|
||||||
version = "4.2.1";
|
version = "4.2.1";
|
||||||
hash = "sha256-bVwvWFg1iOp5H0yGRQBAcdAN+lVKW/eIoAbKHrWr1ws=";
|
hash = "sha256-bVwvWFg1iOp5H0yGRQBAcdAN+lVKW/eIoAbKHrWr1ws=";
|
||||||
@@ -144,4 +149,24 @@ in
|
|||||||
common-cmake-install-full-dirs-patch
|
common-cmake-install-full-dirs-patch
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# 4.3 was released April 2026 and will become unsupported one year after the
|
||||||
|
# release of OpenBSD 7.9.
|
||||||
|
libressl_4_3 = generic {
|
||||||
|
version = "4.3.1";
|
||||||
|
hash = "sha256-wttCrOFOfVQZgm+rNadC7G5NEnJaBRpR0M6jwQug+lA=";
|
||||||
|
patches = [
|
||||||
|
# Fix for https://github.com/libressl/portable/issues/1278, where LibreSSL
|
||||||
|
# 4.3 started requiring executable stack because some objects were missing
|
||||||
|
# a .note.GNU-stack section; will probably be included in the next release.
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://raw.githubusercontent.com/libressl/portable/4dae91d056c6c75ba5cf2bc5e6148b8e02239119/patches/gnu-stack.patch";
|
||||||
|
hash = "sha256-Q1oWL4N8w5Zmjfq5QkTJR53NgZ4GqChSDaBicli5G2I=";
|
||||||
|
# This patch is written to be applied with -p0, with no leading path
|
||||||
|
# component, but Nix applies with -p1 by default, so we add it to not
|
||||||
|
# break compatibility with how other patches must be applied.
|
||||||
|
decode = "sed 's|^--- |--- a/|; s|^+++ |+++ b/|'";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,17 +10,15 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "libtpms";
|
pname = "libtpms";
|
||||||
version = "0.10.2";
|
version = "0.10.2-unstable-2026-05-06";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "stefanberger";
|
owner = "stefanberger";
|
||||||
repo = "libtpms";
|
repo = "libtpms";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "521c51073fe6f7c56023db78e56961fcaf7906e8";
|
||||||
sha256 = "sha256-UhEpq5f/FT5DmtzQBe/Si414mOq+D4glikgRNK60GKQ=";
|
hash = "sha256-wCipOOr3LnLq1NqDtxw6hq0VTyniDwp18vBxyET/WGM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
hardeningDisable = [ "strictflexarrays3" ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
autoreconfHook
|
autoreconfHook
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|||||||
@@ -16,13 +16,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "libusb";
|
pname = "libusb";
|
||||||
version = "1.0.29";
|
version = "1.0.30";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "libusb";
|
owner = "libusb";
|
||||||
repo = "libusb";
|
repo = "libusb";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
sha256 = "sha256-m1w+uF8+2WCn72LvoaGUYa+R0PyXHtFFONQjdRfImYY=";
|
sha256 = "sha256-qgs8h1vSqJg2muBDWN5nJlvaMjGYZnwMg1m07rqzHco=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
|
|||||||
@@ -12,16 +12,16 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage (finalAttrs: {
|
rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
pname = "maturin";
|
pname = "maturin";
|
||||||
version = "1.12.6";
|
version = "1.13.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "PyO3";
|
owner = "PyO3";
|
||||||
repo = "maturin";
|
repo = "maturin";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-NQ94RdQTQlRR5+2dC95cFNhwYliHmkD11JWyGt6BV6g=";
|
hash = "sha256-xVR/R/aQ6Kvx7w/X9gedjJLzlxz+5nhnwjxsiyKcg0A=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-9VqS9wvQAsSYNhH7B9WlD6SZjXR4S2sYzYoNy6vbYBM=";
|
cargoHash = "sha256-awdc2SLEfMP4cLG+RvQbeYPn1o9Ft7sqOnRy8iQqjB0=";
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
libiconv
|
libiconv
|
||||||
|
|||||||
@@ -1,44 +0,0 @@
|
|||||||
From 0ab8f5a6ee305cf4edcebfdc7b9eb5f98302de75 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Leif Middelschulte <Leif.Middelschulte@klsmartin.com>
|
|
||||||
Date: Fri, 17 Sep 2021 16:16:17 +0200
|
|
||||||
Subject: [PATCH] pc.in: use _FULL_ variable variants
|
|
||||||
|
|
||||||
Nix' cmake packaging handler replaces the CMAKE_INSTALL_INCLUDEDIR
|
|
||||||
with the absolute path. Which break package
|
|
||||||
portability (i.e. `prefix`-usage).
|
|
||||||
---
|
|
||||||
src/md4c-html.pc.in | 6 ++----
|
|
||||||
src/md4c.pc.in | 6 ++----
|
|
||||||
2 files changed, 4 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/md4c-html.pc.in b/src/md4c-html.pc.in
|
|
||||||
index 504bb52..fec7df4 100644
|
|
||||||
--- a/src/md4c-html.pc.in
|
|
||||||
+++ b/src/md4c-html.pc.in
|
|
||||||
@@ -1,7 +1,5 @@
|
|
||||||
-prefix=@CMAKE_INSTALL_PREFIX@
|
|
||||||
-exec_prefix=@CMAKE_INSTALL_PREFIX@
|
|
||||||
-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
|
|
||||||
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
|
|
||||||
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
|
|
||||||
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
|
|
||||||
|
|
||||||
Name: @PROJECT_NAME@ HTML renderer
|
|
||||||
Description: Markdown to HTML converter library.
|
|
||||||
diff --git a/src/md4c.pc.in b/src/md4c.pc.in
|
|
||||||
index cd8842d..b5d81f8 100644
|
|
||||||
--- a/src/md4c.pc.in
|
|
||||||
+++ b/src/md4c.pc.in
|
|
||||||
@@ -1,7 +1,5 @@
|
|
||||||
-prefix=@CMAKE_INSTALL_PREFIX@
|
|
||||||
-exec_prefix=@CMAKE_INSTALL_PREFIX@
|
|
||||||
-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
|
|
||||||
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
|
|
||||||
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
|
|
||||||
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
|
|
||||||
|
|
||||||
Name: @PROJECT_NAME@
|
|
||||||
Description: Markdown parser library with a SAX-like callback-based interface.
|
|
||||||
--
|
|
||||||
2.31.0
|
|
||||||
|
|
||||||
@@ -8,13 +8,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "md4c";
|
pname = "md4c";
|
||||||
version = "0.5.2";
|
version = "0.5.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mity";
|
owner = "mity";
|
||||||
repo = "md4c";
|
repo = "md4c";
|
||||||
rev = "release-${finalAttrs.version}";
|
rev = "release-${finalAttrs.version}";
|
||||||
hash = "sha256-2/wi7nJugR8X2J9FjXJF1UDnbsozGoO7iR295/KSJng=";
|
hash = "sha256-rsNJlNLsmTEiAARqQ5TovNWmHNikMiRi8eEyn8o43ao=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
@@ -24,13 +24,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
"man"
|
"man"
|
||||||
];
|
];
|
||||||
|
|
||||||
patches = [
|
|
||||||
# We set CMAKE_INSTALL_LIBDIR to the absolute path in $out, so prefix and
|
|
||||||
# exec_prefix cannot be $out, too
|
|
||||||
# Use CMake's _FULL_ variables instead of `prefix` concatenation.
|
|
||||||
./0001-fix-pkgconfig.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
installShellFiles,
|
installShellFiles,
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
version = "0.5.2";
|
version = "0.5.3";
|
||||||
in
|
in
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
inherit version;
|
inherit version;
|
||||||
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec {
|
|||||||
owner = "rust-lang";
|
owner = "rust-lang";
|
||||||
repo = "mdBook";
|
repo = "mdBook";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-gyjD47ZR9o2lIxipzesyJ6mxb9J9W+WS77TNWhKHP6U=";
|
hash = "sha256-RMJQn58hshBGQSpu30NdUOb3Prywn6NfhauSzFZ35xQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-230KljOUSrDy8QCQki7jvJvdAsjVlUEjKDNVyTF4tWs=";
|
cargoHash = "sha256-LlImOjTQjMQURQ81Gn73v+DEHXqyyiz39K9T+MrE7S0=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
|||||||
@@ -72,11 +72,11 @@ python3.pkgs.buildPythonApplication rec {
|
|||||||
if python3.isPyPy then
|
if python3.isPyPy then
|
||||||
''
|
''
|
||||||
substituteInPlace mesonbuild/modules/python.py \
|
substituteInPlace mesonbuild/modules/python.py \
|
||||||
--replace-fail "PythonExternalProgram('python3', mesonlib.python_command)" \
|
--replace-fail "PythonExternalProgram('python3', mesonlib.python_command" \
|
||||||
"PythonExternalProgram('${python3.meta.mainProgram}', mesonlib.python_command)"
|
"PythonExternalProgram('${python3.meta.mainProgram}', mesonlib.python_command"
|
||||||
substituteInPlace mesonbuild/modules/python3.py \
|
substituteInPlace mesonbuild/modules/python3.py \
|
||||||
--replace-fail "state.environment.lookup_binary_entry(mesonlib.MachineChoice.HOST, 'python3')" \
|
--replace-fail "state.environment.lookup_binary_entry(mesonlib.MachineChoice.HOST, 'python3'" \
|
||||||
"state.environment.lookup_binary_entry(mesonlib.MachineChoice.HOST, '${python3.meta.mainProgram}')"
|
"state.environment.lookup_binary_entry(mesonlib.MachineChoice.HOST, '${python3.meta.mainProgram}'"
|
||||||
substituteInPlace "test cases"/*/*/*.py "test cases"/*/*/*/*.py \
|
substituteInPlace "test cases"/*/*/*.py "test cases"/*/*/*/*.py \
|
||||||
--replace-quiet '#!/usr/bin/env python3' '#!/usr/bin/env pypy3' \
|
--replace-quiet '#!/usr/bin/env python3' '#!/usr/bin/env pypy3' \
|
||||||
--replace-quiet '#! /usr/bin/env python3' '#!/usr/bin/env pypy3'
|
--replace-quiet '#! /usr/bin/env python3' '#!/usr/bin/env pypy3'
|
||||||
@@ -141,6 +141,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||||||
++ lib.optionals python3.isPyPy [
|
++ lib.optionals python3.isPyPy [
|
||||||
# fails for unknown reason
|
# fails for unknown reason
|
||||||
"test cases/python/4 custom target depends extmodule"
|
"test cases/python/4 custom target depends extmodule"
|
||||||
|
# we patch the path to the binary...
|
||||||
|
"test cases/common/26 find program"
|
||||||
]
|
]
|
||||||
))
|
))
|
||||||
++ [
|
++ [
|
||||||
|
|||||||
@@ -63,16 +63,22 @@ mesonCheckPhase() {
|
|||||||
flagsArray+=("--timeout-multiplier=0")
|
flagsArray+=("--timeout-multiplier=0")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Parallel checking is enabled by default.
|
# Parallel building is enabled by default.
|
||||||
local buildCores=1
|
local buildCores=1
|
||||||
if [ "${enableParallelChecking-1}" ]; then
|
if [ "${enableParallelBuilding-1}" ]; then
|
||||||
buildCores="$NIX_BUILD_CORES"
|
buildCores="$NIX_BUILD_CORES"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
TERM=dumb ninja -j"$buildCores" $ninjaFlags "${ninjaFlagsArray[@]}" meson-test-prereq
|
TERM=dumb ninja -j"$buildCores" $ninjaFlags "${ninjaFlagsArray[@]}" meson-test-prereq
|
||||||
|
|
||||||
|
# Parallel checking is enabled by default.
|
||||||
|
local testCores=1
|
||||||
|
if [ "${enableParallelChecking-1}" ]; then
|
||||||
|
testCores="$NIX_BUILD_CORES"
|
||||||
|
fi
|
||||||
|
|
||||||
echoCmd 'mesonCheckPhase flags' "${flagsArray[@]}"
|
echoCmd 'mesonCheckPhase flags' "${flagsArray[@]}"
|
||||||
meson test --no-rebuild --print-errorlogs --max-lines=1000000 "${flagsArray[@]}"
|
meson test -j"$testCores" --no-rebuild --print-errorlogs --max-lines=1000000 "${flagsArray[@]}"
|
||||||
|
|
||||||
runHook postCheck
|
runHook postCheck
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
gdk-pixbuf
|
gdk-pixbuf
|
||||||
(opencv4.override { inherit ffmpeg; })
|
(opencv4.override { ffmpeg-headless = ffmpeg; })
|
||||||
ffmpeg
|
ffmpeg
|
||||||
fftw
|
fftw
|
||||||
frei0r
|
frei0r
|
||||||
|
|||||||
@@ -1,63 +0,0 @@
|
|||||||
From cde10364f1b59098fa2fbcacbdba88c7bbab4848 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alyssa Ross <hi@alyssa.is>
|
|
||||||
Date: Sun, 22 Feb 2026 12:06:15 +0100
|
|
||||||
Subject: [PATCH] Remove function declarators without prototypes
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
These are no longer valid in C23 — they prototype the function as
|
|
||||||
taking no arguments, and now cause compilation errors when building
|
|
||||||
for non-Glibc systems.
|
|
||||||
|
|
||||||
getenv is part of the C standard, so should be universally present,
|
|
||||||
and getopt is part of POSIX, so conflicting prototypes should be a
|
|
||||||
thing of the past. Similar changes have been made in upstream gnulib.
|
|
||||||
---
|
|
||||||
converter/other/fiasco/getopt.c | 3 +--
|
|
||||||
converter/other/fiasco/getopt.h | 7 -------
|
|
||||||
2 files changed, 1 insertion(+), 9 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/converter/other/fiasco/getopt.c b/converter/other/fiasco/getopt.c
|
|
||||||
index 65c206c3..565fac28 100644
|
|
||||||
--- a/converter/other/fiasco/getopt.c
|
|
||||||
+++ b/converter/other/fiasco/getopt.c
|
|
||||||
@@ -44,6 +44,7 @@
|
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
+#include <stdlib.h>
|
|
||||||
|
|
||||||
/* Comment out all this code if we are using the GNU C Library, and are not
|
|
||||||
actually compiling the library itself. This code is part of the GNU C
|
|
||||||
@@ -203,8 +204,6 @@ static char *posixly_correct;
|
|
||||||
/* Avoid depending on library functions or files
|
|
||||||
whose names are inconsistent. */
|
|
||||||
|
|
||||||
-char *getenv ();
|
|
||||||
-
|
|
||||||
static char *
|
|
||||||
my_index (str, chr)
|
|
||||||
const char *str;
|
|
||||||
diff --git a/converter/other/fiasco/getopt.h b/converter/other/fiasco/getopt.h
|
|
||||||
index 3c735e3d..08138da4 100644
|
|
||||||
--- a/converter/other/fiasco/getopt.h
|
|
||||||
+++ b/converter/other/fiasco/getopt.h
|
|
||||||
@@ -95,14 +95,7 @@ struct option
|
|
||||||
#define optional_argument 2
|
|
||||||
|
|
||||||
#if defined (__STDC__) && __STDC__
|
|
||||||
-#ifdef __GNU_LIBRARY__
|
|
||||||
-/* Many other libraries have conflicting prototypes for getopt, with
|
|
||||||
- differences in the consts, in stdlib.h. To avoid compilation
|
|
||||||
- errors, only prototype getopt for the GNU C library. */
|
|
||||||
extern int getopt (int argc, char *const *argv, const char *shortopts);
|
|
||||||
-#else /* not __GNU_LIBRARY__ */
|
|
||||||
-extern int getopt ();
|
|
||||||
-#endif /* __GNU_LIBRARY__ */
|
|
||||||
extern int getopt_long (int argc, char *const *argv, const char *shortopts,
|
|
||||||
const struct option *longopts, int *longind);
|
|
||||||
extern int getopt_long_only (int argc, char *const *argv,
|
|
||||||
--
|
|
||||||
2.52.0
|
|
||||||
|
|
||||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
# Determine version and revision from:
|
# Determine version and revision from:
|
||||||
# https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
|
# https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
|
||||||
pname = "netpbm";
|
pname = "netpbm";
|
||||||
version = "11.13.3";
|
version = "11.14.0";
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"bin"
|
"bin"
|
||||||
@@ -31,15 +31,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
|
|
||||||
src = fetchsvn {
|
src = fetchsvn {
|
||||||
url = "https://svn.code.sf.net/p/netpbm/code/advanced";
|
url = "https://svn.code.sf.net/p/netpbm/code/advanced";
|
||||||
rev = "5164";
|
rev = "5182";
|
||||||
sha256 = "sha256-3teRW9oucwv0+V+eyLVvh8Y2NtrFoyIt1JWoC2gyVgM=";
|
sha256 = "sha256-VbVN08WVXQYXlEBK1yIKj5aIWWaBhim4rQc68ViA/vA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Sent to maintainer 2026-02-22.
|
|
||||||
./c23.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
flex
|
flex
|
||||||
|
|||||||
@@ -12,13 +12,13 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "openapv";
|
pname = "openapv";
|
||||||
version = "0.2.1.2";
|
version = "0.2.1.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "AcademySoftwareFoundation";
|
owner = "AcademySoftwareFoundation";
|
||||||
repo = "openapv";
|
repo = "openapv";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}-fix"; # Remove the `-fix` suffix after the next version
|
||||||
hash = "sha256-wxncN7j5p0GXpWhOx4Ix0oTgGK2sIrfJgQ45fFwmQBI=";
|
hash = "sha256-lc/x2dWh6T8c63siHB32ka+SPVYTTyaO4YrQ12EbGqw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|||||||
@@ -122,6 +122,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
# https://bugs.openldap.org/show_bug.cgi?id=8623
|
# https://bugs.openldap.org/show_bug.cgi?id=8623
|
||||||
rm -f tests/scripts/test022-ppolicy
|
rm -f tests/scripts/test022-ppolicy
|
||||||
|
|
||||||
|
rm -f tests/scripts/test*-sync*
|
||||||
|
|
||||||
rm -f tests/scripts/test063-delta-multiprovider
|
rm -f tests/scripts/test063-delta-multiprovider
|
||||||
|
|
||||||
# https://bugs.openldap.org/show_bug.cgi?id=10009
|
# https://bugs.openldap.org/show_bug.cgi?id=10009
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ in
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "pipewire";
|
pname = "pipewire";
|
||||||
version = "1.6.5";
|
version = "1.6.6";
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
@@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
owner = "pipewire";
|
owner = "pipewire";
|
||||||
repo = "pipewire";
|
repo = "pipewire";
|
||||||
tag = finalAttrs.version;
|
tag = finalAttrs.version;
|
||||||
hash = "sha256-ui5VTbSiobHmPUHW4jLguoeMWaKT4f2eTqdo3ZGgvNI=";
|
hash = "sha256-pyZozhJomFT4QkJv/NKkXpbknmVxjv8hCxZV6RcIHmE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|||||||
@@ -13,16 +13,16 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage (finalAttrs: {
|
rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
pname = "prek";
|
pname = "prek";
|
||||||
version = "0.3.11";
|
version = "0.3.13";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "j178";
|
owner = "j178";
|
||||||
repo = "prek";
|
repo = "prek";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-Vd4XmO+Z0Zs5kE/PMesnr6q+JUz+DGXWKVoHsPZPKwM=";
|
hash = "sha256-OPH1H571jw0b8EsyzRcVdG54sQ7KeOclmnHCeVGteRI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-AggCANaSMeKftOlan8TpgLgpYgaLCpYBBbBOeLKCCVo=";
|
cargoHash = "sha256-lvB09qOvVXmSdhR1TRJQ3rvYyn6cFSOGpogJZDajPuQ=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
installShellFiles
|
installShellFiles
|
||||||
|
|||||||
@@ -7,13 +7,13 @@
|
|||||||
|
|
||||||
stdenvNoCC.mkDerivation {
|
stdenvNoCC.mkDerivation {
|
||||||
pname = "publicsuffix-list";
|
pname = "publicsuffix-list";
|
||||||
version = "0-unstable-2026-03-26";
|
version = "0-unstable-2026-05-13";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "publicsuffix";
|
owner = "publicsuffix";
|
||||||
repo = "list";
|
repo = "list";
|
||||||
rev = "d333b72b39575da1ce6932b01d7c421a4107c620";
|
rev = "e452c7058d6946bd76952b128c12f5ce87a5acb8";
|
||||||
hash = "sha256-LWnvQrIyj+iq96T1u9WEq+HGOZ5sJYN5nCintEr6sBk=";
|
hash = "sha256-5D4RZAyJOL4hMU32Rmp3SYmjgqEtF36mZJr4YBG0k7E=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|||||||
@@ -14,16 +14,16 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage (finalAttrs: {
|
rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
pname = "rust-cbindgen";
|
pname = "rust-cbindgen";
|
||||||
version = "0.29.2";
|
version = "0.29.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mozilla";
|
owner = "mozilla";
|
||||||
repo = "cbindgen";
|
repo = "cbindgen";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-P2A+XSLrcuYsI48gnZSNNs5qX+EatiuEJSEJbMvMSxg=";
|
hash = "sha256-d0rY7Sk37s8HEZlQq9Sbjj1P+DgygD0Yjx8cXlFKEIA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-DbmlpjiOraLWPh5RgJqCIGIYzE1h82MH2S6gpLH+CIQ=";
|
cargoHash = "sha256-UeierkQpfCiB5ES9ZW9hO+0AcI9Ip8qSJ/Nd+I1xrmQ=";
|
||||||
|
|
||||||
nativeCheckInputs = [
|
nativeCheckInputs = [
|
||||||
cmake
|
cmake
|
||||||
|
|||||||
@@ -7,13 +7,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "simdjson";
|
pname = "simdjson";
|
||||||
version = "4.6.0";
|
version = "4.6.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "simdjson";
|
owner = "simdjson";
|
||||||
repo = "simdjson";
|
repo = "simdjson";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-VGErBWAHk63XMv8yC+Na+gXHByhYhtIEMSBySwIDlXk=";
|
hash = "sha256-8oQzsR7DSaNTN9su1uI9tRQ9HvOwXShPwSrnQj8+lGM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|||||||
@@ -8,13 +8,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "spirv-cross";
|
pname = "spirv-cross";
|
||||||
version = "1.4.341.0";
|
version = "1.4.350.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "KhronosGroup";
|
owner = "KhronosGroup";
|
||||||
repo = "SPIRV-Cross";
|
repo = "SPIRV-Cross";
|
||||||
rev = "vulkan-sdk-${finalAttrs.version}";
|
rev = "vulkan-sdk-${finalAttrs.version}";
|
||||||
hash = "sha256-F3/j2+B/qv3sDiOiOy1OhR9G+DnM7I4LJqljZXL4S7Q=";
|
hash = "sha256-JdVAS5uVSfe0mOGtyodkgmvgD4of9Amq8PbDSAtgaXc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|||||||
@@ -2,20 +2,30 @@
|
|||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
|
fetchpatch,
|
||||||
cmake,
|
cmake,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "spirv-headers";
|
pname = "spirv-headers";
|
||||||
version = "1.4.341.0";
|
version = "1.4.350.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "KhronosGroup";
|
owner = "KhronosGroup";
|
||||||
repo = "SPIRV-Headers";
|
repo = "SPIRV-Headers";
|
||||||
rev = "vulkan-sdk-${finalAttrs.version}";
|
rev = "vulkan-sdk-${finalAttrs.version}";
|
||||||
hash = "sha256-aYKFJxRDoY/Cor8gYVoR/YSyXWSNtcRG0HK8BZH0Ztk=";
|
hash = "sha256-nwzhJlkdN8DaExHvnuVc5rZmlrkPYb7Qmj1fx3O5Zpw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# backport to fix glslang tests
|
||||||
|
# FIXME: remove in next update
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/KhronosGroup/SPIRV-Headers/commit/1a22b167081842915a1c78a0b5b5a353a23284aa.diff";
|
||||||
|
hash = "sha256-XUHfPHnk7bWK4vnozfW/84vaZN+rbFJUZSa6Og8GUAU=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
|
fetchpatch,
|
||||||
cmake,
|
cmake,
|
||||||
python3,
|
python3,
|
||||||
spirv-headers,
|
spirv-headers,
|
||||||
@@ -9,18 +10,25 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "spirv-tools";
|
pname = "spirv-tools";
|
||||||
version = "1.4.341.0";
|
version = "1.4.350.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "KhronosGroup";
|
owner = "KhronosGroup";
|
||||||
repo = "SPIRV-Tools";
|
repo = "SPIRV-Tools";
|
||||||
rev = "vulkan-sdk-${finalAttrs.version}";
|
rev = "vulkan-sdk-${finalAttrs.version}";
|
||||||
hash = "sha256-8haVqfmTBvNuv5jEc/LaAO34pWjTZAJ04FIxuxfJNUc=";
|
hash = "sha256-tR3POZH/LXaAljMUS9aHBBvIvlr6o7d6+YUtJCRMS1w=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# https://github.com/KhronosGroup/SPIRV-Tools/pull/6483
|
# https://github.com/KhronosGroup/SPIRV-Tools/pull/6483
|
||||||
./0001-Fix-generated-pkg-config-modules-with-absolute-insta.patch
|
./0001-Fix-generated-pkg-config-modules-with-absolute-insta.patch
|
||||||
|
|
||||||
|
# backport to fix glslang tests
|
||||||
|
# FIXME: remove in next update
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/KhronosGroup/SPIRV-Tools/commit/2ec8457ab33d539b6f1fecc998360c0b8b05ed4f.diff";
|
||||||
|
hash = "sha256-YHbYBwXMm4rTKpmMW6I3LUafhA4RuNUdXqUBUAXwXpE=";
|
||||||
|
})
|
||||||
]
|
]
|
||||||
# The cmake options are sufficient for turning on static building, but not
|
# The cmake options are sufficient for turning on static building, but not
|
||||||
# for disabling shared building, just trim the shared lib from the CMake
|
# for disabling shared building, just trim the shared lib from the CMake
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
fetchpatch,
|
|
||||||
cmake,
|
cmake,
|
||||||
openssl,
|
openssl,
|
||||||
windows,
|
windows,
|
||||||
@@ -10,13 +9,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "srt";
|
pname = "srt";
|
||||||
version = "1.5.4";
|
version = "1.5.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Haivision";
|
owner = "Haivision";
|
||||||
repo = "srt";
|
repo = "srt";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
sha256 = "sha256-NLy9GuP4OT/kKAIIDXSHtsmaBzXRuFohFM/aM+46cao=";
|
sha256 = "sha256-hOkLlmtF9dKqXZTjAeBntkkg5WsmsZN6DKhyakoIF1k=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
@@ -29,12 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
];
|
];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Fix the build with CMake 4.
|
|
||||||
(fetchpatch {
|
|
||||||
name = "srt-fix-cmake-4.patch";
|
|
||||||
url = "https://github.com/Haivision/srt/commit/0def1b1a1094fc57752f241250e9a1aed71bbffd.patch";
|
|
||||||
hash = "sha256-dnBGNut+I9trkQzr81Wo36O2Pt7d2gsjA1buJBegPMM=";
|
|
||||||
})
|
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.hostPlatform.isMinGW [
|
++ lib.optionals stdenv.hostPlatform.isMinGW [
|
||||||
./no-msvc-compat-headers.patch
|
./no-msvc-compat-headers.patch
|
||||||
|
|||||||
@@ -12,13 +12,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "svt-av1";
|
pname = "svt-av1";
|
||||||
version = "3.1.2";
|
version = "4.1.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "AOMediaCodec";
|
owner = "AOMediaCodec";
|
||||||
repo = "SVT-AV1";
|
repo = "SVT-AV1";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-/CpcxdyC4qf9wdzzySMYw17FbjYpasT+QVykXSlx28U=";
|
hash = "sha256-NPJG1SsRlG9kGtUwdJa/uP6DAtF09nCctzeorrvjAhQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
pkg-config,
|
pkg-config,
|
||||||
libtasn1,
|
libtasn1,
|
||||||
openssl,
|
openssl,
|
||||||
fuse,
|
fuse3,
|
||||||
glib,
|
glib,
|
||||||
libseccomp,
|
libseccomp,
|
||||||
json-glib,
|
json-glib,
|
||||||
@@ -15,6 +15,7 @@
|
|||||||
unixtools,
|
unixtools,
|
||||||
expect,
|
expect,
|
||||||
socat,
|
socat,
|
||||||
|
gmp,
|
||||||
gnutls,
|
gnutls,
|
||||||
perl,
|
perl,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
@@ -27,23 +28,15 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "swtpm";
|
pname = "swtpm";
|
||||||
version = "0.10.1";
|
version = "0.10.1-unstable-2026-05-21"; # fuse3 support, switch to openssl
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "stefanberger";
|
owner = "stefanberger";
|
||||||
repo = "swtpm";
|
repo = "swtpm";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "89a67f3d4070887a1ab86ca641f8da13529c54b7";
|
||||||
hash = "sha256-N79vuI0FhawLyQtwVF6ABIvCmEaYefq/YkyrafUfUHE=";
|
hash = "sha256-ebVfzKloJGmiaguxtcPC/MUuOQYzxIZDdi/0oEGXJ64=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
name = "retry-nwwrite.patch";
|
|
||||||
url = "https://github.com/stefanberger/swtpm/commit/4da66c66f92438443e66b67555673c9cb898b0ae.patch";
|
|
||||||
hash = "sha256-TTS+ViN4g6EfNLrhvGPobcSQEbr/mEl9ZLZTWdxbifs=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
unixtools.netstat
|
unixtools.netstat
|
||||||
@@ -65,15 +58,17 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
libtasn1
|
libtasn1
|
||||||
glib
|
glib
|
||||||
json-glib
|
json-glib
|
||||||
|
gmp
|
||||||
gnutls
|
gnutls
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||||
fuse
|
fuse3
|
||||||
libseccomp
|
libseccomp
|
||||||
];
|
];
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--localstatedir=/var"
|
"--localstatedir=/var"
|
||||||
|
"--with-gnutls"
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||||
"--with-cuse"
|
"--with-cuse"
|
||||||
@@ -87,39 +82,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
|
|
||||||
# Makefile tries to create the directory /var/lib/swtpm-localca, which fails
|
# Makefile tries to create the directory /var/lib/swtpm-localca, which fails
|
||||||
substituteInPlace samples/Makefile.am \
|
substituteInPlace samples/Makefile.am \
|
||||||
--replace 'install-data-local:' 'do-not-execute:'
|
--replace-fail 'install-data-local:' 'do-not-execute:'
|
||||||
|
|
||||||
# Use the correct path to the certtool binary
|
# Use the correct path to the openssl binary
|
||||||
# instead of relying on it being in the environment
|
# instead of relying on it being in the environment
|
||||||
substituteInPlace src/swtpm_localca/swtpm_localca.c \
|
substituteInPlace src/swtpm_localca/swtpm_localca.c \
|
||||||
--replace \
|
--replace-fail \
|
||||||
'# define CERTTOOL_NAME "gnutls-certtool"' \
|
'#define OPENSSL_TOOL "openssl"' \
|
||||||
'# define CERTTOOL_NAME "${gnutls}/bin/certtool"' \
|
'#define OPENSSL_TOOL "${lib.getExe openssl}"'
|
||||||
--replace \
|
|
||||||
'# define CERTTOOL_NAME "certtool"' \
|
|
||||||
'# define CERTTOOL_NAME "${gnutls}/bin/certtool"'
|
|
||||||
|
|
||||||
substituteInPlace tests/common --replace \
|
|
||||||
'CERTTOOL=gnutls-certtool;;' \
|
|
||||||
'CERTTOOL=certtool;;'
|
|
||||||
|
|
||||||
# Fix error on macOS:
|
|
||||||
# stat: invalid option -- '%'
|
|
||||||
# This is caused by the stat program not being the BSD version,
|
|
||||||
# as is expected by the test
|
|
||||||
substituteInPlace tests/common tests/sed-inplace --replace \
|
|
||||||
'if [[ "$(uname -s)" =~ (Linux|CYGWIN_NT-) ]]; then' \
|
|
||||||
'if [[ "$(uname -s)" =~ (Linux|Darwin|CYGWIN_NT-) ]]; then'
|
|
||||||
|
|
||||||
# Otherwise certtool seems to pick up the system language on macOS,
|
|
||||||
# which might cause a test to fail
|
|
||||||
substituteInPlace tests/test_swtpm_setup_create_cert --replace \
|
|
||||||
'$CERTTOOL' \
|
|
||||||
'LC_ALL=C.UTF-8 $CERTTOOL'
|
|
||||||
|
|
||||||
substituteInPlace tests/test_tpm2_swtpm_cert --replace \
|
|
||||||
'certtool' \
|
|
||||||
'LC_ALL=C.UTF-8 certtool'
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Workaround for https://github.com/stefanberger/swtpm/issues/795
|
# Workaround for https://github.com/stefanberger/swtpm/issues/795
|
||||||
@@ -129,6 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
__darwinAllowLocalNetworking = true; # tests do socket things, requires local networking to pass
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
stdenv,
|
stdenv,
|
||||||
lib,
|
lib,
|
||||||
fetchurl,
|
fetchurl,
|
||||||
|
fetchpatch,
|
||||||
gettext,
|
gettext,
|
||||||
meson,
|
meson,
|
||||||
mesonEmulatorHook,
|
mesonEmulatorHook,
|
||||||
@@ -49,6 +50,18 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
hash = "sha256-z9RgIe4VFK1DXnFPeqHsenh8f1FqlPTHQ4iX7j1uyh4=";
|
hash = "sha256-z9RgIe4VFK1DXnFPeqHsenh8f1FqlPTHQ4iX7j1uyh4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# sqlite changed the precision of float <-> text conversions, causing
|
||||||
|
# failures in the test suite. patch here until this appears in a release.
|
||||||
|
# https://gitlab.gnome.org/GNOME/tinysparql/-/work_items/496
|
||||||
|
# https://gitlab.gnome.org/GNOME/tinysparql/-/merge_requests/811
|
||||||
|
(fetchpatch {
|
||||||
|
name = "tinysparql-sqlite-double-value-precision.patch";
|
||||||
|
url = "https://gitlab.gnome.org/GNOME/tinysparql/-/commit/47d5bf9313d0ccb1feb7169eed9047d0e1597a39.patch";
|
||||||
|
hash = "sha256-k6eELZCEEtD8s7GiMckjTlf6QcAiUNY1Mraw7GROsm4=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
||||||
depsBuildBuild = [
|
depsBuildBuild = [
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
fetchPypi,
|
|
||||||
python3,
|
python3,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@@ -12,12 +11,18 @@ let
|
|||||||
# Doesn't work with latest paramiko
|
# Doesn't work with latest paramiko
|
||||||
paramiko = super.paramiko.overridePythonAttrs (oldAttrs: rec {
|
paramiko = super.paramiko.overridePythonAttrs (oldAttrs: rec {
|
||||||
version = "3.4.0";
|
version = "3.4.0";
|
||||||
src = fetchPypi {
|
src = fetchFromGitHub {
|
||||||
pname = "paramiko";
|
owner = "paramiko";
|
||||||
inherit version;
|
repo = "paramiko";
|
||||||
hash = "sha256-qsCPJqMdxN/9koIVJ9FoLZnVL572hRloEUqHKPPCdNM=";
|
tag = version;
|
||||||
|
hash = "sha256-V0s9IoRmqXvzYQzzBsWmovYWwXnNC0x1phyiyjbejGA=";
|
||||||
};
|
};
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
meta = oldAttrs.meta // {
|
||||||
|
knownVulnerabilities = [
|
||||||
|
"CVE-2026-44405"
|
||||||
|
];
|
||||||
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -57,13 +57,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "unbound";
|
pname = "unbound";
|
||||||
version = "1.25.0";
|
version = "1.25.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "NLnetLabs";
|
owner = "NLnetLabs";
|
||||||
repo = "unbound";
|
repo = "unbound";
|
||||||
tag = "release-${finalAttrs.version}";
|
tag = "release-${finalAttrs.version}";
|
||||||
hash = "sha256-BAqGNi5lfYYTQd7CPH0lssLc5/AkeuKSVEFcrF/cNyc=";
|
hash = "sha256-1PXnxCPxoB5IrVBQIsrxiWAq+IoH7Ma9T1TTJsoTJc4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user