Compare commits

..

274 Commits

Author SHA1 Message Date
Ramses
e3e78cbb3c gdk-pixbuf: 2.44.7 -> 2.44.8 (#556525) 2026-09-16 11:47:11 +00:00
Arne Keller
ee9d6faf80 ada: enable structuredAttrs, strictDeps, and split outputs (#561058) 2026-09-16 11:45:32 +00:00
misuzu
5e48062abd spandsp: fix url and patch UB on ppc64be (#499147) 2026-09-16 09:42:35 +00:00
Grimmauld
d278faec92 libmicrohttpd: drop libgcrypt (#563739) 2026-09-16 07:38:52 +00:00
Grimmauld
d263f2c84f tpm2-tss: drop unused libgcrypt dependency (#563733) 2026-09-16 07:29:01 +00:00
夜坂雅
b755abea8f libmicrohttpd: drop libgcrypt 2026-09-16 08:28:26 +08:00
whispers
78643f203e tpm2-tss: drop unused libgcrypt dependency
this was removed back in July 2020 with ebfe77b41e.
diffoscoping the outputs yields no differences besides self-references
in store paths.
2026-09-15 18:53:47 -04:00
nixpkgs-ci[bot]
14d9dae8f6 Merge staging-next into staging 2026-09-15 18:10:47 +00:00
nixpkgs-ci[bot]
3550cbd8a9 Merge master into staging-next 2026-09-15 18:10:16 +00:00
Sandro
a860bffebf cryptsetup: 2.8.7 -> 2.8.8 (#561112) 2026-09-15 16:25:01 +00:00
Adam C. Stephens
17ccf5930b libgcrypt: 1.12.2 -> 1.12.4 (#557517) 2026-09-15 16:20:21 +00:00
Cosima Neidahl
c034850abb rust-bindgen: compare platforms with systems.equals (#561492) 2026-09-15 15:54:10 +00:00
Thomas Gerbet
d07e114765 makeBinaryWrapper: reject prefix/suffix with an empty path segment (#548442) 2026-09-15 15:16:58 +00:00
Grimmauld
c7b5584c8a libnice: 0.1.23 -> 0.1.24 (#561344) 2026-09-15 15:06:28 +00:00
Sandro
44778ad15e go_1_26: 1.26.7 -> 1.26.8 (#559669) 2026-09-15 13:42:12 +00:00
nixpkgs-ci[bot]
cd47c2a902 Merge staging-next into staging 2026-09-15 12:13:38 +00:00
nixpkgs-ci[bot]
40bfd164c3 Merge master into staging-next 2026-09-15 12:13:08 +00:00
whoomee
2ba30f5255 libnice: enable tests 2026-09-15 14:11:34 +02:00
Doron Behar
7c4f236b90 mpi: 5.0.10 -> 5.0.11 (#562579) 2026-09-15 08:45:16 +00:00
Bjørn Forsman
d831d24247 liburcu: 0.15.6 -> 0.15.7 (#563348) 2026-09-15 08:22:22 +00:00
Bjørn Forsman
5b00ace03f liburcu: enable strictDeps, enable structuredAttrs (#563379) 2026-09-15 08:21:46 +00:00
nixpkgs-ci[bot]
a6f96b0ea1 Merge staging-next into staging 2026-09-15 06:16:25 +00:00
nixpkgs-ci[bot]
4b300207d9 Merge master into staging-next 2026-09-15 06:15:48 +00:00
LunNova
b024c87e93 lndir: 1.0.5 -> 1.0.6 (#554051) 2026-09-15 02:49:01 +00:00
LunNova
c777c4a106 libmicrohttpd: 1.0.6 -> 1.0.10 (#554471) 2026-09-15 02:48:49 +00:00
nixpkgs-ci[bot]
6a87f493de Merge staging-next into staging 2026-09-15 00:25:53 +00:00
nixpkgs-ci[bot]
a9a6d9769e Merge master into staging-next 2026-09-15 00:25:21 +00:00
Stefan Frijters
857ac80f17 liburcu: enable structuredAttrs 2026-09-15 02:03:00 +02:00
Stefan Frijters
844baee10f liburcu: enable strictDeps 2026-09-15 02:02:45 +02:00
Sergei Trofimovich
015a221101 liburcu: 0.15.6 -> 0.15.7
Changes: https://raw.githubusercontent.com/urcu/userspace-rcu/v0.15.7/ChangeLog
2026-09-14 22:45:29 +01:00
Michael Daniels
523b127f7f dtc: 1.7.2 -> 1.8.1 (#562969) 2026-09-14 21:12:57 +00:00
Michael Daniels
1344a818f6 various: fix hashes 2026-09-14 17:09:04 -04:00
nixpkgs-ci[bot]
a258ec4c55 Merge staging-next into staging 2026-09-14 18:10:55 +00:00
nixpkgs-ci[bot]
3a54b20725 Merge master into staging-next 2026-09-14 18:10:24 +00:00
Colin
52db7cb20a python3Packages.inline-snapshot: skip documentation tests (#560020) 2026-09-14 17:00:18 +00:00
Grimmauld
f3eff0d268 libcap_ng: 0.9.5 -> 0.9.6 (#563204) 2026-09-14 14:31:22 +00:00
Stefan Frijters
8407989025 db{4,5,6}: enable strictDeps, enable structuredAttrs (#557330) 2026-09-14 14:30:12 +00:00
Stefan Frijters
6fcf365873 libpaper: enable strictDeps, enable structuredAttrs (#561054) 2026-09-14 14:13:04 +00:00
Stefan Frijters
c85a6b25b6 imath: enable strictDeps, enable structuredAttrs, modernize (#558324) 2026-09-14 14:12:54 +00:00
Stefan Frijters
002113f64d jbig2dec: enable strictDeps, enable structuredAttrs (#558323) 2026-09-14 14:12:44 +00:00
Stefan Frijters
902db911f7 luit: enable structuredAttrs (#563187) 2026-09-14 14:07:07 +00:00
Stefan Frijters
21e285a65f boehmgc: enable strictDeps, use tag (#557020) 2026-09-14 13:46:25 +00:00
Sandro
491f3db39f lame: 3.100 -> 4.0 (#549371) 2026-09-14 12:38:24 +00:00
nixpkgs-ci[bot]
2a99b27bd9 Merge staging-next into staging 2026-09-14 12:14:46 +00:00
nixpkgs-ci[bot]
e97b635f47 Merge master into staging-next 2026-09-14 12:14:18 +00:00
Michael Daniels
09f46cd8f7 git: fix interpreter paths in contrib scripts (#553198) 2026-09-14 12:07:49 +00:00
teutat3s
9f3ff79769 electron: fix update script, electron_43: update (#561844) 2026-09-14 11:40:53 +00:00
Grimmauld
8eb0079666 Revert "libcap_ng: disable tests on static"
This reverts commit 18219b32ad.
2026-09-14 13:37:04 +02:00
Grimmauld
b19adca688 libcap_ng: 0.9.5 -> 0.9.6 2026-09-14 13:36:15 +02:00
Antoine du Hamel
da8353e689 apache-orc: fix build (#563013) 2026-09-14 08:22:23 +00:00
nixpkgs-ci[bot]
0d533caa25 Merge staging-next into staging 2026-09-14 06:20:52 +00:00
nixpkgs-ci[bot]
83e8c37160 Merge master into staging-next 2026-09-14 06:20:22 +00:00
Michael Daniels
5fc894118b dtc: 1.7.2 -> 1.8.1
Diff: https://github.com/dgibson/dtc/compare/v1.7.2...v1.8.1
2026-09-13 21:23:45 -04:00
nixpkgs-ci[bot]
1582e30993 Merge staging-next into staging 2026-09-14 00:27:24 +00:00
nixpkgs-ci[bot]
0ada4117ca Merge master into staging-next 2026-09-14 00:26:54 +00:00
Antoine du Hamel
e99a883255 apache-orc: fix build 2026-09-13 23:39:20 +02:00
nixpkgs-ci[bot]
f81f3a8561 Merge staging-next into staging 2026-09-13 18:50:44 +00:00
nixpkgs-ci[bot]
421336fd3e Merge master into staging-next 2026-09-13 18:48:00 +00:00
Michael Daniels
ae94a54779 Merge remote-tracking branch 'upstream/staging-next' into staging 2026-09-13 14:44:51 -04:00
nixpkgs-ci[bot]
6312385d3f Merge master into staging-next 2026-09-13 18:10:02 +00:00
ajs124
10a679b628 tzdata: 2026c -> 2026d (#562483) 2026-09-13 15:31:51 +00:00
Aaron Andersen
1daabc4111 ppp: replace systemd dependency with systemdLibs (#554457) 2026-09-13 14:58:14 +00:00
Aaron Andersen
989f6e0e0b networkmanager: replace systemd dependency with systemdMinimal (#554453) 2026-09-13 14:57:47 +00:00
Aaron Andersen
f8841a2925 modemmanager: replace systemd dependency with systemdLibs (#554460) 2026-09-13 14:57:14 +00:00
Aaron Andersen
16144cc92b pulseaudio: replace systemd dependency with systemdLibs (#561419) 2026-09-13 14:55:26 +00:00
Marcus Ramberg
59cce71f7e perlPackages.AuthenSASL: 2.1900 -> 2.2100 (#560920) 2026-09-13 14:05:37 +00:00
nixpkgs-ci[bot]
a34b8e1953 Merge master into staging-next 2026-09-13 12:12:16 +00:00
Wolfgang Walther
60945fb736 unixodbcDrivers.psql: 18.00.0002 -> 18.00.0003 (#562064) 2026-09-13 09:59:09 +00:00
nixpkgs-ci[bot]
b0ff850fc0 Merge master into staging-next 2026-09-13 06:18:04 +00:00
nixpkgs-ci[bot]
78bb6139a2 Merge master into staging-next 2026-09-13 00:27:09 +00:00
Sandro
3464499993 libvpx: 1.16.0 -> 1.17.0 (#556585) 2026-09-12 20:20:04 +00:00
Winter
80979dc81f rust: enable strictDeps / structuredAttrs in its build infrastructure (#559899) 2026-09-12 20:06:21 +00:00
Stefan Frijters
70f533105e luit: enable structuredAttrs 2026-09-12 21:40:26 +02:00
LunNova
9bb742e252 srt: enable strictDeps, enable structuredAttrs, modernize (#558318) 2026-09-12 18:28:59 +00:00
nixpkgs-ci[bot]
f170819950 Merge master into staging-next 2026-09-12 18:09:41 +00:00
dotlambda
3d78ead5d5 python3Packages.pyjwt: 2.13.0 -> 2.14.0 (#562328) 2026-09-12 15:41:12 +00:00
Michael Daniels
9436a21007 protobuf: add proto output to fix protobufc build (#562223) 2026-09-12 14:08:30 +00:00
R. Ryantm
6d7da008fe mpi: 5.0.10 -> 5.0.11 2026-09-12 12:34:32 +00:00
nixpkgs-ci[bot]
cf489720f6 Merge master into staging-next 2026-09-12 12:11:37 +00:00
nixpkgs-ci[bot]
73d3951f2e Merge master into staging-next 2026-09-12 06:13:47 +00:00
ajs124
387081f737 tzdata: 2026c -> 2026d
https://lists.iana.org/hyperkitty/list/tz-announce@iana.org/thread/L4IGHJRBUQR53F7RTEHM5IS7ZMBR3YXP/
2026-09-12 08:10:21 +02:00
Randy Eckenrode
4276ad9330 lldb: backport export trie fixes to LLDB 22 and older (#560288) 2026-09-12 00:55:20 +00:00
nixpkgs-ci[bot]
a4ccc8d0d6 Merge master into staging-next 2026-09-12 00:23:25 +00:00
Nick Cao
06ee12b968 protobuf: fix typo in pkgConfigModules (#562204) 2026-09-11 18:55:35 +00:00
nixpkgs-ci[bot]
d400b12e47 Merge master into staging-next 2026-09-11 18:10:14 +00:00
Robert Schütz
409bbcafb7 python3Packages.pyjwt: use finalAttrs 2026-09-11 09:57:12 -07:00
Robert Schütz
70a62b6872 python3Packages.pyjwt: 2.13.0 -> 2.14.0
Diff: https://github.com/jpadilla/pyjwt/compare/2.13.0...2.14.0

Changelog: https://github.com/jpadilla/pyjwt/blob/2.14.0/CHANGELOG.rst
2026-09-11 08:51:50 -07:00
whispers
ae02526138 libgcrypt: 1.12.2 -> 1.12.4
https://lists.gnu.org/archive/html/info-gnu/2026-08/msg00007.html
https://lists.gnu.org/archive/html/info-gnu/2026-09/msg00002.html
2026-09-11 09:17:33 -04:00
Antoine du Hamel
ef2080c04e nghttp3: 1.16.0 -> 1.17.0 (#542067) 2026-09-11 12:21:15 +00:00
K900
8596db6bc8 qt6.qtdeclarative: backport change recommended by KDE (#562228) 2026-09-11 10:13:31 +00:00
K900
d9d2e944dc qt6.qtdeclarative: backport change recommended by KDE 2026-09-11 13:07:17 +03:00
Antoine du Hamel
31e7b77199 protobuf: add proto output to fix protobufc build 2026-09-11 11:45:52 +02:00
teutat3s
723f7f655b electron: fix update script
https://github.com/NixOS/nixpkgs/pull/555729 changed yarn hashes but
didn't apply the changes to the electron update script.
2026-09-11 11:11:09 +02:00
Markus Kowalewski
9944c84aed rdma-core: 64.0 -> 65.0 (#561851) 2026-09-11 08:27:40 +00:00
Antoine du Hamel
9e8378652d protobuf: fix typo in pkgConfigModules 2026-09-11 09:59:04 +02:00
Vladimír Čunát
5febd09562 gstreamer: 1.28.6 -> 1.28.7 (#561359) 2026-09-11 07:16:31 +00:00
Vladimír Čunát
874e3b2cf7 xz: 5.8.3 -> 5.8.4 (#561722) 2026-09-11 07:13:56 +00:00
Vladimír Čunát
7c08908394 libheif: 1.23.3 -> 1.23.4 (#561053) 2026-09-11 07:12:11 +00:00
R. Ryantm
913c7c9d08 unixodbcDrivers.psql: 18.00.0002 -> 18.00.0003 2026-09-11 01:16:42 +00:00
Randy Eckenrode
53b813b166 lldb: backport export trie fixes to LLDB 22 and older
Older versions of LLDB crash on macOS 27 when starting a debugging
session on macOS 27 due to a stack overflow in `ParseExportTries`.

The fixes from LLVM 23 can’t be cherry-picked due to other changes. They
have been manually backported and squashed into a single patch.
2026-09-10 20:51:32 -04:00
Michael Daniels
86b171da65 Revert "meson: don't set postPatch at all if not using PyPy"
This reverts commit ef3d7e646a.
2026-09-10 19:26:18 -04:00
Grimmauld
6d2ce9dc6b orc: 0.4.42 -> 0.4.44 (#557688) 2026-09-10 20:50:49 +00:00
whoomee
0667451352 orc: specify meta.identifiers.cpeParts 2026-09-10 21:41:07 +02:00
whoomee
075f08ee5b orc: refactor mesonFlags 2026-09-10 21:41:07 +02:00
whoomee
f95cc368a1 orc: re-enable buildDevDoc 2026-09-10 21:41:07 +02:00
whoomee
87a9c3a077 orc: specify and test meta.pkgConfigModules 2026-09-10 21:41:07 +02:00
whoomee
f6f7fa5fb7 orc: set updateScript 2026-09-10 21:41:07 +02:00
whoomee
3113b9085a orc: 0.4.42 -> 0.4.44 2026-09-10 21:41:07 +02:00
Sandro
1a5e3f739a nixosTests.installed-tests.gjs: fix build (#557190) 2026-09-10 13:37:04 +00:00
rewine
bf95a36adb simdutf: 9.1.0 -> 9.1.1 (#561319) 2026-09-10 12:38:29 +00:00
Stefan Frijters
44d4b38a94 go: enable strictDeps, structuredAttrs for bootstrap, use stdenvNoCC (#559867) 2026-09-10 10:13:10 +00:00
R. Ryantm
6d4f039414 rdma-core: 64.0 -> 65.0 2026-09-10 08:52:03 +00:00
Masum Reza
a75253b6ce bcachefs-tools: remove RISC-V bindgen workaround (#561500) 2026-09-10 05:58:24 +00:00
Michael Daniels
33942a2e77 meson: 1.10.2 -> 1.12.0, modernize (#548621) 2026-09-09 22:22:12 +00:00
Michael Daniels
1fbebaa13c glibmm*: add explicit version suffix to attr, enable structuredAttrs and strictDeps (#559692) 2026-09-09 22:14:49 +00:00
Sergei Trofimovich
49054352ce xz: 5.8.3 -> 5.8.4
Changes: https://github.com/tukaani-project/xz/releases/tag/v5.8.4
2026-09-09 21:38:11 +01:00
nixpkgs-ci[bot]
cb9b0c0b77 bitfocus-companion: 4.3.4 -> 5.0.5 (#560954) 2026-09-09 16:31:19 +00:00
nixpkgs-ci[bot]
8c5a2e3922 Merge staging-next into staging 2026-09-09 06:15:57 +00:00
Jamie Magee
9cd092bab4 bcachefs-tools: remove RISC-V bindgen workaround 2026-09-08 22:03:40 -07:00
Jamie Magee
e86865624d rust-bindgen: compare platforms with systems.equals 2026-09-08 20:19:55 -07:00
Michael Daniels
a5de2edf4b cmake: 4.4.2 -> 4.4.3 (#560301) 2026-09-09 00:38:40 +00:00
nixpkgs-ci[bot]
895225db0a Merge staging-next into staging 2026-09-09 00:25:39 +00:00
Antoine du Hamel
c3af716c01 nodejs_24: 24.20.0 -> 24.21.0 (#561432) 2026-09-08 22:14:47 +00:00
Antoine du Hamel
e1459ab0f2 nodejs_24: 24.20.0 -> 24.21.0 2026-09-08 23:52:48 +02:00
Aaron Andersen
9ae024d506 pulseaudio: replace systemd dependency with systemdLibs 2026-09-08 16:52:30 -04:00
Markus Kowalewski
3e0695468c ucc: 1.8.0 -> 1.9.0 (#561369) 2026-09-08 20:32:08 +00:00
nixpkgs-ci[bot]
e98e6f357c Merge staging-next into staging 2026-09-08 20:34:05 +00:00
Antoine du Hamel
e1dbe60fcb protobuf: add meta.pkgConfigModules, split outputs (#560607) 2026-09-08 19:36:15 +00:00
Tom Hunze
5be4a69984 glibmm_2_68: enable structuredAttrs and strictDeps 2026-09-08 21:34:38 +02:00
Tom Hunze
0b8536ce92 glibmm_2_4: enable structuredAttrs and strictDeps 2026-09-08 21:34:37 +02:00
Tom Hunze
c0e8f0697b glibmm: rename to glibmm_2_4
Having the older ABI version as the default seems odd and the different
glibmm packages appear to be fundamentally incompatible, so drop the
unsuffixed version similar to webkitgtk and as discussed in [1].

[1] https://github.com/NixOS/nixpkgs/pull/543345#issuecomment-5199018730
2026-09-08 21:34:33 +02:00
R. Ryantm
594199fa6d ucc: 1.8.0 -> 1.9.0 2026-09-08 18:43:03 +00:00
whoomee
d3aad09b0f gstreamer: 1.28.6 -> 1.28.7 2026-09-08 20:23:50 +02:00
nixpkgs-ci[bot]
667251099c Merge staging-next into staging 2026-09-08 18:11:42 +00:00
whoomee
c504504011 libnice: 0.1.23 -> 0.1.24 2026-09-08 18:40:48 +02:00
Weijia Wang
2906d09f24 simdutf: 9.1.0 -> 9.1.1 2026-09-08 18:12:55 +02:00
Stefan Frijters
3f9ac46801 libmad: enable strictDeps, enable structuredAttrs, modernize (#561069) 2026-09-08 15:11:16 +00:00
nixpkgs-ci[bot]
a5cf0fec59 Merge staging-next into staging 2026-09-08 12:14:31 +00:00
Colin
8b478022c0 rust-bindgen: pass target triple when cross-compiling (#558886) 2026-09-08 07:20:23 +00:00
nixpkgs-ci[bot]
f60c533f50 libsoup_3: enable strictDeps, enable structuredAttrs, modernize (#561067) 2026-09-08 06:44:20 +00:00
rewine
a5b02745d1 simdutf: split in multiple outputs (#561070) 2026-09-08 02:47:56 +00:00
R. Ryantm
24e4fd5341 cryptsetup: 2.8.7 -> 2.8.8 2026-09-08 01:02:28 +00:00
nixpkgs-ci[bot]
93bc9015b0 Merge staging-next into staging 2026-09-08 00:25:33 +00:00
Antoine du Hamel
9f452abaef simdjson: split in multiple outputs (#561068) 2026-09-07 22:59:53 +00:00
Antoine du Hamel
6c3c849e11 simdutf: split in multiple outputs 2026-09-08 00:51:38 +02:00
Stefan Frijters
437e4699e0 libmad: enable structuredAttrs 2026-09-08 00:48:41 +02:00
Antoine du Hamel
c34953c17f simdjson: split in multiple outputs 2026-09-08 00:48:15 +02:00
Stefan Frijters
a086377e58 libmad: enable strictDeps 2026-09-08 00:48:13 +02:00
Stefan Frijters
bd30f1ebbf libsoup_3: modernize 2026-09-08 00:41:58 +02:00
Stefan Frijters
171d4b6f98 libsoup_3: enable structuredAttrs 2026-09-08 00:41:48 +02:00
Stefan Frijters
59391f774d libsoup_3: enable strictDeps 2026-09-08 00:41:20 +02:00
Antoine du Hamel
6fb5cdb9a3 ada: split in two outputs 2026-09-08 00:09:58 +02:00
Antoine du Hamel
1b3d9fa3af ada: enable strictDeps 2026-09-08 00:09:58 +02:00
Antoine du Hamel
b76aeb3d38 ada: enable structuredAttrs 2026-09-08 00:09:49 +02:00
Stefan Frijters
f7bb6dd755 libpaper: enable structuredAttrs 2026-09-08 00:00:20 +02:00
Stefan Frijters
6d5884d31c libpaper: enable strictDeps 2026-09-08 00:00:05 +02:00
Sergei Trofimovich
be981eb018 libheif: 1.23.3 -> 1.23.4
Changes: https://github.com/strukturag/libheif/releases/tag/v1.23.4
2026-09-07 22:56:22 +01:00
dotlambda
561e33fa9a catch2_3: 3.15.3 -> 3.16.0 (#557906) 2026-09-07 20:57:12 +00:00
dotlambda
f55420bb42 gpgme: 2.1.2 -> 2.2.0 (#558649) 2026-09-07 20:05:18 +00:00
Cosima Neidahl
988efea9a3 python3Packages.appnope: 0.1.4 -> 1.0.0 (#557883) 2026-09-07 18:41:45 +00:00
nixpkgs-ci[bot]
7ed8d225d3 Merge staging-next into staging 2026-09-07 18:11:10 +00:00
nixpkgs-ci[bot]
8f01c55eb6 Merge staging-next into staging 2026-09-07 17:16:39 +00:00
Tiebe Groosman
73714887c9 bitfocus-companion: 4.3.4 -> 5.0.5 2026-09-07 19:00:00 +02:00
sh0uv1
55c902a0a0 perlPackages.AuthenSASL: 2.1900 -> 2.2100 2026-09-07 15:40:57 +00:00
Michael Daniels
9bdf09b40d meson: respect NIX_BUILD_CORES in tests 2026-09-07 10:43:59 -04:00
Michael Daniels
fdb2910f21 meson: use --replace-fail, lib.getExe' 2026-09-07 10:43:59 -04:00
Michael Daniels
ef3d7e646a meson: don't set postPatch at all if not using PyPy
I prefer this formatting, I think.
2026-09-07 10:43:59 -04:00
Michael Daniels
52048f3175 meson: set optional-dependencies 2026-09-07 10:43:59 -04:00
Michael Daniels
e39541fd76 meson: combine installShellCompletion calls 2026-09-07 10:43:58 -04:00
Michael Daniels
a3b310ec27 meson: set __structuredAttrs = true 2026-09-07 10:43:58 -04:00
Michael Daniels
57c2cd9c5f meson: use writableTmpDirAsHomeHook 2026-09-07 10:43:58 -04:00
Michael Daniels
e375bc6272 meson: set pyproject = true 2026-09-07 10:43:58 -04:00
Michael Daniels
a5d4caecd5 meson: use finalAttrs 2026-09-07 10:43:46 -04:00
Sandro
6aec222ae9 yarn-berry: 4.14.1 -> 4.18.0 (#555729) 2026-09-07 13:55:22 +00:00
nixpkgs-ci[bot]
d84ca0a63a Merge staging-next into staging 2026-09-07 12:14:22 +00:00
Martin Weinelt
c8cb97df0b python3Packages.psycopg: 3.3.4 -> 3.3.5 (#560729) 2026-09-07 11:53:22 +00:00
Stefan Frijters
97b6bd89d6 python3Packages.dirty-equals: fix tests, modernize (#545428) 2026-09-07 11:47:28 +00:00
Martin Weinelt
77ad8ec37e python3Packages.psycopg: 3.3.4 -> 3.3.5
https://github.com/psycopg/psycopg/blob/3.3.5/docs/news.rst#current-release
2026-09-07 13:42:08 +02:00
Dimitar Nestorov
d251914e23 yarn-berry_4: 4.14.1 -> 4.18.0 2026-09-07 14:11:57 +03:00
Dimitar Nestorov
8f7ca3386c yarn-berry: add lockfileVersion 2026-09-07 10:18:47 +03:00
nixpkgs-ci[bot]
d825874f52 Merge staging-next into staging 2026-09-07 06:20:27 +00:00
Michael Daniels
003cd78447 meson: 1.10.2 -> 1.12.0 2026-09-06 22:38:11 -04:00
nixpkgs-ci[bot]
8d729f45a9 Merge staging-next into staging 2026-09-07 00:27:25 +00:00
Antoine du Hamel
dc3cf5062f protobuf: add meta.pkgConfigModules 2026-09-07 00:25:28 +02:00
K900
3df3d22a78 Merge remote-tracking branch 'origin/staging-next' into staging 2026-09-06 21:14:57 +03:00
Michael Daniels
95e3ac8836 Revert "unixodbcDrivers.mariadb: 3.2.6 -> 3.2.8, adopt" (#560612) 2026-09-06 17:40:47 +00:00
Antoine du Hamel
41d426db5b protobuf: use separate outputs 2026-09-06 19:11:41 +02:00
Stefan Frijters
dcaa8f4370 libidn2: enable strictDeps, structuredAttrs for non-bootstrap build, modernize (#558336) 2026-09-06 15:42:24 +00:00
Stefan Frijters
ebd2073a2e iana-etc: enable strictDeps, enable structuredAttrs, modernize (#559869) 2026-09-06 15:41:01 +00:00
Stefan Frijters
88bd0f2d61 simdjson: enable strictDeps, enable structuredAttrs (#558316) 2026-09-06 15:40:44 +00:00
nixpkgs-ci[bot]
cb710b720c nodejs deps: enable structuredAttrs, strictDeps, and multiple outputs (#560569) 2026-09-06 14:51:29 +00:00
Antoine du Hamel
bda34026b7 uvwasi: enable structuredAttrs, strictDeps, and multiple outputs 2026-09-06 16:31:00 +02:00
Antoine du Hamel
303384d3a0 nbytes: enable structuredAttrs, strictDeps, and multiple outputs 2026-09-06 16:30:59 +02:00
Antoine du Hamel
fb3f389bc7 merve: enable structuredAttrs, strictDeps, and multiple outputs 2026-09-06 16:30:57 +02:00
Michael Daniels
311a15ebb5 Revert "unixodbcDrivers.mariadb: 3.2.6 -> 3.2.8, adopt" 2026-09-06 10:24:07 -04:00
Gaétan Lepage
583ee25c96 abseil-cpp: 20260107.1 -> 20260817.0 (#559122) 2026-09-06 12:51:00 +00:00
nixpkgs-ci[bot]
c9196da4ac Merge staging-next into staging 2026-09-06 12:12:19 +00:00
Ihar Hrachyshka
4cc41c63ec go: drop GO111MODULE (#560250) 2026-09-06 10:36:44 +00:00
Arne Keller
9bafdc01bb swig: fix cross-compilation (#544392) 2026-09-06 10:34:44 +00:00
Yt
090f51b888 grpc: 1.83.0 -> 1.83.1 (#560468) 2026-09-06 09:43:33 +00:00
scraptux
93880b986b python3Packages.grpcio-tools: 1.83.0 -> 1.83.1 2026-09-06 10:38:19 +02:00
scraptux
35678e2de5 python3Packages.grpcio-testing: 1.83.0 -> 1.83.1 2026-09-06 10:38:16 +02:00
scraptux
17b9bc2c15 python3Packages.grpcio-status: 1.83.0 -> 1.83.1 2026-09-06 10:38:14 +02:00
scraptux
37869fcefa python3Packages.grpcio-reflection: 1.83.0 -> 1.83.1 2026-09-06 10:38:12 +02:00
scraptux
f6254e7328 python3Packages.grpcio-health-checking: 1.83.0 -> 1.83.1 2026-09-06 10:38:10 +02:00
scraptux
2bbce9fb11 python3Packages.grpcio-channelz: 1.83.0 -> 1.83.1 2026-09-06 10:38:08 +02:00
scraptux
201de3c140 python3Packages.grpcio: 1.83.0 -> 1.83.1 2026-09-06 10:38:07 +02:00
scraptux
7f3ed9c6ac grpc: 1.83.0 -> 1.83.1 2026-09-06 10:38:04 +02:00
nixpkgs-ci[bot]
87bbf878ad Merge staging-next into staging 2026-09-06 06:14:22 +00:00
Michael Daniels
6ef62b1961 unixodbcDrivers.mariadb: 3.2.6 -> 3.2.8, adopt (#508355) 2026-09-06 01:29:11 +00:00
Hythera
11737cb0a4 unixodbcDrivers.mariadb: add hythera as maintainer 2026-09-05 21:17:06 -04:00
Hythera
d0c819d62c unixodbcDrivers.mariadb: modernize 2026-09-05 21:17:05 -04:00
Hythera
0ce7459b96 unixodbcDrivers.mariadb: 3.2.6 -> 3.2.9
changelog: https://mariadb.com/docs/release-notes/connectors/odbc/3.2/3.2.9

diff: https://github.com/mariadb-corporation/mariadb-connector-odbc/compare/3.2.6...3.2.9
2026-09-05 21:17:05 -04:00
Michael Daniels
05473b9ce0 shared-mime-info: 2.4 -> 2.5.1 (#537027) 2026-09-06 01:15:23 +00:00
nixpkgs-ci[bot]
8a37da22c5 Merge staging-next into staging 2026-09-06 00:28:00 +00:00
Michael Daniels
2d83a9af4a libqrtr-glib: 1.2.2 -> 1.4.0 (#531104) 2026-09-06 00:17:09 +00:00
Hythera
7315bec432 shared-mime-info: 2.4 -> 2.5.1
changelog: https://gitlab.freedesktop.org/xdg/shared-mime-info/-/blob/2.5.1/NEWS

diff: https://gitlab.freedesktop.org/xdg/shared-mime-info/-/compare/2.4...2.5.1
2026-09-06 01:17:09 +02:00
Stefan Frijters
0683ad8c01 go: use stdenvNoCC for bootstrap 2026-09-05 23:29:33 +02:00
Stefan Frijters
e5a1f49564 go: enable structuredAttrs for bootstrap 2026-09-05 23:29:32 +02:00
Stefan Frijters
da685c6c16 go: enable strictDeps for bootstrap 2026-09-05 23:29:32 +02:00
Michael Daniels
e49d7187f7 libmysofa: enable tests (#560238) 2026-09-05 20:18:46 +00:00
Michael Daniels
39632953ba cmake: 4.4.2 -> 4.4.3
Changelog: https://cmake.org/cmake/help/v4.4/release/4.4.html
Diff: https://github.com/Kitware/CMake/compare/v4.4.2...v4.4.3
2026-09-05 16:05:36 -04:00
Michael Daniels
704f32146a libmysofa: enable tests 2026-09-05 14:59:09 -04:00
Sandro Jäckel
9a1444ff8a go: drop GO111MODULE
This defaults to on since go 1.16, see https://go.dev/ref/mod#mod-commands
2026-09-05 18:07:22 +02:00
hakan-demirli
00588fd903 python3Packages.inline-snapshot: skip documentation tests 2026-09-05 00:35:22 +02:00
Stefan Frijters
4cbf08b937 rustc: enable strictDeps 2026-09-04 15:33:32 +02:00
Stefan Frijters
05283c8449 cargo: enable structuredAttrs 2026-09-04 15:33:00 +02:00
Stefan Frijters
6749ed78c9 cargo-auditable-cargo-wrapper: enable strictDeps, enable structuredAttrs 2026-09-04 15:32:29 +02:00
Stefan Frijters
e9c36d6b0f cargo: enable strictDeps, enabled structuredAttrs for binary derivation 2026-09-04 15:31:18 +02:00
Stefan Frijters
d1c11f1d55 rustc: enable strictDeps, enable structuredAttrs for binary derivation 2026-09-04 15:30:27 +02:00
Stefan Frijters
5975da64bb rustc: enable structuredAttrs in wrapper 2026-09-04 15:28:11 +02:00
Stefan Frijters
0b1d179e29 rustPlatform.fetchCargoVendor: enable strictDeps, enable structuredAttrs 2026-09-04 15:27:04 +02:00
Stefan Frijters
0da45eb98e iana-etc: enable structuredAttrs, use finalAttrs, use hash 2026-09-04 13:55:23 +02:00
Stefan Frijters
11c8783464 iana-etc: enable strictDeps 2026-09-04 13:55:23 +02:00
whispers
54c6f0648c go_1_26: 1.26.7 -> 1.26.8
changelog: https://go.dev/doc/devel/release#go1.26.minor
diff: https://github.com/golang/go/compare/go1.26.7...go1.26.8
2026-09-03 18:05:17 -04:00
Gaetan Lepage
2ad46cfb95 abseil-cpp: 20260107.1 -> 20260817.0
Diff:
https://github.com/abseil/abseil-cpp/compare/20260107.1...20260817.0

Changelogs:
- https://github.com/abseil/abseil-cpp/releases/tag/20260526.0
- https://github.com/abseil/abseil-cpp/releases/tag/20260817.0
2026-09-02 12:36:50 +00:00
Robert Schütz
1163f773c6 gpgmepp: 2.1.0 -> 2.2.0
Changelog: https://dev.gnupg.org/source/gpgmepp/browse/master/NEWS;gpgmepp-2.2.0?as=remarkup
2026-09-01 15:03:01 -07:00
Jamie Magee
44869a3612 rust-bindgen: pass target triple when cross-compiling 2026-09-01 14:11:27 -07:00
Robert Schütz
7fa51063df gpgme: 2.1.2 -> 2.2.0
Changelog: https://github.com/gpg/gpgme/blob/gpgme-2.2.0/NEWS
2026-08-31 19:46:46 -07:00
Stefan Frijters
6fd9290118 libidn2: modernize non-bootstrap build, fix comment 2026-08-31 12:06:57 +02:00
Stefan Frijters
971823d346 libidn2: enable strictDeps and structuredAttrs for non-bootstrap build 2026-08-31 12:06:49 +02:00
Stefan Frijters
a1c497ad0e srt: enable structuredAttrs, use tag/hash 2026-08-31 11:40:36 +02:00
Stefan Frijters
f3dedf6799 srt: enable strictDeps 2026-08-31 11:40:34 +02:00
Stefan Frijters
fd5f39bb5c simdjson: enable structuredAttrs 2026-08-31 11:37:57 +02:00
Stefan Frijters
849f0cc989 simdjson: enable strictDeps 2026-08-31 11:37:56 +02:00
Stefan Frijters
dceabcb721 jbig2dec: enable structuredAttrs 2026-08-31 11:36:57 +02:00
Stefan Frijters
7e51d02b33 jbig2dec: enable strictDeps 2026-08-31 11:36:56 +02:00
Stefan Frijters
93a0568e38 imath: enable structuredAttrs, use tag 2026-08-31 11:36:30 +02:00
Stefan Frijters
c55bf541fe imath: enable strictDeps 2026-08-31 11:35:31 +02:00
OPNA2608
7adb46d173 python3Packages.appnope: 0.1.4 -> 1.0.0 2026-08-30 21:10:33 +02:00
Robert Schütz
d801a11a6b catch2_3: use finalAttrs 2026-08-29 21:51:49 -07:00
Robert Schütz
cb288385c4 catch2_3: 3.15.3 -> 3.16.0
Diff: https://github.com/catchorg/Catch2/compare/v3.15.3...v3.16.0

Changelog: https://github.com/catchorg/Catch2/blob/v3.16.0/docs/release-notes.md
2026-08-29 21:50:05 -07:00
Tom Hunze
107da3649c nixosTests.installed-tests.gjs: fix build
These tests require cairo and xlib typelibs.

Hydra: https://hydra.nixos.org/build/343716867
2026-08-28 12:17:56 +02:00
Stefan Frijters
bcff0884c7 db{4,5,6}: enable structuredAttrs 2026-08-28 11:39:02 +02:00
Stefan Frijters
191d65e9b0 db{4,5,6}: enable strictDeps 2026-08-28 11:38:44 +02:00
Stefan Frijters
3117f84f1d boehmgc: enable strictDeps, use tag 2026-08-27 13:10:10 +02:00
R. Ryantm
17a75aa77d libvpx: 1.16.0 -> 1.17.0 2026-08-26 00:45:19 +00:00
Sergei Trofimovich
77e8072674 gdk-pixbuf: 2.44.7 -> 2.44.8
Changes: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/compare/2.44.7...2.44.8
2026-08-25 21:34:09 +01:00
Oleksandr Usov
1e8e68e5a9 git: fix interpreter paths in contrib scripts 2026-08-24 20:13:00 +01:00
Sergei Trofimovich
5f16fc985c libmicrohttpd: 1.0.6 -> 1.0.10 2026-08-19 22:01:58 +01:00
Aaron Andersen
b25306b0d4 ppp: replace systemd dependency with systemdLibs 2026-08-19 16:30:04 -04:00
Aaron Andersen
66b6f41fd3 networkmanager: replace systemd dependency with systemdMinimal 2026-08-18 20:41:35 -04:00
Aaron Andersen
58d084bdd2 modemmanager: replace systemd dependency with systemdLibs 2026-08-18 20:34:56 -04:00
Sergei Trofimovich
17e5e45040 lndir: 1.0.5 -> 1.0.6
Changes: https://www.mail-archive.com/xorg-announce@lists.x.org/msg01945.html
2026-08-18 21:28:58 +01:00
Aaron Jheng
0a9281fd8d lame: 3.100 -> 4.0 2026-08-17 08:35:43 +08:00
crumblingMizzle
6d980c2264 swig: fix cross-compilation 2026-08-03 18:33:25 -04:00
Thomas Gerbet
d2cbb4ba81 makeBinaryWrapper: reject prefix/suffix with an empty path segment
Preferred to reject explictly the value instead of silently sanitizing
it. It's closer to what we do for the invalid env name and it will allow
us to spot derivation that were impacted by the issue that has not yet
been fixed.
2026-08-02 17:01:28 +02:00
Stefan Frijters
ed5ca467b9 python3Packages.dirty-equals: enable structuredAttrs, use finalAttrs 2026-07-25 01:39:55 +02:00
Stefan Frijters
7eb51f62c7 python3Packages.dirty-equals: fix tests
The tests were not actually enabled with overrideAttrs instead
of overridePythonAttrs.

Enabling them exposed a failure.
2026-07-25 01:39:51 +02:00
R. Ryantm
54c1571722 nghttp3: 1.16.0 -> 1.17.0 2026-07-15 04:27:21 +00:00
Hythera
a734897cbe libqrtr-glib: 1.2.2 -> 1.4.0
diff: https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib/-/compare/1.2.2...1.4.0
2026-06-12 20:25:53 +02:00
Amaan Qureshi
c4d7c303d3 spandsp: disable lpc10_tests on ppc64
The LPC-10 test checks decoded audio against a reference WAV generated
on x86. On POWER, small float rounding differences in the encoder
accumulate over hundreds of frames and eventually produce different
output, even though the codec itself works correctly.
2026-03-12 06:03:13 -04:00
Amaan Qureshi
7dbd6409f8 spandsp: fix bit_operations_tests UB on ppc64be 2026-03-12 00:52:39 -04:00
Amaan Qureshi
10a4220c8a spandsp: fix dead source URL, add mirror 2026-03-12 00:44:19 -04:00
416 changed files with 3919 additions and 2946 deletions

View File

@@ -562,29 +562,6 @@ stdenv.mkDerivation (finalAttrs: {
})
```
##### `fetchYarnDeps` arguments {#javascript-fetchyarndeps}
`fetchYarnDeps` accepts the following arguments:
- `yarnLock`: Path to the `yarn.lock` file to fetch dependencies for.
- `hash` (or `sha256`): The output hash of the offline cache.
- `mirrorUrl`: Optional registry mirror URL used in place of the default yarn
registry (`https://registry.yarnpkg.com/`). When set, any resolved URL
pointing at the default registry is rewritten to use this mirror before
downloading. This is useful for pointing at a local or internal registry
mirror. Note that changing the mirror does not change the output hash, since
the downloaded contents are identical.
```nix
{
yarnOfflineCache = fetchYarnDeps {
yarnLock = finalAttrs.src + "/yarn.lock";
mirrorUrl = "https://registry.npmmirror.com/";
hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
};
}
```
##### `yarnConfigHook` arguments {#javascript-yarnconfighook}
By default, `yarnConfigHook` relies upon the attribute `${yarnOfflineCache}` (or `${offlineCache}` if the former is not set) to find the location of the offline cache produced by `fetchYarnDeps`. To disable this phase, you can set `dontYarnInstallDeps = true` or override the `configurePhase`.

View File

@@ -3906,9 +3906,6 @@
"javascript-yarn-v3-v4": [
"index.html#javascript-yarn-v3-v4"
],
"javascript-fetchyarndeps": [
"index.html#javascript-fetchyarndeps"
],
"javascript-yarnconfighook": [
"index.html#javascript-yarnconfighook"
],

View File

@@ -12455,11 +12455,6 @@
githubId = 17727163;
keys = [ { fingerprint = "FBAA B86A 101B 4C5F D4F1 25D2 E93D DAC1 7E5D 6CA1"; } ];
};
itsyunaya = {
name = "Ashley Marino";
github = "itsyunaya";
githubId = 40719746;
};
ius = {
email = "j.de.gram@gmail.com";
name = "Joerie de Gram";

View File

@@ -119,7 +119,7 @@ lusc_luv,,,,,,
lush.nvim,,,https://luarocks.org/dev,,,teto
luuid,,,,20120509-2,,
lyaml,,,,,,lblasc
lz.n,,,,,5.1,mrcjkb
lz.n,,,,,,mrcjkb
lze,,,,,,birdee
lzextras,,,,,,birdee
lzn-auto-require,,,,,,mrcjkb
1 name rockspec ref server version luaversion maintainers
119 lush.nvim https://luarocks.org/dev teto
120 luuid 20120509-2
121 lyaml lblasc
122 lz.n 5.1 mrcjkb
123 lze birdee
124 lzextras birdee
125 lzn-auto-require mrcjkb

View File

@@ -197,8 +197,6 @@
- A number of options for `services.llama-cpp` have been removed in favor of the structured [](#opt-services.llama-cpp.settings) option, attributes from which are used as arguments to `llama-server` executable, you can see all available options by running `llama-server --help`. Configuring model presets using Nix attribute set via `services.llama-cpp.modelsPreset` is no longer supported, please use `services.llama-cpp.settings.models-preset` with a path to an INI file containing desired options.
- `ensure-printers.service` has been replaced with an `ExecStartPost` hook in `cups.service`. If you have made any manual modifications to this unit, you should move the modifications to `cups.service` instead.
- The `NIX_XDG_DESKTOP_PORTAL_DIR` environment variable is no longer used in the `xdg-desktop-portal` package and is therefore no longer set in `xdg.portal` module.
Instead the `XDG_DATA_DIRS` environment variable is used to find xdg-portals.

View File

@@ -21,11 +21,103 @@ let
submodule
;
ensurePrinter =
p:
let
args = lib.cli.toCommandLineShellGNU { } (
{
p = p.name;
v = p.deviceUri;
m = p.model;
}
// lib.optionalAttrs (p.location != null) {
L = p.location;
}
// lib.optionalAttrs (p.description != null) {
D = p.description;
}
// lib.optionalAttrs (p.ppdOptions != { }) {
o = lib.mapAttrsToList (name: value: "${name}=${value}") p.ppdOptions;
}
);
in
''
# shellcheck disable=SC2016
${pkgs.cups}/bin/lpadmin ${args} -E
'';
ensureDefaultPrinter = name: ''
${pkgs.cups}/bin/lpadmin -d '${name}'
'';
# "graph but not # or /" can't be implemented as regex alone due to missing lookahead support
noInvalidChars = str: lib.all (c: c != "#" && c != "/") (lib.stringToCharacters str);
printerName = (lib.types.addCheck (lib.types.strMatching "[[:graph:]]+") noInvalidChars) // {
description = "printable string without spaces, # and /";
};
getPrinters =
class:
lib.uniqueStrings (
lib.concatLists (
lib.textClosureList (lib.mapAttrs (
_:
{
classes ? [ ],
printers ? [ ],
...
}:
{
deps = classes;
text = printers;
}
) cfg.ensureClasses) [ class ]
)
);
mkClass = name: ''
lpadmin -p _tmp -v file:/dev/null
lpadmin -p _tmp -c ${escapeShellArg name}
lpadmin -x _tmp
'';
populateClass =
name:
{
description ? null,
location ? null,
...
}:
lib.concatStringsSep "\n" [
(lib.optionalString (location != null) ''
lpadmin -p ${escapeShellArg name} -L ${escapeShellArg location}
'')
(lib.optionalString (description != null) ''
lpadmin -p ${escapeShellArg name} -D ${escapeShellArg description}
'')
];
addPrintersToClass =
className: class:
let
printers = getPrinters className;
addToClass = printer: ''
lpadmin -p ${escapeShellArg printer} -c ${escapeShellArg className}
'';
in
map addToClass printers;
enableClass = className: ''
cupsenable ${escapeShellArg className}
cupsaccept ${escapeShellArg className}
'';
# if CUPS is configured only to start when it's needed, we can kill the service
# once the printer setup is done. However, if stateless is configured then we
# can't shut down the servive without losing the printers (and classes) we
# *just* configured.
ultimatelyStopCups = with config.services.printing; startWhenNeeded && !stateless;
in
{
options = {
@@ -180,202 +272,172 @@ in
};
};
config = lib.mkIf config.services.printing.enable {
assertions = [
(
let
referencedClasses = lib.unique (
lib.flatten (
lib.mapAttrsToList (
_:
{
classes ? [ ],
...
}:
classes
) cfg.ensureClasses
)
);
definedClasses = lib.attrNames cfg.ensureClasses;
missingClasses = lib.subtractLists definedClasses referencedClasses;
getReferencingClasses =
missingClass:
(lib.mapAttrsToList (name: _: "`${name}`") (
lib.filterAttrs (
_:
{
classes ? [ ],
...
}:
builtins.elem missingClass classes
) cfg.ensureClasses
));
in
{
assertion = missingClasses == [ ];
message = ''
One or more values of `config.hardware.printers.ensureClasses.<name>.classes`
contained values not present in `config.hardware.printers.ensureClasses`
Missing classes:
${lib.concatMapStringsSep "\n" (
p: " - `${p}` (included in class(es): ${lib.concatStringsSep ", " (getReferencingClasses p)})"
) missingClasses}
'';
}
)
(
let
referencedPrinters = lib.unique (
lib.flatten (
lib.mapAttrsToList (
_:
{
printers ? [ ],
...
}:
printers
) cfg.ensureClasses
)
);
definedPrinters = lib.catAttrs "name" cfg.ensurePrinters;
missingPrinters = lib.subtractLists definedPrinters referencedPrinters;
getReferencingClasses =
missingPrinter:
(lib.mapAttrsToList (name: _: "`${name}`") (
lib.filterAttrs (
_:
{
printers ? [ ],
...
}:
builtins.elem missingPrinter printers
) cfg.ensureClasses
));
in
{
assertion = missingPrinters == [ ];
message = ''
One or more values of `config.hardware.printers.ensureClasses.<name>.printers`
contained values not present in `config.hardware.printers.ensurePrinters`
Missing printers:
${lib.concatMapStringsSep "\n" (
p: " - `${p}` (included in class(es): ${lib.concatStringsSep ", " (getReferencingClasses p)})"
) missingPrinters}
'';
}
)
];
systemd.services.cups = {
postStart =
let
getPrinters =
class:
lib.uniqueStrings (
lib.concatLists (
lib.textClosureList (lib.mapAttrs (
_:
{
classes ? [ ],
printers ? [ ],
...
}:
{
deps = classes;
text = printers;
}
) cfg.ensureClasses) [ class ]
)
);
classNames = builtins.attrNames cfg.ensureClasses;
lpadmin =
args:
let
# -d, -p and -x are subcommands that must be specified at the start.
argsDpx = lib.intersectAttrs {
d = true;
p = true;
x = true;
} args;
argsWoDpx = lib.removeAttrs args [
"d"
"p"
"x"
];
in
"lpadmin ${lib.cli.toCommandLineShellGNU { } argsDpx} ${
lib.cli.toCommandLineShellGNU { } argsWoDpx
}";
in
''
#### ADDING PRINTERS ####
${lib.concatMapStringsSep "\n" (
p:
lpadmin {
p = p.name;
v = p.deviceUri;
m = p.model;
L = p.location;
D = p.description;
o = lib.mapAttrsToList (name: value: "${name}=${value}") p.ppdOptions;
E = true;
}
) cfg.ensurePrinters}
#### SETTING DEFAULT PRINTER ####
${lib.optionalString (cfg.ensureDefaultPrinter != null) (lpadmin {
d = cfg.ensureDefaultPrinter;
})}
#### CLASS DEFINITIONS ####
lpadmin -p _tmp -v file:/dev/null
${lib.concatMapStringsSep "\n" (
className:
lpadmin {
p = "_tmp";
c = className;
}
) classNames}
lpadmin -x _tmp
#### ADDING PRINTERS TO CLASSES ####
${lib.concatMapStringsSep "\n" (
className:
lib.concatMapStringsSep "\n" (
printer:
lpadmin {
p = printer;
c = className;
}
) (getPrinters className)
) classNames}
#### POPULATING CLASSES ####
${lib.concatStringsSep "\n" (
config.assertions = lib.mkIf config.services.printing.enable [
(
let
referencedClasses = lib.unique (
lib.flatten (
lib.mapAttrsToList (
className: class:
lpadmin {
p = className;
L = class.location;
D = class.description;
}
_:
{
classes ? [ ],
...
}:
classes
) cfg.ensureClasses
)}
)
);
definedClasses = lib.attrNames cfg.ensureClasses;
missingClasses = lib.subtractLists definedClasses referencedClasses;
getReferencingClasses =
missingClass:
(lib.mapAttrsToList (name: _: "`${name}`") (
lib.filterAttrs (
_:
{
classes ? [ ],
...
}:
builtins.elem missingClass classes
) cfg.ensureClasses
));
in
{
assertion = missingClasses == [ ];
message = ''
One or more values of `config.hardware.printers.ensureClasses.<name>.classes`
contained values not present in `config.hardware.printers.ensureClasses`
#### ENABLING CLASSES ####
${lib.concatMapStrings (className: ''
cupsenable ${escapeShellArg className}
cupsaccept ${escapeShellArg className}
'') classNames}
echo "CUPS provisioning complete."
Missing classes:
${lib.concatMapStringsSep "\n" (
p: " - `${p}` (included in class(es): ${lib.concatStringsSep ", " (getReferencingClasses p)})"
) missingClasses}
'';
};
};
}
)
(
let
referencedPrinters = lib.unique (
lib.flatten (
lib.mapAttrsToList (
_:
{
printers ? [ ],
...
}:
printers
) cfg.ensureClasses
)
);
definedPrinters = lib.catAttrs "name" cfg.ensurePrinters;
missingPrinters = lib.subtractLists definedPrinters referencedPrinters;
getReferencingClasses =
missingPrinter:
(lib.mapAttrsToList (name: _: "`${name}`") (
lib.filterAttrs (
_:
{
printers ? [ ],
...
}:
builtins.elem missingPrinter printers
) cfg.ensureClasses
));
in
{
assertion = missingPrinters == [ ];
message = ''
One or more values of `config.hardware.printers.ensureClasses.<name>.printers`
contained values not present in `config.hardware.printers.ensurePrinters`
Missing printers:
${lib.concatMapStringsSep "\n" (
p: " - `${p}` (included in class(es): ${lib.concatStringsSep ", " (getReferencingClasses p)})"
) missingPrinters}
'';
}
)
];
config.systemd.services.ensure-printer-classes =
lib.mkIf (cfg.ensureClasses != { } && config.services.printing.enable)
{
description = "Ensure NixOS-configured CUPS classes";
wantedBy = [ "multi-user.target" ];
wants = [
"cups.service"
];
after = [
"cups.service"
"ensure-printers.service"
];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
};
path = with pkgs; [ cups ];
script =
let
attrMap = fn: l: map fn (builtins.attrNames l);
classDefs = lib.pipe cfg.ensureClasses [
(attrMap mkClass)
concatLines
];
classAdds = lib.pipe cfg.ensureClasses [
(lib.mapAttrsToList addPrintersToClass)
lib.flatten
concatLines
];
populatedClasses = lib.pipe cfg.ensureClasses [
(lib.mapAttrsToList populateClass)
concatLines
];
enables = lib.pipe cfg.ensureClasses [
(attrMap enableClass)
concatLines
];
in
''
#### CLASS DEFINITIONS ####
${classDefs}
#### ADDING PRINTERS TO CLASSES ####
${classAdds}
#### POPULATING CLASSES ####
${populatedClasses}
#### ENABLING CLASSES ####
${enables}
${lib.optionalString ultimatelyStopCups "systemctl stop cups.service"}
'';
};
config.systemd.services.ensure-printers =
lib.mkIf (cfg.ensurePrinters != [ ] && config.services.printing.enable)
{
description = "Ensure NixOS-configured CUPS printers";
wantedBy = [ "multi-user.target" ];
wants = [ "cups.service" ];
after = [ "cups.service" ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
};
script = lib.concatStringsSep "\n" [
(lib.concatMapStrings ensurePrinter cfg.ensurePrinters)
(lib.optionalString (cfg.ensureDefaultPrinter != null) (
ensureDefaultPrinter cfg.ensureDefaultPrinter
))
# Let ensure-printer-classes.service kill cups because it is called
# after this service.
(lib.optionalString (
ultimatelyStopCups && !(config.systemd.services ? ensure-printer-classes)
) "systemctl stop cups.service")
];
};
}

View File

@@ -893,6 +893,7 @@ in
# Upstream config: https://github.com/systemd/systemd/blob/main/src/run/systemd-run0.in
setLoginUid = true;
pamMount = false;
startSession = true;
};
};

View File

@@ -843,13 +843,10 @@ in
cfgZfs.package
pkgs.coreutils
pkgs.curl
pkgs.diffutils
pkgs.findutils
pkgs.gawk
pkgs.gnugrep
pkgs.gnused
pkgs.hostname-debian
pkgs.logger
pkgs.util-linux
];
};

View File

@@ -50,34 +50,14 @@ in
services.printing.enable = true;
services.printing.startWhenNeeded = socket;
services.printing.listenAddresses = lib.mkIf (!listenTcp) [ ];
# Add printers to the client as well, via IPP.
# Add printer to the client as well, via IPP.
hardware.printers.ensurePrinters = [
{
name = "DeskjetRemote";
deviceUri = "ipp://server/printers/DeskjetLocal";
model = "drv:///sample.drv/deskjet.ppd";
}
{
name = "DeskjetRemote2";
deviceUri = "ipp://server/printers/DeskjetLocal";
model = "drv:///sample.drv/deskjet.ppd";
}
];
hardware.printers.ensureClasses = {
Basement = {
description = "All the printers in my basement";
location = "Floor 0";
printers = [ "DeskjetRemote" ];
};
House = {
description = "All the printers in my house";
location = "Home";
printers = [
"DeskjetRemote"
"DeskjetRemote2"
];
};
};
hardware.printers.ensureDefaultPrinter = "DeskjetRemote";
};
@@ -87,14 +67,12 @@ in
start_all()
with subtest("Make sure that cups is up on both sides"):
server.wait_for_unit("cups.${if socket then "socket" else "service"}")
client.wait_for_unit("cups.${if socket then "socket" else "service"}")
with subtest("Make sure that cups is up on both sides and printers are set up"):
server.wait_for_unit("ensure-printers.service")
client.wait_for_unit("ensure-printers.service")
assert "scheduler is running" in client.succeed("lpstat -r")
client.wait_until_succeeds("journalctl -u cups.service --grep 'CUPS provisioning complete'")
with subtest("UNIX socket is used for connections"):
assert "/var/run/cups/cups.sock" in client.succeed("lpstat -H")
@@ -104,14 +82,7 @@ in
server.fail(f"curl --fail --connect-timeout 2 http://{client.name}:631/")
with subtest("LP status checks"):
lpstat = client.succeed("lpstat -a")
assert all([
"DeskjetRemote accepting requests" in lpstat,
"DeskjetRemote2 accepting requests" in lpstat,
"Basement accepting requests" in lpstat,
"House accepting requests" in lpstat,
])
assert "DeskjetRemote accepting requests" in client.succeed("lpstat -a")
assert "DeskjetLocal accepting requests" in client.succeed(
f"lpstat -h {server.name}:631 -a"
)

View File

@@ -4,8 +4,12 @@
package,
...
}:
let
mkTestName =
pkg: "${pkg.pname}_${builtins.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor pkg.version)}";
in
{
name = package.pname;
name = mkTestName package;
meta.maintainers = lib.teams.redis.members;
nodes = {

View File

@@ -314,47 +314,4 @@ in
exit(1)
'';
};
zfs-mount-generator = runTest {
name = "zfs-mount-generator";
nodes.machine =
{ ... }:
{
boot.supportedFilesystems = [ "zfs" ];
networking.hostId = "00000000";
virtualisation = {
emptyDiskImages = [ 4096 ];
};
};
testScript = ''
from datetime import timedelta
machine.wait_for_unit("multi-user.target")
machine.succeed(
"zpool create -O mountpoint=none test /dev/vdb",
# Enable list caching for the test pool.
"mkdir /etc/zfs/zfs-list.cache",
"touch /etc/zfs/zfs-list.cache/test",
# Trigger the zedlet.
"zfs create -o mountpoint=/tmp/foo test/foo",
)
# Wait for the zedlet to update the cache with the new dataset.
machine.wait_until_succeeds(
"grep -F test/foo /etc/zfs/zfs-list.cache/test",
timeout=timedelta(seconds=120)
)
machine.succeed(
# Rerun systemd generators.
"systemctl daemon-reload",
"systemctl cat tmp-foo.mount | grep zfs-mount-generator",
"systemctl is-active tmp-foo.mount",
)
'';
};
}

View File

@@ -1175,8 +1175,8 @@ let
mktplcRef = {
publisher = "DanielGavin";
name = "ols";
version = "0.1.47";
hash = "sha256-qv+rMLcLTTw0zCDd87v2om96N8GhokrePdqXgRYWRe0=";
version = "0.1.46";
hash = "sha256-X2Tp0rsPp0UoKW4Yz7Ht/7b1zO0bL92u6CtyKRy+hDY=";
};
meta = {
description = "Visual Studio Code extension for Odin language";
@@ -2768,8 +2768,8 @@ let
mktplcRef = {
name = "magit";
publisher = "kahole";
version = "0.6.70";
hash = "sha256-j/AyPp9pHocM9KXPKxsdCVTNiEHwZ7kWXymiHpv+ZmY=";
version = "0.6.69";
hash = "sha256-gx7OWV+X17XqShFj0mH4Zg6X26vpOnkrYW8/YdeGd7c=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/kahole.magit/changelog";
@@ -3854,8 +3854,8 @@ let
mktplcRef = {
name = "pico8-ls";
publisher = "PollywogGames";
version = "0.7.0";
hash = "sha256-2e28Z4o76f0G52fzqHNqFnBk88426cRfUyiaW1jmeMc=";
version = "0.6.1";
hash = "sha256-TlULqIKb3R+bvjN3f4Bwha0bewqCHpPVFiePHNV2kmE=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/PollywogGames.pico8-ls/changelog";

View File

@@ -12,22 +12,22 @@ vscode-utils.buildVscodeMarketplaceExtension {
sources = {
"x86_64-linux" = {
arch = "linux-x64";
hash = "sha256-Uym2S4NN78yUDQdg1qFednfYT5K6AkQfBOmDp3fFGoc=";
hash = "sha256-bPD6uYNN1YD7hVco+otWibIHnr83Ve5/LM+a40CXTY8=";
};
"aarch64-linux" = {
arch = "linux-arm64";
hash = "sha256-tB6Z/rXYYLo/SsPLQiaQZ6KUJZhh+aiYaBMpJz0wbtk=";
hash = "sha256-ySNbdFihPpC14Y4kIRCDu2qz3sgdl8dlmiS5xXIYCX8=";
};
"aarch64-darwin" = {
arch = "darwin-arm64";
hash = "sha256-IicI0BbpGBDw+tGFlbefXA1iSPQZNLj/n0nv6zEGkHA=";
hash = "sha256-rUmRhs9qRqNFfpsQCmT+Cxbc9m2PQjd4032OcR2sB78=";
};
};
in
{
publisher = "kilocode";
name = "Kilo-Code";
version = "7.6.2";
version = "7.5.9";
}
// sources.${stdenv.hostPlatform.system}
or (throw "Unsupported system ${stdenv.hostPlatform.system}");

View File

@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-thunder-client";
publisher = "rangav";
version = "2.41.3";
hash = "sha256-bglCE7gW9maAWv1pBbSXKTttdmB0K0w/VotolcUrkH8=";
version = "2.41.1";
hash = "sha256-BLR5z5KttJt1wQOqDVyPRRNagoBihAeEdbBnHps7yhg=";
};
meta = {

View File

@@ -83,7 +83,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gimp";
version = "3.2.6";
version = "3.2.4";
outputs = [
"out"
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://download.gimp.org/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.xz";
hash = "sha256-QLFekK0MDGMbdto8Rn6phH+lwk83QTrFtJKASGCijNg=";
hash = "sha256-cxK8U+nG0tAFbKe5PxxrmHB5Rt2TT3FMIbh0bstgFYg=";
};
patches = [

View File

@@ -13,7 +13,7 @@
gettext,
ghostscript,
glib,
glibmm,
glibmm_2_4,
gobject-introspection,
gsl,
gspell,
@@ -153,7 +153,7 @@ stdenv.mkDerivation (finalAttrs: {
boost
gettext
glib
glibmm
glibmm_2_4
gsl
gtkmm3
gtksourceview4

View File

@@ -191,8 +191,6 @@ stdenv.mkDerivation {
src = fetchurl { inherit (archive) url sha256; };
sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin "${darwinApp}.app";
dontConfigure = true;
dontBuild = true;
dontPatchELF = true;

View File

@@ -1,10 +1,10 @@
{
"chromium": {
"version": "153.0.8010.47",
"version": "153.0.8010.36",
"chromedriver": {
"version": "153.0.8010.48",
"hash_darwin": "sha256-/4yv3KWuvKNAro9oeK+PFsTOrg878yS11aDYSX5S890=",
"hash_darwin_aarch64": "sha256-5eO1WwJ8iQrXUjHb776Z1YahR/A8aCoX7JrJXQEcIQ8="
"version": "153.0.8010.37",
"hash_darwin": "sha256-IMyEnUmK3slNB/QDZ+vtUyzHyU0AB+L6+BMbpCRluYA=",
"hash_darwin_aarch64": "sha256-cd1ZWatLQFIkPtCdVacrxFaFfj3rjG9qJ7kGlL3C6OA="
},
"deps": {
"depot_tools": {
@@ -21,8 +21,8 @@
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "73934a44f61e6b3878d1943064c141a5a820f5f7",
"hash": "sha256-D7Oqukze3CzYVWN9AQq9zN6HN2GcZ6b7ZSqhM5bjvUU=",
"rev": "507c6ee3e2f3b2ca0e660547e5b9ea4820c67f4c",
"hash": "sha256-q29a3PWQ7wMG4/JL9EyCK7EaDCeG+4Q/ruemOvvgeZM=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -92,8 +92,8 @@
},
"src/third_party/angle": {
"url": "https://chromium.googlesource.com/angle/angle.git",
"rev": "ed04c8113c6538f3e1264042da8cb4afd100369b",
"hash": "sha256-mZrVJ/P3tPoiSkGBH4fEjNAexLsjAzts8jjkCQZ4kOs="
"rev": "fca5efdfeff5daf430bc4458375c8d6b7e457400",
"hash": "sha256-IoHQfdjZ6TV03VVzHZcxhPqGmNYNhKZrPG4BvQQfC7c="
},
"src/third_party/angle/third_party/glmark2/src": {
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -132,8 +132,8 @@
},
"src/third_party/dawn": {
"url": "https://dawn.googlesource.com/dawn.git",
"rev": "28ffc61fc935c599677cff4dddfa4a12209ce500",
"hash": "sha256-6ySDyyQs/nfFF9AeoUY57GYDx7V8b0GQ17PCwQkzZVk="
"rev": "225a7ba1bcb997d26de3e894e04fb341638e8c5a",
"hash": "sha256-/ic1j1gu2wl5wCLCESfEcsLAPU5Dmsx8oKFb6RhYzg4="
},
"src/third_party/dawn/third_party/glfw3/src": {
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -632,8 +632,8 @@
},
"src/third_party/pthreadpool/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
"rev": "15a6644ba1c45f1acc16ac1e883efc3e56c6bed2",
"hash": "sha256-YJD9n8cxoqTrTQJHKuZFW2qnlNcNmh5rQlBpnlF46to="
"rev": "02460584c6092e527c8b89f7df4de143d70e801f",
"hash": "sha256-4EHJzZT+Gbhs8SkOhjSvDIPEqIQU93oJmtF3c/T+qjw="
},
"src/third_party/pyelftools": {
"url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
@@ -672,8 +672,8 @@
},
"src/third_party/skia": {
"url": "https://skia.googlesource.com/skia.git",
"rev": "fca11a08da7c1ed3777b40b31611961c85c63c43",
"hash": "sha256-iQNNgvRVUuyAcSVE+pNJWrWz0NJd/MZLxd9vbYztong="
"rev": "4f574af2444846ceca4d277a8095c5d4229d175f",
"hash": "sha256-HrpA4labNWXPWj/yiS9O8KjdQPwJOllmR5r66TwCjB0="
},
"src/third_party/smhasher/src": {
"url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -842,8 +842,8 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "6b96683d44174e78ff4e65cb274bad56dc108231",
"hash": "sha256-Oa1wzIbWVPX0x7adJVPUxQocK5gofG0vE56QTg0XKCs="
"rev": "f343157cebb388bfa416baccb5d35507e6fe8cc7",
"hash": "sha256-zSCyFQpDMNygmV6N4TajL8VB5+VRynrMPV/wAiWsJO4="
},
"src/agents/shared": {
"url": "https://chromium.googlesource.com/chromium/agents.git",
@@ -853,7 +853,7 @@
}
},
"ungoogled-chromium": {
"version": "153.0.8010.47",
"version": "153.0.8010.36",
"deps": {
"depot_tools": {
"rev": "6411ed52842756261c66b6b8ece6b53ade2570f1",
@@ -865,16 +865,16 @@
"hash": "sha256-qvQ13Ws2tb4i2Hdu34kBHivYPAn8w06zjLdQgK4BIJg="
},
"ungoogled-patches": {
"rev": "153.0.8010.47-1",
"hash": "sha256-J/IiNmqJzL35TfiGbsqrXnI8lUizCWuxzVBHgo7cG80="
"rev": "153.0.8010.36-1",
"hash": "sha256-JyvizS0oJC8J6VhtnpTKUGVbc31KCvTvwa4TmO+CHaY="
},
"npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg="
},
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "73934a44f61e6b3878d1943064c141a5a820f5f7",
"hash": "sha256-D7Oqukze3CzYVWN9AQq9zN6HN2GcZ6b7ZSqhM5bjvUU=",
"rev": "507c6ee3e2f3b2ca0e660547e5b9ea4820c67f4c",
"hash": "sha256-q29a3PWQ7wMG4/JL9EyCK7EaDCeG+4Q/ruemOvvgeZM=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -944,8 +944,8 @@
},
"src/third_party/angle": {
"url": "https://chromium.googlesource.com/angle/angle.git",
"rev": "ed04c8113c6538f3e1264042da8cb4afd100369b",
"hash": "sha256-mZrVJ/P3tPoiSkGBH4fEjNAexLsjAzts8jjkCQZ4kOs="
"rev": "fca5efdfeff5daf430bc4458375c8d6b7e457400",
"hash": "sha256-IoHQfdjZ6TV03VVzHZcxhPqGmNYNhKZrPG4BvQQfC7c="
},
"src/third_party/angle/third_party/glmark2/src": {
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -984,8 +984,8 @@
},
"src/third_party/dawn": {
"url": "https://dawn.googlesource.com/dawn.git",
"rev": "28ffc61fc935c599677cff4dddfa4a12209ce500",
"hash": "sha256-6ySDyyQs/nfFF9AeoUY57GYDx7V8b0GQ17PCwQkzZVk="
"rev": "225a7ba1bcb997d26de3e894e04fb341638e8c5a",
"hash": "sha256-/ic1j1gu2wl5wCLCESfEcsLAPU5Dmsx8oKFb6RhYzg4="
},
"src/third_party/dawn/third_party/glfw3/src": {
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -1484,8 +1484,8 @@
},
"src/third_party/pthreadpool/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
"rev": "15a6644ba1c45f1acc16ac1e883efc3e56c6bed2",
"hash": "sha256-YJD9n8cxoqTrTQJHKuZFW2qnlNcNmh5rQlBpnlF46to="
"rev": "02460584c6092e527c8b89f7df4de143d70e801f",
"hash": "sha256-4EHJzZT+Gbhs8SkOhjSvDIPEqIQU93oJmtF3c/T+qjw="
},
"src/third_party/pyelftools": {
"url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
@@ -1524,8 +1524,8 @@
},
"src/third_party/skia": {
"url": "https://skia.googlesource.com/skia.git",
"rev": "fca11a08da7c1ed3777b40b31611961c85c63c43",
"hash": "sha256-iQNNgvRVUuyAcSVE+pNJWrWz0NJd/MZLxd9vbYztong="
"rev": "4f574af2444846ceca4d277a8095c5d4229d175f",
"hash": "sha256-HrpA4labNWXPWj/yiS9O8KjdQPwJOllmR5r66TwCjB0="
},
"src/third_party/smhasher/src": {
"url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1694,8 +1694,8 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "6b96683d44174e78ff4e65cb274bad56dc108231",
"hash": "sha256-Oa1wzIbWVPX0x7adJVPUxQocK5gofG0vE56QTg0XKCs="
"rev": "f343157cebb388bfa416baccb5d35507e6fe8cc7",
"hash": "sha256-zSCyFQpDMNygmV6N4TajL8VB5+VRynrMPV/wAiWsJO4="
},
"src/agents/shared": {
"url": "https://chromium.googlesource.com/chromium/agents.git",

View File

@@ -200,13 +200,13 @@
"vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
},
"clevercloud_clevercloud": {
"hash": "sha256-JVdhdMFjwlB02KwmRe8JEKF9gefck9L9VqrW0xzvhWs=",
"hash": "sha256-maiL06qwhjIjNxyHRRke4x0YrrPB61xFf2Cafl4s5+0=",
"homepage": "https://registry.terraform.io/providers/clevercloud/clevercloud",
"owner": "CleverCloud",
"repo": "terraform-provider-clevercloud",
"rev": "v2.2.0",
"rev": "v2.1.0",
"spdx": "Apache-2.0",
"vendorHash": "sha256-AB6VVC/I5E+CoHvdww38gXlHJ9yh4t5jV6ZrvDDTQeE="
"vendorHash": "sha256-R3w7olc94QJuMk62bfvuM9aU+KlmNTUhojl/j9gmHjk="
},
"cloudamqp_cloudamqp": {
"hash": "sha256-GMfBdLUqw/3WEtZfP6ShCEwheHeUa/1EDMzIuYGalvA=",
@@ -589,11 +589,11 @@
"vendorHash": "sha256-gv54RqpkWri5yL40ajcLnqzF0XvMEzFoFEEV2/g1paE="
},
"hashicorp_google": {
"hash": "sha256-saCI+FFwPZSkofk3C3GxvR2SB+9Hajo1WRwG4iTTfD0=",
"hash": "sha256-IpwIlUZtB0PQ2EQnfY2bKN9w7KQ0WrWLQhEmo79L1yw=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"repo": "terraform-provider-google",
"rev": "v8.2.0",
"rev": "v8.1.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-EikYOTTTkj5E82xza6nYvd1AWFg8fzo1ka2umc+25/k="
},
@@ -833,13 +833,13 @@
"vendorHash": "sha256-xzYkFRBLKGF8lf9vDG/dx4Qel6uGN1XpQLFrpVX2HWo="
},
"kislerdm_neon": {
"hash": "sha256-eK7e4iVdoHQaCYbuT4rtyBmOt/HPRot4iDB1TKds4M4=",
"hash": "sha256-FdC0WBN9jZsLud0QRiKJkQQI9aPxYhyyLNaxRXPp08Q=",
"homepage": "https://registry.terraform.io/providers/kislerdm/neon",
"owner": "kislerdm",
"repo": "terraform-provider-neon",
"rev": "v0.18.0",
"rev": "v0.15.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-i+IPEj4ejYQR9ozkmTv/F4HAqd8m0aTA7nXzDewwBig="
"vendorHash": "sha256-7mJ+BX7laBKsr4DX1keMXnGi79CZp8M1jD0COQ1lcmU="
},
"kreuzwerker_docker": {
"hash": "sha256-oNJAmoSV6a29LG4dY217CVtthxBsG9b1JAaCreAFgDY=",
@@ -1139,13 +1139,13 @@
"vendorHash": "sha256-L1wufPa7LPPyOPTL+jFQgiWzJoJYS+fCdw3N0KZqKtc="
},
"rancher_rancher2": {
"hash": "sha256-nt18dj5M2yh+AFG0KAv3v49OZELF92l8zvtqfJApw/s=",
"hash": "sha256-OFLEDwDDD02FKMldpkRxbj2gRQzhmVb2+3dG3Hq2AG4=",
"homepage": "https://registry.terraform.io/providers/rancher/rancher2",
"owner": "rancher",
"repo": "terraform-provider-rancher2",
"rev": "v15.1.2",
"rev": "v14.1.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-6M6jTrukO0VhyZRdYbbICm22upbGyOkUSuHqMLTPcEM="
"vendorHash": "sha256-WpI4OZ7BUVgHwQY+7ct+K6CnwXFFuiRbI+iTFSJ8a5A="
},
"rootlyhq_rootly": {
"hash": "sha256-wfwqPk5D3D3PwzOfA9i6qxaAmN84MjHiNAablIX9iKg=",

View File

@@ -1,7 +1,7 @@
{
lib,
stdenv,
glibmm,
glibmm_2_4,
pidgin,
pkg-config,
modemmanager,
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
glibmm
glibmm_2_4
pidgin
modemmanager
];

View File

@@ -9,7 +9,7 @@
libjpeg,
openssl,
libopus,
ffmpeg,
ffmpeg_6,
openh264,
crc32c,
libvpx,
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
libjpeg
openssl
libopus
ffmpeg
ffmpeg_6
openh264
crc32c
libvpx

View File

@@ -219,7 +219,6 @@ lib.extendMkDerivation {
env = args.env or { } // {
inherit (go) GOOS GOARCH;
GO111MODULE = "on";
GOTOOLCHAIN = "local";
CGO_ENABLED = args.env.CGO_ENABLED or go.CGO_ENABLED;

View File

@@ -104,7 +104,6 @@ in
src ? null,
hash ? "",
sha256 ? "",
mirrorUrl ? null,
...
}@args:
let
@@ -149,9 +148,7 @@ in
yarnLock=''${yarnLock:=$PWD/yarn.lock}
mkdir -p $out
(cd $out; prefetch-yarn-deps --verbose --builder $yarnLock ${
lib.optionalString (mirrorUrl != null) "--mirrorUrl ${lib.escapeShellArg mirrorUrl}"
})
(cd $out; prefetch-yarn-deps --verbose --builder $yarnLock)
runHook postBuild
'';
@@ -164,7 +161,6 @@ in
"name"
"hash"
"sha256"
"mirrorUrl"
]
++ (lib.optional (src == null) "src")
))

View File

@@ -21,27 +21,15 @@ const exec = async (...args) => {
return res
}
const yarnRegistryUrl = 'https://registry.yarnpkg.com/';
function ensureTrailingSlash(str) {
return str.endsWith('/') ? str : str + '/';
}
const downloadFileHttps = (fileName, url, expectedHash, verbose, hashType = 'sha1', mirrorRegistryUrl = null) => {
const registryUrl =
mirrorRegistryUrl && url.startsWith(yarnRegistryUrl)
? url.replace(yarnRegistryUrl, ensureTrailingSlash(mirrorRegistryUrl))
: url;
const downloadFileHttps = (fileName, url, expectedHash, verbose, hashType = 'sha1') => {
return new Promise((resolve, reject) => {
const get = (registryUrl, redirects = 0) => https.get(registryUrl, (res) => {
const get = (url, redirects = 0) => https.get(url, (res) => {
if(redirects > 10) {
reject('Too many redirects!');
return;
}
if(res.statusCode === 301 || res.statusCode === 302) {
const location = new URL(res.headers.location, registryUrl);
const location = new URL(res.headers.location, url);
if (verbose) console.log('following redirect to ' + location);
return get(location, redirects + 1);
}
@@ -53,13 +41,13 @@ const downloadFileHttps = (fileName, url, expectedHash, verbose, hashType = 'sha
file.close()
const h = hash.read()
if (expectedHash === undefined){
console.log(`Warning: lockfile url ${registryUrl} doesn't end in "#<hash>" to validate against. Downloaded file had hash ${h}.`);
} else if (h != expectedHash) return reject(new Error(`hash mismatch, expected ${expectedHash}, got ${h} for ${registryUrl}`))
console.log(`Warning: lockfile url ${url} doesn't end in "#<hash>" to validate against. Downloaded file had hash ${h}.`);
} else if (h != expectedHash) return reject(new Error(`hash mismatch, expected ${expectedHash}, got ${h} for ${url}`))
resolve()
})
res.on('error', e => reject(e))
})
get(registryUrl)
get(url)
})
}
@@ -102,7 +90,7 @@ const isGitUrl = pattern => {
return false
}
const downloadPkg = (pkg, verbose, mirrorUrl = null) => {
const downloadPkg = (pkg, verbose) => {
for (let marker of ['@file:', '@link:']) {
const split = pkg.key.split(marker)
if (split.length == 2) {
@@ -134,9 +122,9 @@ const downloadPkg = (pkg, verbose, mirrorUrl = null) => {
} else if (url.startsWith('https://')) {
if (typeof pkg.integrity === 'string' || pkg.integrity instanceof String) {
const [ type, checksum ] = pkg.integrity.split('-')
return downloadFileHttps(fileName, url, Buffer.from(checksum, 'base64').toString('hex'), verbose, type, mirrorUrl)
return downloadFileHttps(fileName, url, Buffer.from(checksum, 'base64').toString('hex'), verbose, type)
}
return downloadFileHttps(fileName, url, hash, verbose, 'sha1', mirrorUrl)
return downloadFileHttps(fileName, url, hash, verbose)
} else if (url.startsWith('file:')) {
console.warn(`ignoring unsupported file:path url "${url}"`)
} else {
@@ -167,11 +155,11 @@ const uniqueBy = (arr, callback) => {
return [...map.values()]
}
const prefetchYarnDeps = async (lockContents, verbose, mirrorUrl) => {
const prefetchYarnDeps = async (lockContents, verbose) => {
const lockData = lockfile.parse(lockContents)
await performParallel(
uniqueBy(Object.entries(lockData.object), ([_, value]) => value.resolved)
.map(([key, value]) => () => downloadPkg({ key, ...value }, verbose, mirrorUrl))
.map(([key, value]) => () => downloadPkg({ key, ...value }, verbose))
)
await fs.promises.writeFile('yarn.lock', lockContents)
if (verbose) console.log('Done')
@@ -185,23 +173,18 @@ Options:
-h --help Show this help
-v --verbose Verbose output
--builder Only perform the download to current directory, then exit
--mirrorUrl <url> Use the given registry mirror URL in place of the default
yarn registry (${yarnRegistryUrl})
`)
process.exit(1)
}
const main = async () => {
const args = process.argv.slice(2)
let next, lockFile, verbose, isBuilder, mirrorUrl
let next, lockFile, verbose, isBuilder
while (next = args.shift()) {
if (next == '--builder') {
isBuilder = true
} else if (next == '--verbose' || next == '-v') {
verbose = true
} else if (next == '--mirrorUrl') {
mirrorUrl = args.shift()
if (!mirrorUrl) showUsage()
} else if (next == '--help' || next == '-h') {
showUsage()
} else if (!lockFile) {
@@ -218,13 +201,13 @@ const main = async () => {
}
if (isBuilder) {
await prefetchYarnDeps(lockContents, verbose, mirrorUrl)
await prefetchYarnDeps(lockContents, verbose)
} else {
const { stdout: tmpDir } = await exec('mktemp', [ '-d' ])
try {
process.chdir(tmpDir.trim())
await prefetchYarnDeps(lockContents, verbose, mirrorUrl)
await prefetchYarnDeps(lockContents, verbose)
const { stdout: hash } = await exec('nix-hash', [ '--type', 'sha256', '--base32', tmpDir.trim() ])
console.log(hash)
} finally {

View File

@@ -9,11 +9,6 @@
yarnLock = ./simple.lock;
sha256 = "sha256-FRrt8BixleILmFB2ZV8RgPNLqgS+dlH5nWoPgeaaNQ8=";
};
mirrorUrl = testers.invalidateFetcherByDrvHash fetchYarnDeps {
yarnLock = ./simple.lock;
mirrorUrl = "https://registry.npmjs.com/";
sha256 = "sha256-FRrt8BixleILmFB2ZV8RgPNLqgS+dlH5nWoPgeaaNQ8=";
};
gitDep = testers.invalidateFetcherByDrvHash fetchYarnDeps {
yarnLock = ./git.lock;
sha256 = "sha256-f90IiEzHDiBdswWewRBHcJfqqpPipaMg8N0DVLq2e8Q=";

View File

@@ -105,6 +105,8 @@ let
outputHash = hash;
outputHashAlgo = if hash == "" then "sha256" else null;
outputHashMode = "recursive";
__structuredAttrs = true;
}
// removeAttrs args removedArgs
);
@@ -117,6 +119,8 @@ runCommand "${name}-vendor"
cargo
replaceWorkspaceValues
];
strictDeps = true;
__structuredAttrs = true;
}
''
fetch-cargo-vendor-util create-vendor "$vendorStaging" "$out"

View File

@@ -132,6 +132,9 @@
substitutions = {
libclang = (lib.getLib clang.cc);
inherit clang;
targetFlag = lib.optionalString (
!lib.systems.equals stdenv.targetPlatform stdenv.hostPlatform
) "--target=${stdenv.targetPlatform.config}";
};
meta.license = lib.licenses.mit;
} ./rust-bindgen-hook.sh;

View File

@@ -6,7 +6,7 @@
populateBindgenEnv () {
export LIBCLANG_PATH=@libclang@/lib
BINDGEN_EXTRA_CLANG_ARGS="$(< @clang@/nix-support/cc-cflags) $(< @clang@/nix-support/libc-cflags) $(< @clang@/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE"
BINDGEN_EXTRA_CLANG_ARGS="@targetFlag@ $(< @clang@/nix-support/cc-cflags) $(< @clang@/nix-support/libc-cflags) $(< @clang@/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE"
export BINDGEN_EXTRA_CLANG_ARGS
}

View File

@@ -49,6 +49,8 @@ runCommand "${rustc-unwrapped.pname}-wrapper-${rustc-unwrapped.version}"
unwrapped = rustc-unwrapped;
};
__structuredAttrs = true;
meta = rustc-unwrapped.meta // {
description = "${rustc-unwrapped.meta.description} (wrapper script)";
priority = 10;

View File

@@ -6,7 +6,7 @@
# required LTS branch, leaving `abseil-cpp` as an alias.
{
abseil-cpp_202601,
abseil-cpp_202608,
cxxStandard ? null,
}:
abseil-cpp_202601.override { inherit cxxStandard; }
abseil-cpp_202608.override { inherit cxxStandard; }

View File

@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "abtop";
version = "0.5.5";
version = "0.5.3";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "graykode";
repo = "abtop";
tag = "v${finalAttrs.version}";
hash = "sha256-8dBAdaZ6SkSSktmk/KejnTJDikEQj1jBQ2LoiK54Pzk=";
hash = "sha256-LvN+q7JwmvtbroocoRBEug/J5OZTXwHEPAiaRkj16lM=";
};
cargoHash = "sha256-EGx/k79B5ceC8/EFfVH9HtZUedkRNsV74vdyAPxh8ro=";
cargoHash = "sha256-o5ZHURx+OAQkd7S0TzkLQG5ZsR5HMaqfl8sp639axbg=";
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];

View File

@@ -23,6 +23,12 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-TvjoLUKO2+YgS1mlyglLb+rBLTO/SWSBVA2S34Z6kMI=";
};
outputs = [
"out"
"dev"
];
strictDeps = true;
nativeBuildInputs = [
cmake
validatePkgConfig
@@ -54,6 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
};
};
__structuredAttrs = true;
meta = {
description = "WHATWG-compliant and fast URL parser written in modern C";
homepage = "https://github.com/ada-url/ada";

View File

@@ -3,6 +3,7 @@
stdenv,
stdenvNoCC,
fetchFromGitHub,
substitute,
rustPlatform,
electron,
nodejs_22,
@@ -51,14 +52,24 @@ stdenv.mkDerivation (finalAttrs: {
owner = "toeverything";
repo = "AFFiNE";
tag = "v${finalAttrs.version}";
hash = "sha256-gtdhWLNZRNY91j9wVVny1bRAjZAwIvNJr11ePQapWYQ=";
};
hash = "sha256-RotC2mNtMig3QKcKo8zr15myAqkPDuBopvV9wLlr2tQ=";
patches = [
# Remove after upstream updates to Yarn 4.14
# https://github.com/toeverything/AFFiNE/blob/canary/package.json#L96
./yarn-4.14-support.patch
];
# Remove when updating since upstream has updated Yarn
# https://github.com/toeverything/AFFiNE/commit/6375f5ab8c389831327284f4795d8397de085153
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry.lockfileVersion
];
})
}
'';
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
@@ -68,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
# keep yarnOfflineCache same output style with offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; hash = "" };
yarnOfflineCache = stdenvNoCC.mkDerivation {
name = "yarn-offline-cache";
inherit (finalAttrs) src patches;
inherit (finalAttrs) src;
nativeBuildInputs = [
yarn-berry
cacert
@@ -112,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
dontInstall = true;
outputHashMode = "recursive";
outputHash = "sha256-mNvvKbj9mUioh5Jw4CcRt0CpX1IcQC8JOxUnyy0Lw9c=";
outputHash = "sha256-gje8iTCiy3N/zYRuf/CGUVfGw0RSVXTPu4SjnE9+OY8=";
};
buildInputs = lib.optionals hostPlatform.isDarwin [

View File

@@ -1,23 +0,0 @@
diff --git a/.yarnrc.yml b/.yarnrc.yml
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -12,4 +12,7 @@ npmPublishAccess: public
npmRegistryServer: "https://registry.npmjs.org"
-yarnPath: .yarn/releases/yarn-4.12.0.cjs
+approvedGitRepositories:
+ - "**"
+
+enableScripts: true
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,6 @@
# Manual changes might be lost - proceed with caution!
__metadata:
- version: 8
+ version: 9
cacheKey: 10

View File

@@ -0,0 +1,58 @@
diff --git a/.yarnrc.yml b/.yarnrc.yml
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -12,4 +12,7 @@ npmPublishAccess: public
npmRegistryServer: "https://registry.npmjs.org"
-yarnPath: .yarn/releases/yarn-4.12.0.cjs
+approvedGitRepositories:
+ - "**"
+
+enableScripts: true
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,6 @@
# Manual changes might be lost - proceed with caution!
__metadata:
- version: 8
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -33250,27 +33250,27 @@ __metadata:
"resolve@patch:resolve@npm%3A^1.1.6#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.8#optional!builtin<compat/resolve>":
version: 1.22.11
- resolution: "resolve@patch:resolve@npm%3A1.22.11#optional!builtin<compat/resolve>::version=1.22.11&hash=c3c19d"
+ resolution: "resolve@patch:resolve@npm%3A1.22.11#optional!builtin<compat/resolve>::version=1.22.11&hash=9bd1a5"
dependencies:
is-core-module: "npm:^2.16.1"
path-parse: "npm:^1.0.7"
supports-preserve-symlinks-flag: "npm:^1.0.0"
bin:
resolve: bin/resolve
- checksum: 10/fd342cad25e52cd6f4f3d1716e189717f2522bfd6641109fe7aa372f32b5714a296ed7c238ddbe7ebb0c1ddfe0b7f71c9984171024c97cf1b2073e3e40ff71a8
+ checksum: 10/c990146fed81dd7792c56c1d62c170a8c8330bee86ef5d2524f0b1db79cfd9a6e2b4ad3cd4742b2685e51117b67be5d6f8cfd6ffa9c57bd64a1c8c8c9ff4c965
languageName: node
linkType: hard
"resolve@patch:resolve@npm%3A^2.0.0-next.5#optional!builtin<compat/resolve>":
version: 2.0.0-next.5
- resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#optional!builtin<compat/resolve>::version=2.0.0-next.5&hash=c3c19d"
+ resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#optional!builtin<compat/resolve>::version=2.0.0-next.5&hash=9bd1a5"
dependencies:
is-core-module: "npm:^2.13.0"
path-parse: "npm:^1.0.7"
supports-preserve-symlinks-flag: "npm:^1.0.0"
bin:
resolve: bin/resolve
- checksum: 10/05fa778de9d0347c8b889eb7a18f1f06bf0f801b0eb4610b4871a4b2f22e220900cf0ad525e94f990bb8d8921c07754ab2122c0c225ab4cdcea98f36e64fa4c2
+ checksum: 10/76c221deb1d986c0a80cd576373b0ee09f42871e0085a1f76beda84f73ce04e0d21bab28dffd326eb006a7af83bbc582404566b384aa3b0baa217f56cf7e8618
languageName: node
linkType: hard

View File

@@ -24,6 +24,7 @@
yarn,
yarn-berry_4,
runCommand,
substitute,
wrapGAppsHook3,
@@ -42,7 +43,7 @@ let
srcHash = "sha256-0sqtKiMqw7MLXVFSCT1sKX/VO7q5BY63pJP5OnCE2zo=";
cargoHash = "sha256-LQ5uD86ZOKXy9vGbTqPBi3Q57PZEjwQkbHR94QAIVMg=";
yarnHash = "sha256-bOgiZImraPXR/gVk9MB3o9GScMGvLvdhc9mLAaCA4IE=";
yarnHash = "sha256-mpHGclmQxFqiIuZWFTOYBKQW24ugSVhQiYMTmyyk/n4=";
pythonDeps =
with python3Packages;
[
@@ -155,9 +156,16 @@ python3Packages.buildPythonApplication (finalAttrs: {
# Used in with-addons.nix
./patches/allow-setting-addons-folder.patch
# Remove after upstream updates to Yarn 4.14
# https://github.com/ankitects/anki/blob/main/package.json#L99
./patches/yarn-4.14-support.patch
# Remove after upstream updates to Yarn 4.15
# https://github.com/ankitects/anki/blob/main/package.json#L103
(substitute {
src = ./patches/yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry.lockfileVersion
];
})
];
inherit cargoDeps;

View File

@@ -14,6 +14,6 @@ diff --git a/yarn.lock b/yarn.lock
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0

View File

@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
GTEST_HOME = gtest.dev;
LZ4_HOME = lz4;
ORC_FORMAT_URL = orc-format;
PROTOBUF_HOME = protobuf;
PROTOBUF_HOME = protobuf.full; # Configure script expects to find both executables and headers at this path.
SNAPPY_HOME = snappy.dev;
ZLIB_HOME = zlib.dev;
ZSTD_HOME = zstd.dev;

View File

@@ -1,8 +1,8 @@
[
{
"pname": "AngleSharp",
"version": "1.7.1",
"hash": "sha256-GH/AJ8aNoPixvsUIeTRvZH5T9rmQV+dk1QnpLBz/tGc="
"version": "1.5.2",
"hash": "sha256-81rDtnwvR0SDXNNUnPirWIa782gwkgRlz1Fbzm2ywwc="
},
{
"pname": "CryptSharpStandard",
@@ -291,8 +291,8 @@
},
{
"pname": "Microsoft.AspNetCore.OpenApi",
"version": "10.0.11",
"hash": "sha256-RwBH8PntKXwmHFtitnqTTmry1C8hLT+vlDCAjSC0PxQ="
"version": "10.0.10",
"hash": "sha256-Mbr8+mzZKu3iq5R4TbNY8r39bZI34SWWd7DfUHg2ETk="
},
{
"pname": "Microsoft.Bcl.Cryptography",
@@ -406,23 +406,23 @@
},
{
"pname": "Microsoft.IdentityModel.Abstractions",
"version": "8.22.0",
"hash": "sha256-7bBFHdYh/nftSX7dodUj17SB0jb2hmumyYihn53kZAw="
"version": "8.19.2",
"hash": "sha256-vNGK6u6V+S0MIaYTg+sSkRF4XUjM1K+cKuR1a9aRCLs="
},
{
"pname": "Microsoft.IdentityModel.JsonWebTokens",
"version": "8.22.0",
"hash": "sha256-8TW85/8cHUZaQrVb68YYzvF3m6l20acJ+JCOoAP0FRI="
"version": "8.19.2",
"hash": "sha256-j9ai0NrgytDsfQiIijp1Ib4jRGX9lgREQBoE6XW9SOc="
},
{
"pname": "Microsoft.IdentityModel.Logging",
"version": "8.22.0",
"hash": "sha256-yUuLjrNf/kqVf1W2txx2GKc0tqM6IqOlcJkno8pVhP8="
"version": "8.19.2",
"hash": "sha256-ja8PAYUNwlfIrkL6EOuZ7SgZfRJwIORGG/ETDD1BtRE="
},
{
"pname": "Microsoft.IdentityModel.Tokens",
"version": "8.22.0",
"hash": "sha256-cI3VoDGdlniZL4xsq03h599bDLu+8tlQE9PbbSzhq8k="
"version": "8.19.2",
"hash": "sha256-POi3SzcK3+iB3104wXYh3ooVD1GbltwTUf+KMj//UYU="
},
{
"pname": "Microsoft.NET.Test.Sdk",
@@ -431,8 +431,8 @@
},
{
"pname": "Microsoft.OpenApi",
"version": "2.7.5",
"hash": "sha256-oYeR/8toy23G+YbVWfJUdMHPKdbfaYU2+0sQ9TIX0yA="
"version": "2.0.0",
"hash": "sha256-8eiM3Mx4Hx1etx52RlczoHG2z9XIpWgu2LQtWSt086k="
},
{
"pname": "Microsoft.Testing.Extensions.CodeCoverage",
@@ -441,23 +441,23 @@
},
{
"pname": "Microsoft.Testing.Extensions.Telemetry",
"version": "2.3.3",
"hash": "sha256-Doo1IAwnDlbqyg2Q6p82RuYYAQ7VkJnY4Pn9MDZqCOs="
"version": "2.3.2",
"hash": "sha256-3TancCfYy7OW9IU6q+zQv/ETlbBbcjxADrWVRQITytc="
},
{
"pname": "Microsoft.Testing.Extensions.TrxReport",
"version": "2.3.3",
"hash": "sha256-dN4W3c1v644WISanxnyg9JJ7upbYDzoSzBWAzipV+/U="
"version": "2.3.2",
"hash": "sha256-YMuc6dHVBpP8vk/qBQcO0MXeelpcrr9Wgnpvwi2xEv0="
},
{
"pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions",
"version": "2.3.3",
"hash": "sha256-YAgHS3B0LwRvIHer285QuSrYCO5FcSpAXazL5pNHB4Y="
"version": "2.3.2",
"hash": "sha256-MohDLqtLk1K93p1TnvYlaBNetpGoTZSep3xVQho3zb0="
},
{
"pname": "Microsoft.Testing.Extensions.VSTestBridge",
"version": "2.3.3",
"hash": "sha256-/UlwUEIwQyNZxdD0jNcV34ZJ20aLe2kWQTvH3LOIHes="
"version": "2.3.2",
"hash": "sha256-9W4FmGvIfuwHQr3AFrCZ/uLhtJws5erQccw7ydT5yBU="
},
{
"pname": "Microsoft.Testing.Platform",
@@ -466,13 +466,13 @@
},
{
"pname": "Microsoft.Testing.Platform",
"version": "2.3.3",
"hash": "sha256-sH0AyrX0ny0JgVkgRLrvPXIKB55pQWAcd5AERYSzF0o="
"version": "2.3.2",
"hash": "sha256-kGOyHXenLNMpWyVTDWDh6/hP3qFtnHI5qIaet1udKWM="
},
{
"pname": "Microsoft.Testing.Platform.MSBuild",
"version": "2.3.3",
"hash": "sha256-JeU3+8OebODA2k6KSorm2P7piuQZRdS1hhJKAwdfSJA="
"version": "2.3.2",
"hash": "sha256-u0jsv5BU7gSBZlHoy94WlqM0QCJCFbEW1g19RxKn17Q="
},
{
"pname": "Microsoft.TestPlatform.ObjectModel",
@@ -486,23 +486,23 @@
},
{
"pname": "MSTest",
"version": "4.3.3",
"hash": "sha256-89T3FRTF7sQAfuAxYfOZhDrbLlzmT7vzPHhNZ+FORa4="
"version": "4.3.2",
"hash": "sha256-wuyrsPndMA7FwEhwL+7mevm5WYF1nytvObPlAHIo5fU="
},
{
"pname": "MSTest.Analyzers",
"version": "4.3.3",
"hash": "sha256-eA2MisarWvwuAdV49WduYclUnC+hWfHaTt359U+CdCg="
"version": "4.3.2",
"hash": "sha256-mzMMs8H6u2pRnOb6UjA1pwSOKsULx2v18Stvp/cvxj0="
},
{
"pname": "MSTest.TestAdapter",
"version": "4.3.3",
"hash": "sha256-JwGx4QTT2v/qKcuGg1PCqA04OnrB4eDVSUSaO6G+TgA="
"version": "4.3.2",
"hash": "sha256-qiXoMftAKNEtN2LFwMd2e8EkBn03RfIk15CljjOuU0A="
},
{
"pname": "MSTest.TestFramework",
"version": "4.3.3",
"hash": "sha256-d/KPWV68JuLlVKtwdXtfLG/tBJ/d4WY9DVY1fOBhpzQ="
"version": "4.3.2",
"hash": "sha256-BQUOSbJd2LE5C4C5yx7MTozHaWxpo5R6mPC6EdzVHVk="
},
{
"pname": "Newtonsoft.Json",
@@ -531,58 +531,58 @@
},
{
"pname": "NLog",
"version": "6.2.0",
"hash": "sha256-0xxH2xUXDGaWfeH+Dk1VeZfj65NSKtxTzw8Xau4NeUU="
"version": "6.1.4",
"hash": "sha256-76h0KhYh0B6NDrkV5MHhv8SqUSvhTF6CFKsao5nRBbQ="
},
{
"pname": "NLog.Extensions.Logging",
"version": "6.2.0",
"hash": "sha256-uwTAGEtm1PKu6Que5FgXPsJPtd9JNn5YKzkEpgf1kqQ="
"version": "6.1.4",
"hash": "sha256-ChUPGAWJls61E3/w+3q9/jlxDaqGVxCbB6b6mHAPsI8="
},
{
"pname": "NLog.Web.AspNetCore",
"version": "6.2.0",
"hash": "sha256-3BmNMi9NT5j5EnHDKzBhFxh4JxcuXsLfPgEBcKCvEug="
"version": "6.1.4",
"hash": "sha256-PWrgqvrszRzOvk4tX0n70pa6wDea6eD+C/+2+QKFgoI="
},
{
"pname": "OpenTelemetry",
"version": "1.18.0",
"hash": "sha256-r1jytFUP2GnoeiYru8qZDDpvWIA7eVU5j2GM+/wOASs="
"version": "1.17.0",
"hash": "sha256-z68MFp4PEANJeJ3O0nTfJcWosZ4eZl7Y5T93wVYKdKA="
},
{
"pname": "OpenTelemetry.Api",
"version": "1.18.0",
"hash": "sha256-k0duyYLYxWzHWzxzjXQ95Kr3eW+kpu5AQOmHNBTgusY="
"version": "1.17.0",
"hash": "sha256-r/Op/9OQhmL3H+XnkumD8BSdb6WwazolraVXCWDvfdA="
},
{
"pname": "OpenTelemetry.Api.ProviderBuilderExtensions",
"version": "1.18.0",
"hash": "sha256-0nrZ5F/t/EBuFoIF4G31CMoLjjjtJ0XwiVp2a++Ptu0="
"version": "1.17.0",
"hash": "sha256-dAzEFnvUGs0BjQ0Dpxl6ird18yk9ur3djAFVZXJktGM="
},
{
"pname": "OpenTelemetry.Exporter.Prometheus.AspNetCore",
"version": "1.18.0-beta.1",
"hash": "sha256-mmzUVBMG2KF4WYKKmfjZfjxrZv+KEd1jd7WAYX504Ok="
"version": "1.17.0-beta.1",
"hash": "sha256-5HpmgbBzLf1YX5FkdQHXKsq5rXgctNoSrUqc2iaNolc="
},
{
"pname": "OpenTelemetry.Extensions.Hosting",
"version": "1.18.0",
"hash": "sha256-uIhH1HtU3Ycgt6ruH4ObgRkyPzDFaU4PO1CH2GiNUrk="
"version": "1.17.0",
"hash": "sha256-wesl30ehEO8aIf4kDRRE2iHkMKnv6Ox/4LyQdmtLBnc="
},
{
"pname": "OpenTelemetry.Instrumentation.AspNetCore",
"version": "1.18.0",
"hash": "sha256-OjvhLGwJHWCCnjLdONuL6QIcpvAzDlb7/34G56QS3hk="
"version": "1.17.0",
"hash": "sha256-ydRp8bo5vnHkNzUUHl631WAwbl2d78jQRWXLVvL/QEs="
},
{
"pname": "OpenTelemetry.Instrumentation.Http",
"version": "1.18.0",
"hash": "sha256-MCvYq4Fq5qMiObHq9s13mKXegi2MDxM4j0SNyWMbcgE="
"version": "1.17.0",
"hash": "sha256-QFGOiVZ91oDhu3e/C7vUWxq0v5fcaoaWkwbyWbzIhbo="
},
{
"pname": "OpenTelemetry.Instrumentation.Runtime",
"version": "1.18.0",
"hash": "sha256-SoQDQTgWBad8wpRESNXllkd7z6ZtPZblO260WWp7rqA="
"version": "1.17.0",
"hash": "sha256-YCVl3X4hEqWeJ4buBA6wdQDwDXeR2Ae/fHyuySKqCX0="
},
{
"pname": "protobuf-net",
@@ -596,8 +596,8 @@
},
{
"pname": "Scalar.AspNetCore",
"version": "2.17.1",
"hash": "sha256-llpxBLdTyatjr1Ku+aJ58iwEgxHPEbaa9NHge4iptDU="
"version": "2.16.15",
"hash": "sha256-XRzl2wnxnR84jshpKbQbosfU+D3wMAZx7Qs8PwmxXe4="
},
{
"pname": "SteamKit2",
@@ -606,33 +606,33 @@
},
{
"pname": "System.Composition",
"version": "10.0.11",
"hash": "sha256-Xy2eu9QYetykNyJaDAAIaarP/R/EZh38eG3FdYg49ZQ="
"version": "10.0.10",
"hash": "sha256-u3CKzFRnQ10eMC67s610GQj5/CaEGxxpDtQB028NbzA="
},
{
"pname": "System.Composition.AttributedModel",
"version": "10.0.11",
"hash": "sha256-1p4YiiZL7pwhuBIu3kL4H5C078B/0xFtGPTVuH364WA="
"version": "10.0.10",
"hash": "sha256-aGKpD94yaSuK0vmdV8tSPZ4BtHaFZ90H2XxbePvmaMs="
},
{
"pname": "System.Composition.Convention",
"version": "10.0.11",
"hash": "sha256-P5yoYET5j85BOuGublA1CdTYlXTvWWlA5sk52+4goww="
"version": "10.0.10",
"hash": "sha256-o+ptLKlKBZAYri+QVDCeP4ljfXDCQ176fUaI0FeHL2o="
},
{
"pname": "System.Composition.Hosting",
"version": "10.0.11",
"hash": "sha256-PfiX7CD+T+9hRU3NRCEfUp9BGcFGQdlKDG1sYi/Bq74="
"version": "10.0.10",
"hash": "sha256-VMZs+YqwwIJsCpUiC+kdbDjG7l+qnjk7Nq4Tnbtg058="
},
{
"pname": "System.Composition.Runtime",
"version": "10.0.11",
"hash": "sha256-jEC2yTNydHEs/iSrygIJW9VSPVv9w0/q6XFUx/h/Gmk="
"version": "10.0.10",
"hash": "sha256-HTIvnvhcTdMdEv7Y20vK+VuQy9reqOfMQRKWjzeEr+I="
},
{
"pname": "System.Composition.TypedParts",
"version": "10.0.11",
"hash": "sha256-k/WfK3X+BkKWTltHzPXY7GMYxIk2WuqYHAOlskOLxJc="
"version": "10.0.10",
"hash": "sha256-Qx3V/LSM5jHwnHVl77w3G7jK3EhnFWgmWxCAJ1Fyres="
},
{
"pname": "System.IO.Hashing",
@@ -641,13 +641,13 @@
},
{
"pname": "System.Security.Cryptography.ProtectedData",
"version": "10.0.11",
"hash": "sha256-YZi5wcj1Rfnt4SygMIWtdPNitbMwJeNEbtfpa0gPTtE="
"version": "10.0.10",
"hash": "sha256-sKm55fvpXHZIH5Jw+zTz06BwMb8Nog5+1LgxPyU5lbk="
},
{
"pname": "Tmds.DBus.Protocol",
"version": "0.95.0",
"hash": "sha256-QMJWrpYvjrbaPMH+5+1IQN+YSWG6wQ6jcESUx87ZX3I="
"version": "0.94.2",
"hash": "sha256-ZUxaReVMikjf3VqjUSSTovcjDTWJO8jHNKrvj1dgHJI="
},
{
"pname": "ZstdSharp.Port",

View File

@@ -21,13 +21,13 @@ in
buildDotnetModule rec {
pname = "archisteamfarm";
# nixpkgs-update: no auto update
version = "6.3.9.6";
version = "6.3.8.4";
src = fetchFromGitHub {
owner = "JustArchiNET";
repo = "ArchiSteamFarm";
tag = version;
hash = "sha256-sbLctGmF7JTDkqQQK0FARksptFkH05oMuZN3L+P65Z0=";
hash = "sha256-LCynvt8TzvfttqHMq0yAjrP5V8IK/dnpJogeh+6NWoY=";
};
dotnet-runtime = dotnetCorePackages.aspnetcore_10_0;

View File

@@ -7,7 +7,7 @@
buildNpmPackage rec {
pname = "asf-ui";
version = "ac9d5e40ff8865fb9542eababa9a03a774782a1d";
version = "5e028bc91dd3c0238b602714d96713a205600248";
src = fetchFromGitHub {
owner = "JustArchiNET";
@@ -15,10 +15,10 @@ buildNpmPackage rec {
# updated by the update script
# this is always the commit that should be used with asf-ui from the latest asf version
rev = version;
hash = "sha256-NsETAXfH2dqKjU/vmkpRU3NrRdxwOg/JbAshXS3R9Uw=";
hash = "sha256-HdUdSrwTXALoT7qmcAYwaeaw1POus8++TBeoqIuEMDM=";
};
npmDepsHash = "sha256-7z2/2BM8p6TsMNNaMKcS7gzKUvHMZk8P3OIPBg7raJI=";
npmDepsHash = "sha256-Vhs5apBz951fcvIx8J+/oShit7rD4/RB919d40cjavs=";
installPhase = ''
runHook preInstall

View File

@@ -21,7 +21,7 @@
flac,
fluidsynth,
glibc,
glibmm,
glibmm_2_4,
graphviz,
harvid,
hidapi,
@@ -142,7 +142,7 @@ let
fftwSinglePrec
flac
fluidsynth
glibmm
glibmm_2_4
hidapi
itstool
kissfft

View File

@@ -17,7 +17,7 @@
flac,
fluidsynth,
glibc,
glibmm,
glibmm_2_4,
graphviz,
harvid,
hidapi,
@@ -129,7 +129,7 @@ stdenv.mkDerivation (
fftwSinglePrec
flac
fluidsynth
glibmm
glibmm_2_4
hidapi
itstool
kissfft

View File

@@ -19,16 +19,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "asusctl";
version = "6.5.0";
version = "6.4.0";
src = fetchFromGitHub {
owner = "OpenGamingCollective";
repo = "asusctl";
tag = finalAttrs.version;
hash = "sha256-UTs9LF2EKUj5vxG0hc9V4DvCFMbyYgvA645ClxnE3WM=";
hash = "sha256-qLdOdZaQm3t7LhvoCCo/FwZo4O7Z9aP1KPPlERgZX00=";
};
cargoHash = "sha256-Kujj8gQ5qsEv2iLO3T1JoK0E2q0ByOhxpuN942EvB7Q=";
cargoHash = "sha256-sAJ4el6URZXHD2NWiWpJSBf8Qeq2v/y+F9KpMCc8BbE=";
postPatch = ''
files="

View File

@@ -3,7 +3,7 @@
stdenv,
fetchurl,
atk,
glibmm,
glibmm_2_4,
pkg-config,
gnome,
meson,
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
propagatedBuildInputs = [
atk
glibmm
glibmm_2_4
];
nativeBuildInputs = [

View File

@@ -50,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: {
NX_VERBOSE_LOGGING = "true";
# Needed to properly embed version info
CODEBUILD_RESOLVED_SOURCE_VERSION = finalAttrs.version;
YARN_LOCKFILE_VERSION_OVERRIDE = "8";
};
# Regular "build" is very heavy and does things we don't need.
@@ -64,13 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
in
''
echo '${cliVersionJson}' > packages/@aws-cdk/cloud-assembly-schema/cli-version.json
cat >> .yarnrc.yml <<'EOF'
approvedGitRepositories:
- "**"
enableScripts: true
enableNetwork: false
enableHardenedMode: false
EOF
'';
preBuild = ''

View File

@@ -10,17 +10,17 @@
}:
buildGoModule (finalAttrs: {
pname = "aws-vault";
version = "7.14.0";
version = "7.13.6";
src = fetchFromGitHub {
owner = "ByteNess";
repo = "aws-vault";
rev = "v${finalAttrs.version}";
hash = "sha256-Adb0k6Cb0Jq4LTexNYmCHThE+/4ariIutwy7pH2onoU=";
hash = "sha256-mdju4dNQ9fTlB1y1U1I36vb3mHJ4J3FCOGityyD67RE=";
};
proxyVendor = true;
vendorHash = "sha256-vdgQS4ziTzLHWVaIiHORlSEOYPEbMF3fsSabEJh26t0=";
vendorHash = "sha256-Dy7bWlpYDBRm384dn6cdDTtRfmdtn6VDrFOURBrCGmg=";
nativeBuildInputs = [
installShellFiles

View File

@@ -106,12 +106,6 @@ stdenv.mkDerivation (finalAttrs: {
PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMGENERATORDIR = "${placeholder "out"}/lib/systemd/system-generators";
};
# Workaround for RISCV cross-compilation issue
# https://github.com/koverstreet/bcachefs-tools/issues/850
preBuild = lib.optionalString stdenv.hostPlatform.isRiscV ''
export BINDGEN_EXTRA_CLANG_ARGS="$BINDGEN_EXTRA_CLANG_ARGS --target=riscv64-unknown-linux-gnu -march=rv64gc"
'';
# FIXME: Try enabling this once the default linux kernel is at least 6.7
doCheck = false; # needs bcachefs module loaded on builder

View File

@@ -1,41 +1,91 @@
{
"@esbuild/aix-ppc64@npm:0.27.4": "ba2c14b9cd901d9e7ea99b7de8ac259b146bf978c69866328d1765f277b11105cd16ed4df82107593b5c9b667bba5fbcde73cb7a9f511d98caca9e26778f64a5",
"@esbuild/android-arm64@npm:0.27.4": "d5a06758f91f0cf795d3a77198fc26fefbd78c3ddfce682df8d8ddb96b31ee65549ead1f6040a496dad2a1fc0fa345fab90692eff3410663bd0f39ed670ac727",
"@esbuild/android-arm@npm:0.27.4": "faeac957ba9eaff1c79871151dea2101d03691cb3772ffd5b4475551f54bf7962e1313346b6c06527e5dce09c63391b6b987b06070a544c4b8aaf91652ffbb84",
"@esbuild/android-x64@npm:0.27.4": "7e294ba0331704c4c455763a7132efff4484066b1a522d64c3068c9017749b9b2c59dbb04bfa6491d78fb65da826109af0ea6a7517b06c8a7d7a64e706390e59",
"@esbuild/darwin-arm64@npm:0.27.4": "57f495c8302bfb58852915195e3066166239de00ea84f91f4cc84b7f46dcd126bdbef0ceb22581e643d0c3a2ca34936dd72a96b40291362c2716d3edb6e051ee",
"@esbuild/darwin-x64@npm:0.27.4": "8b0af048b1b03a2145484fa02283b5c0c9b528fb857d510d9a02150854a2df3a08ee93a4ed269b7e1da54c9009273dac2ce75a419c32fd2f516550bfc534fe11",
"@esbuild/freebsd-arm64@npm:0.27.4": "67a551695f67acdbe7ada9dfa0d97d30ba9065cf79fa96d4e8b75c892200ea25ad8187fb108811b0af1e1ba559fb2b7d4ec572a002916bed70bca654e2888c14",
"@esbuild/freebsd-x64@npm:0.27.4": "a3b0ce4ce0f6e3614b49fded87a7c5989e34a4b81876450650f372cb119d835e627c325039c9ec93cb5fbb098a14dd0e8cfda8a24e8be670ec7900a27e9b90f3",
"@esbuild/linux-arm64@npm:0.27.4": "f3467a2e4f7db00b73df8e074d6c4d7b685d90965d7db8bf1a041460027b61cd9e9f258cca66dc26e0a1b5d8cb84263cd7bec81d7513e27f0ea9dc86253e69da",
"@esbuild/linux-arm@npm:0.27.4": "b30c834aca19a68de625214e912e3e5e2b040a32c82acba0c66a70af741b43f5a02ab07fd1e2f42f2bd7d336e0cf25333993dd070e23c70ea6470170a3ad90a1",
"@esbuild/linux-ia32@npm:0.27.4": "51d5d31a222490225f78802cda61d4ba618a3b5b35f3ea57675725f2cf7af32740c8be078fd5bb42952719b81de4e5b692ea1961d0618d827cbd5bc3b8298a94",
"@esbuild/linux-loong64@npm:0.27.4": "225d208ce874ec7bac4b9028933872aacc1b3d7be886f90741efa1cdf853ad51a064c176bd76ff24f0ce1b21946865b72c69a68bbabdf0653873d0f95398a4c8",
"@esbuild/linux-mips64el@npm:0.27.4": "ca438a7ada46810bc1b24ebfcccf0e2c2cc3098e0690b6d2f4dd031bf33160fb5dde07d5644d5a60bdf3768d89667da7c0df30debee684efc47f0ed5b876c6da",
"@esbuild/linux-ppc64@npm:0.27.4": "da0bb5332234921f746da98765b9a20421a5334bbca2abf8fa0f149929a94c5e1a42319b62aaf9711918d42bc0e397e7dbdbda7389ff64c63f843d451378eb0c",
"@esbuild/linux-riscv64@npm:0.27.4": "b6942603508353c956f804e8c037d9d7092b7885f78c88882753e21e978f5aace82c0aaa42a4100edf2fce3be76ce582ff4e550a7a87079446a4b6228918100c",
"@esbuild/linux-s390x@npm:0.27.4": "719d52323400ce16ee69314886ca17a97d7ed6a9886387b7e4e70fae7133721eecb65a44b521d79d9b6a4f9a3c5fd78bfe65a3b0c5315f11e68847d012344d97",
"@esbuild/linux-x64@npm:0.27.4": "2281d03477bd82fecd14fbbe2c6ee385bc196fef87a2dee9be9eae69429af9972b53f869741db3fdfd404d936f38f3aaf237194f506f8113b79aa9978c26ffba",
"@esbuild/netbsd-arm64@npm:0.27.4": "ca68d9ba6054eb15e7de67283073a82b6492871bec6d9b67cee0785c6d4b9a3391f7c286dfe093206a659a05bf27dc2b58c1e730c0d7ddcb997b7643684cd734",
"@esbuild/netbsd-x64@npm:0.27.4": "9ca4d720a2b681d1a01b50005bd00eb6ac182055585adc845fee4312ff87c55a678d19bbcbaad9f4211e9d409c7d03121748524978aa5404143e375e22d2f900",
"@esbuild/openbsd-arm64@npm:0.27.4": "1459bc44aabc838255cae80e33b32eb22fd375d924ca3eed9e0987e33a1ddae6e59ac61e529564ed9ab7ce9ad108db0f9eb4c5558eb8bc63b952d4ff3692f4a6",
"@esbuild/openbsd-x64@npm:0.27.4": "809917a83bb809d51d11d59ebc1bf9f44b6a94fb1f82bd5d52ac642a7dfaf55c90a71351d263d2c164b2d38700aa0dca69afec4840f929ce56daf90a696eadc9",
"@esbuild/openharmony-arm64@npm:0.27.4": "0f9f7dd181d505e0bedae25a73ac26ad9acd099f7b7c49e2ecf12998b59e49c64331616f22cba6b0da9bd7ea6f5b7fc59f7860014dda5e6673d25661042f4237",
"@esbuild/sunos-x64@npm:0.27.4": "16c38ba94b9b2ed6a2ce17e6b5071459f24e7f1df51e4b6555de7310ff1696743089462585c8c49103ea468b8b1b4ee47913d759c5b44b45c15963795c731150",
"@esbuild/win32-arm64@npm:0.27.4": "6e7361fc9a6d12896443f5b59897e5539d642514b9ba440a2d245f84d82b4589744905b6144d6d345a25cb5b1d80dcbc8a87109f4c9d9e88533919587d76c8bf",
"@esbuild/win32-ia32@npm:0.27.4": "36b0fdfeed7263f87a86c93a47d45c07b5e5502dd31c4a3244f058a0ccfa08c206c8d450eac1cc1e0ab98dc1edeb601b60d3b673cec28015d4ed2fd3a0592da5",
"@esbuild/win32-x64@npm:0.27.4": "70e6d04df925717d37f64cf9945a2ce9d5265169df6a9f5d75e60079023d8f0de7ca9f6ac8826a947c313116990562fc6f92c635f0a185bdb6d02e94e967fe77",
"@napi-rs/canvas-android-arm64@npm:0.1.97": "e36688d7201e7c2f60e3e1691aa4be52059a57d1a076b0fd922ebcb032665d0cfa522f17686d6fa619ab948f22ddf5c454b2695263edad66c0684f22373f22ef",
"@napi-rs/canvas-darwin-arm64@npm:0.1.97": "ec8ff5246e437209e4d2c6ef3cfcacba95cb1f73e1f54734ea3df26cd861761d724342072367b68e377ea5780646384a420f5654711b5afe97704bfde1dc7439",
"@napi-rs/canvas-darwin-x64@npm:0.1.97": "706510e1bbdb5d0d7cd90477714326f420788f6869bdbbf009e46061d23abb043d655ea64d71d6f1332c7fd267acf7250119d2356760743d6243ad0ed08e18fc",
"@napi-rs/canvas-linux-arm-gnueabihf@npm:0.1.97": "f0615e165f53f67aae5eb109763376647c80870d696e3d50a85396816e909088ec4f5a3d5c200a2d87514fb870700362f334034c2e629d1dd377c91f8d566f8a",
"@napi-rs/canvas-linux-arm64-gnu@npm:0.1.97": "972083576ede6a0bbd7698775cfa954bc109ca863cda19dc29b4c7b479ca3d6a8e6e3ff3c2fd25f4b9d5ac140885a469a5f99e9c5fe8ccb8d2f714360cb0522f",
"@napi-rs/canvas-linux-arm64-musl@npm:0.1.97": "ed6f85095031d58d649d094bd4de9d61b81bc33df753711eca284e2f01778eb9a0ffe9259a18e7e3245862ac6299425099a85823322caf691436a60c63396d3e",
"@napi-rs/canvas-linux-riscv64-gnu@npm:0.1.97": "cbe5940f9f0cbf88161aedef662791475b0d7abc43a6c0698a6e35ebc8c0d74630cabc491b484ffcd83f5bc3abea07876b781ca93d369d13acc277f1f5de379b",
"@napi-rs/canvas-linux-x64-gnu@npm:0.1.97": "a3484db20c9db146b16a17697e99929611edd973222ab6afff45f8d76bd56551942d9cf250e11206d9a708cfc14958a93941531eb63ed6a95b4925ae1902bff4",
"@napi-rs/canvas-linux-x64-musl@npm:0.1.97": "2ea96191a243930371271cc34d3ad53d12bc19718e6eeadd5f98e64e6a9c6cb682fc9cc76eacda8daf7a197d7edde56aa3a8171abfd1b47d2dbc358edac21b3f",
"@napi-rs/canvas-win32-arm64-msvc@npm:0.1.97": "67bf5d16e364ac882d3a626c426fb5a46147809ee78e4184839e2b600b72668a5c45143d79e712ae3c6662e54a9c9b2b4f36b03482086f5ac46c25c84dad8771",
"@napi-rs/canvas-win32-x64-msvc@npm:0.1.97": "3435d19347f23ec93eed8adecfbca6c14db368e916298edf1adbe80dfdd9e7679effe3f64ec9ad8c4f683b56528328508fa6e1fad46230c5ce96f2db704cf5c2",
"@esbuild/aix-ppc64@npm:0.28.1": "9b01eaa9c57542436436de762466b9a348b4596aa53dffa6e7034e4180691e1948d33fe34ec302239ab04c280e5166248880f24531011ff419fbec6986a265f3",
"@esbuild/android-arm64@npm:0.28.1": "7c977c8d4cea5126df4b298d5c31c3df8d14aa05d7477aa11c4147ec7baff17d25542234eea0134f279191b59cb1af18fee49c6916afda554484464129e4f9c3",
"@esbuild/android-arm@npm:0.28.1": "44baed9765216202f71b6aae8d9ddb930efa671d34f63f4220d980662b3df4da7972e965c0a0f12922147aa8428083686f6cb23cd9a4f140eaf922ae0b59c2a0",
"@esbuild/android-x64@npm:0.28.1": "1b8183640bef23f41a91598d898a04a6a8e3ca31d0100207c7e75928ee885878c04e3bcf31f27ed9c655d6d8a7c08e35e3afef035aee649488cb2d68e51abf1e",
"@esbuild/darwin-arm64@npm:0.28.1": "8ed80a99836df196c2b7996448eabb2d503ec8c71d0a8be59af4eed457b858fa5fd9292528b1967f0e106d2a045387e375207a2cc262cd45f89596681e94e7fd",
"@esbuild/darwin-x64@npm:0.28.1": "952b23f33c24aea13f5a78fd41731e06e8c7fa732e10995327fa1289115da6b4123899ca0cdb0cf0a56add29efcb9f7891ad6fda0bfb94541347275537a71e77",
"@esbuild/freebsd-arm64@npm:0.28.1": "cc2c4f1f13230607807c3f128680d789e85d4b93309501c4f8d84ed0674f4a2a3e60e279e3b997ee9f797047c1c5b906b25e4fe37de62d19634e4470bcb16f32",
"@esbuild/freebsd-x64@npm:0.28.1": "5b99b980599567ee931520a019beaeea4c7ae2874d0bfab79ee4bd6373a869251d2175946478c527490ce155d10a5bcc795e8c986dceb4a36fb6e813513fc54c",
"@esbuild/linux-arm64@npm:0.28.1": "9348c6bfc2d878e6213cffe482d4455d817b9e56b3c581a9f68b94aac720cddea5733d963dec57ca273039f3a7ca1714f1ac8e39e2e0f85f1af42f5d05e3ed00",
"@esbuild/linux-arm@npm:0.28.1": "654d7af59b4be40f585455e42ecb389657c6f11b1f2be2d5ab04caeac0514574d8b2a28b9f0f9805d92e266a44a5627c5acc8151b0d0379f75ac1490fecc013d",
"@esbuild/linux-ia32@npm:0.28.1": "cce27fbd8d74f34bb5507a5db8c0119aa377c7a070fd0be3881a8efddcdb8adeebe24dc97d55784d74a8bf4a60fb55b48899f41b5e931acaa3eb9f90ecc94a01",
"@esbuild/linux-loong64@npm:0.28.1": "47c3215d378f5da750300694b273b83db26d3e9ed36553696a1769da6d467e7557e289b46d211c93ab7a2978348b7415b66c7fec31658622f5bd356332b9d5b0",
"@esbuild/linux-mips64el@npm:0.28.1": "166d8888e731bdeba0c657382d429c0a979af2136100ee2491ec47b2e2ec55f6924fe2045880b48a6cdaeb3dcc44fc495f3f4b9a5aa3bb8c418d1f53f86b2ba1",
"@esbuild/linux-ppc64@npm:0.28.1": "a8eecb9e43a26dcb70a9805e685dec9f0caff0a8bac691b06a6db7c14ba0a69980ef0c01cb3fc1377ad63e2c4945f396fbbeaf008588bb232e9c0c37dcdb557b",
"@esbuild/linux-riscv64@npm:0.28.1": "cfde883f336e1811fee019a1df402000c7a8e6dc5a2b3577679fd0d9711d1a774c1faa194cc8954b18ca11f3a380ef32905ea90c241803831b61017d8a667c3b",
"@esbuild/linux-s390x@npm:0.28.1": "ea121d2fb6c8f6161312e0239258b584c431b4d23f320ace7cbc18da77034aac5ed383658d2a48fdfa32e38be07126a14aa26802b8e04d0e958e82646fb87f41",
"@esbuild/linux-x64@npm:0.28.1": "9b5458cf012247e31c6bf465e37553f2fc5aef3fccc6593bb30fee0c547958f9f00fbedd44e5bc076cf68d6791a4af2ce8714260fe341cb16843a78643773e3d",
"@esbuild/netbsd-arm64@npm:0.28.1": "86b5cf33fbad27ea5e7345601e711a26717bdf5ad119efa0b1bb9ad6a75f7cb2658c57ffb80f19491e3c7105f4698e76358ee2b6d57f48c9a230de9f588589c7",
"@esbuild/netbsd-x64@npm:0.28.1": "ff24c209715f7f122c711d3c51af099de27659837d3f7bd4cbea9a8868fa99a10b7af785058d18a1e32b2132989d1d1d82b8768df77ff25ab6cf19d58be3697d",
"@esbuild/openbsd-arm64@npm:0.28.1": "fe6590621116132baa0a2b9c2dc95c6342f146170ec1ffb343c29936580c369a69061676bef4e654ee27bad6491f531af3ba985aed7133eb16b758fffae6a445",
"@esbuild/openbsd-x64@npm:0.28.1": "2600c51c394945654f99b096fccba95e1d34fa3ecf4e78f40a7aee4573bf21dd955c274e0586768e9ebef3bff145ffe30231f1cb281ef5e679f7aa78dcc86687",
"@esbuild/openharmony-arm64@npm:0.28.1": "be9e1d1e4af478778ce847e28809fba0b754340a699e37ec03bc1a3cd4e84e4fde30ffea62099757877229b024d50331efd6270580492aa6be38eb2353ef5646",
"@esbuild/sunos-x64@npm:0.28.1": "349b9c7d879496456b2eb28f7bb3decc12a906007bb7fb24cb2b269f6b3e5138af109045b216bd0396762e63b802f0233408cc3dce802be5fcf242d4835b6bc8",
"@esbuild/win32-arm64@npm:0.28.1": "551ada5396e1f10e3d3592dd60a148a7257af1ab2317bba09e9ed18a6d7ee7e5961c68eb1fbaee4e8c1961b504807493e1b8f5c700dd1fb990f0cb36b240ad57",
"@esbuild/win32-ia32@npm:0.28.1": "2676ace6b4d63721da34873974152e869aed9fc8bd9fdff4b8df14a3a3e68b78a9b4566e643b90b948b4e85773cbf288a33a59d13979caaadd43b5adad68312c",
"@esbuild/win32-x64@npm:0.28.1": "8d658b74ed9b7494b3799093551d4c928a7916865ed42d00a135156cbd08612b53072e9e424f0687c10a93a444d30d6b0294b6a1d5fdba78078d706646ba558f",
"@napi-rs/canvas-android-arm64@npm:1.0.1": "1cc67a6e714b9e6cb194709b04a3994ec70679734608244b56aaf2cdd08a451cfc489957ffbaae6d11df2a3ffa9783d27704e14f479720b8ca0002d152f11098",
"@napi-rs/canvas-darwin-arm64@npm:1.0.1": "670bb1e83207a3b100f21c9e46a9539a8c7435264aa83faa7db47697dcefc52ae3c890a3f3f3df4f0e48ae2a0a684ab2e150a917977fa5291e7909bda485dc6e",
"@napi-rs/canvas-darwin-x64@npm:1.0.1": "ad09f3cd6a77b2fce80797ed25dd234906a523d7b7eb3e1a7f282b2d2a5778b2524166a9fb3964211869acb7bdf0bac664f9fb23e3e5301e37f7dc3eee445943",
"@napi-rs/canvas-linux-arm-gnueabihf@npm:1.0.1": "a204cc876f337011d1f04fdb7030af306c52612d8ed62e9fa2d9355f862de52fe56585c08a409b08e8d117200170c368cc6c9a60771f3763532c0ee900ec8e8f",
"@napi-rs/canvas-linux-arm64-gnu@npm:1.0.1": "84847d67398ba2a03b6eb77a3d71fa5ca17a0155483fbd8662a2fed106e3a5cfa7724149b571cc324beea3ebedfe1a5ba74c92254e2db1944c312750e9597349",
"@napi-rs/canvas-linux-arm64-musl@npm:1.0.1": "0f952496e5b22698580182862784ad4ab6afea1822a0398eea66e659f1c548e669a1fc9d805c9bc2e8e784d2ac1e8ca1fddf1584a0abc5abad9a017d5c2213f2",
"@napi-rs/canvas-linux-riscv64-gnu@npm:1.0.1": "2a10b4a1fc89e6dfa152f70de041e5c81ed4f7129ec5ab8ec54d155652540ffde5468b3b536f451c439e1b3b07c77bb3609c486cc9ad4a164267c781cad13a53",
"@napi-rs/canvas-linux-x64-gnu@npm:1.0.1": "41a577d9024e6c01fd47eb44f35514a558d63ce8f71384ad237857613911d667cd22caa3bea8ff470de771987cc293acf2433a5758307dfcfecafb4d2d1598ab",
"@napi-rs/canvas-linux-x64-musl@npm:1.0.1": "2c46a2475e59718f1562639bba501cef507cfbfbbeb15aa92dc5ca9839df781d698d152e3d5e56b258343aff03403b18d984e49a27f48df24013258f9ac9b554",
"@napi-rs/canvas-win32-arm64-msvc@npm:1.0.1": "8ef07e51204c8fb38b5bcd2e94f3dcb731b4456a8a56b3fb4eae3f7c92cc7020e1a7b94b0e566d6432783050d8a1737d40dfb37b06863d5064fdf1519aa11d15",
"@napi-rs/canvas-win32-x64-msvc@npm:1.0.1": "ee22f54b18f16ee09711b63ef67f2d2c6302574ea0140181664d1efcf508875d69c0d8948c2e5be0cc6078bd6f5781e0cb85c1af81e7443251a2983f7f030acd",
"@node-usb/usb-darwin-arm64@npm:3.0.1": "a47f20202b48f309a91aa726b0e5a8ccb3d19d8615988cc90b4e3ef3557f5bceb3da98a8495c6a59d22cd486db2faf78cec69cffc4d6285ac239392ed8be07d5",
"@node-usb/usb-darwin-x64@npm:3.0.1": "a6f0010a97bb3756956b2a14234350fe06cfea03feb087bffe0d9bb5f5b571e3ebe93c6ce0ad4a486bb4d0bb880eabf6fa50f1bc2d273f16e4811905b70e3313",
"@node-usb/usb-linux-arm-gnueabihf@npm:3.0.1": "3caf6677834fae131ed1566aab62eba1da1f9d12da17fb789bf48c142b5ab5fde7eb8fceef59a8b1543a73846bb8bf368a4029ca8bbf9b1c35d30e93cde3ccc8",
"@node-usb/usb-linux-arm64-gnu@npm:3.0.1": "194dbc3d0e594c023efee4c060c61d2523d96e686f74181f06df9747b9b6dd31daa2a757dc0bfa26ea819f68ab10edcd64e12faf052ead2af31ace1e1494a94d",
"@node-usb/usb-linux-arm64-musl@npm:3.0.1": "1bf85e9d653f3418f66e06d7df9da879fa8dc10ef11a1eedac66116d8f9eb459f59e83d033471886a556ea35805bb4bda07070b698d6fdbbb817929e8acd78a6",
"@node-usb/usb-linux-x64-gnu@npm:3.0.1": "0c2e117a42697717fa2c7a72865aabeb148a5c3f2b29d9b06d614282f3da2a536afef0151ea5fe6e826de3f4af4f0be745b30fbc614a82dc2a54ad5a087b14eb",
"@node-usb/usb-linux-x64-musl@npm:3.0.1": "fc8d8ca0efb54b88020ae9fba342f76ee6b5be4faa0ff4bf95b85f35ebaa3a7a52cbf98b9c432c18145a5a199c2a276793308276eb76c6177ba7bbe13545904a",
"@node-usb/usb-win32-arm64-msvc@npm:3.0.1": "0f793ce63cb210b8afe545acb61056941023694ab28c6f98a1153b7f82199efcabecfba5fbc5312e431f7473ef49ee0a2c32ef3e210edbda7e86503cd62f146a",
"@node-usb/usb-win32-ia32-msvc@npm:3.0.1": "2d8aae1e5694e046dfa2bbdcf18265c7b3ede1c17b71b1120efd7c43be30c187133289c6e2495d39c04ac5eb0cb37d8954339eea177024a8cd87ae2cff5557a1",
"@node-usb/usb-win32-x64-msvc@npm:3.0.1": "d3b0ec8570dcccc0e47eb5633bd8bad6276a98134fa1f1d87cfb35f66fb3a9cccbb54efad0842e8f1491d5d40b0620358ba87d247bcbdbdb4307db3d3a41168d",
"@oxc-parser/binding-android-arm-eabi@npm:0.127.0": "945e01f64f415992639081a3dc19aa5919f45e69c38298e20cda23c1e8bba26f79bad55e6dd6190a43866f363dd275970b71843ecf8a51a360cc8768f5900da0",
"@oxc-parser/binding-android-arm64@npm:0.127.0": "f28a90adca64bdabb7e5991941ace223559acaf5ec134fc6fd4f983979a660eafe97b1b03139c6608640e3b37d5a0225684fb49efc38b97486acaac2ebf9f3ef",
"@oxc-parser/binding-darwin-arm64@npm:0.127.0": "490d39689bb179a1f21b6e2230fe877fe6d62520e84d5a673f4d7c704c9a95bf63826bce15208ebacba172bdef0d5fd189b87eb5556de1b9fbf12944be183c8a",
"@oxc-parser/binding-darwin-x64@npm:0.127.0": "8e1ad7af46356aca1d43627e94c9a72d35328a5f66dc184a33bc3e28a086f4ad2b70bd44f097eff6a6b52ab94bafe0e15de396f6eed01d0beee7bd1a45e98541",
"@oxc-parser/binding-freebsd-x64@npm:0.127.0": "7eabf352fd03452bb8f853c7d92581705ddc207a31797b2649f364715b5818d3fb86512bca5a1dd6b3092f0690303f92c240d6ca1738b7a5e27992c08f648cfb",
"@oxc-parser/binding-linux-arm-gnueabihf@npm:0.127.0": "98edb854fd3c30e489237fec6cda7c1e46f0961d1b738369fec357b694989d95ff5ca20b576c835b7af7084ff703888751c877d46862e5745ccaf9e6ac226a0d",
"@oxc-parser/binding-linux-arm-musleabihf@npm:0.127.0": "d4a19c2d8f943c341e452e7ba8adf844998f87ed4ab501b473a05719fca52282bd133973f26e07fee28812963d39cd199702faf424a42300d4e317149079e84d",
"@oxc-parser/binding-linux-arm64-gnu@npm:0.127.0": "d818144ea9a661d54474001e750a501cb5e12460e22d4fb3f1c46506282ee9689a682761e07f4b925d2349fcee2734fa50b6655ca7f519c4ad9a055b0c4dac89",
"@oxc-parser/binding-linux-arm64-musl@npm:0.127.0": "f62825639af42d6be5e4c7a16576f1e23f4386b7db222dec59e320c0c2ccfdcb6efe45903a2969024f14c15f173b174d969473af9a0773cf25c07fdd3bfa4e31",
"@oxc-parser/binding-linux-ppc64-gnu@npm:0.127.0": "e635b0adb9e26bfce5209a87f2b55137ccb1e0d95208e1fd36bc1f0735fc3df95f8a99e11ad9d9ae621031ce21dffe583aa01c40080a9f57b466945306878e83",
"@oxc-parser/binding-linux-riscv64-gnu@npm:0.127.0": "bd16bb323eaf46ed519a583dba0a4b1a5984f65ba19d3773133476a7bec6985e6490efffcfd4d5f711c5acb7e201ffc5898b56ad7fa619cf884990514264bede",
"@oxc-parser/binding-linux-riscv64-musl@npm:0.127.0": "dc38d5b6c6ebe40c2f45ba59c1fa175f9bf148c274c41b0fea39311756e7390fbc25ad1f2399bbb9a2a12f1c2a8d4e284055a12042b6ec90b08d79e579afad33",
"@oxc-parser/binding-linux-s390x-gnu@npm:0.127.0": "a6e6f9c0de7b62087e3950a16b8c6f74b0995e0599a74eff0044b770dc1509e7f390c837f58ef349812036c2cec145cff5ff29800707123813688cbb632b3565",
"@oxc-parser/binding-linux-x64-gnu@npm:0.127.0": "2eea74fcd38d5c2cfdece401e9e8d2099f660266a2efd01603f85abd464aed1f28f77af8951655b2173bde8446da99a0657e7f531af93c941d6e2c851cef093f",
"@oxc-parser/binding-linux-x64-musl@npm:0.127.0": "e746466aaa1f7826130337d83e6b976736d780c59c12c43b5ca4710ad6a24439341e9d5aa58d705d6f6e0618296daf7f422f24e260b3e5c52f7cd0d916bd7ddb",
"@oxc-parser/binding-openharmony-arm64@npm:0.127.0": "5a00e6fcea62d4cfa3993e8d1f4a7f1bc2d70a80f8ac5bcff204eaf820124529194517e94937a3a6d0c28844cf713e7629c0a57cdddd87e0670c786c1890aa74",
"@oxc-parser/binding-wasm32-wasi@npm:0.127.0": "0679729f6bb75538acfda31258110ba0c7c60b195ebf8f0461c1f412fe8cf8a423c35eb107f184e67f3160c44efa32c705581a4014be050feac652a814eb9376",
"@oxc-parser/binding-win32-arm64-msvc@npm:0.127.0": "410ccb3fedde21efef8713198be39e7ba6526509d1328801b52c76e911af3412d1f214aea3609aa828bf30ec8a05e811c82e383da8e6cc3d670415cf17497db8",
"@oxc-parser/binding-win32-ia32-msvc@npm:0.127.0": "86b35f2feea4b23654bafe27b9bbe77194d4923f73f4254f813bcf14de5f12a09ce67e7fdb93b73944c9b859a0433128f3df2ef3fbc56f4c486e99d393508f0b",
"@oxc-parser/binding-win32-x64-msvc@npm:0.127.0": "6993c90d54ecfca7b5fd5a2a6f07909d53ce553b14e55dda739550e8dbc1a593c49f23792063cce95bf286bcae4f67624d0d9f014e28eaa700a31da185f2127b",
"@oxc-resolver/binding-android-arm-eabi@npm:11.19.1": "7fe35b00927acc6b1e9abd7cbf001cc4855f697b1a6604f245cf80ecb09628195d724545680b11ee58c462482247017e6d25d3b6074437ac61842ebb2200e925",
"@oxc-resolver/binding-android-arm64@npm:11.19.1": "2074f0f614aac0178d8c879f0a3897aebbe9cce66241bb8db8dd0400bf30db8a322fbcfb3dffd90e4a9f08eb52f32026155094c3515901f9e50f8c8115508bc2",
"@oxc-resolver/binding-darwin-arm64@npm:11.19.1": "43f0ebd467387f508dd13749b67a1b21b81902dfec7c7fdee24df1976942a78171e29e4ef09390dae88181dcdc4ccf08f43ade727c101572fff961b925f79834",
"@oxc-resolver/binding-darwin-x64@npm:11.19.1": "efad8b905d7cab94ddb749a7b486e7606d21a71ba3f2c8bb117e4a7648aa22499663c96819196e0f38830bb87885f147f517147f3117f805f908274086de01f9",
"@oxc-resolver/binding-freebsd-x64@npm:11.19.1": "750c57d8291f8ab8759f68f16b10aa5967879b7f6f432aed838d3e4b3ea25857c3f5dc1fd4677e79de890e79cc5bdf8bc845ab403bc7d9b7d7827c6af11404a3",
"@oxc-resolver/binding-linux-arm-gnueabihf@npm:11.19.1": "d1a71513000f2d7c300c45ac6b0900831e37759fd0df7c92a6cd2c66b87a724a303da7df94ed16fcbba72ccda45766923212c9711edd228b9f97dfa8da38e08a",
"@oxc-resolver/binding-linux-arm-musleabihf@npm:11.19.1": "4f1b757e8e86fbfdb7f8fd43e9684f3fe339e46606d836b509241c9217ae608397c5c4383b45ba9eabc3b6b4664842839037d41a9e49e726e4ef6e75d871904c",
"@oxc-resolver/binding-linux-arm64-gnu@npm:11.19.1": "6b1342772f5f347fe2a25582a8cd60f3814a7a6e4d2bc8e4a140355409df550858b961ce93932e3ce01fd440e7d4b2dd144978cd6372af325a6e2d85e496b4e8",
"@oxc-resolver/binding-linux-arm64-musl@npm:11.19.1": "40b99fcf1401d0f09a701572927bae4305a15705d2bb44003773ca5bb3ea8f28037e1e64fef5525eef314bd6ef348997b36cd521b4023053e0e0873b6700d52f",
"@oxc-resolver/binding-linux-ppc64-gnu@npm:11.19.1": "3581288514ce58eb79c927a03a43667e7e51b67b20be1f2c8343bce07f1fa848b9802f2d12990af73e8dae790d1ac6200611699c5350bd28a06abe3115a98002",
"@oxc-resolver/binding-linux-riscv64-gnu@npm:11.19.1": "1a8e43df91d8e7fec21c3cf816f20f98a0237b202e99d3768e1a9c49d9ddfbf0acea962991c4ae67dea936f3d2031d77bcacd3af615eecacf7828246be79becc",
"@oxc-resolver/binding-linux-riscv64-musl@npm:11.19.1": "a71fd4c5a13d7cb588d341318811d2728d64111878757988b15c2be3199d0e3f9dacb867ca990ec3cc38ff9eeaf9dfdee7aeb23738028031e6303903f0e501c4",
"@oxc-resolver/binding-linux-s390x-gnu@npm:11.19.1": "f4fc6a75967235ab88550b30891eb17a490e5bcfa8e9b2eaad33b3a4e7fd52ca60e6e0df3dbed5ab9bf4cab51bf05725e86e6d3172a46a1a95a928012a2d52bc",
"@oxc-resolver/binding-linux-x64-gnu@npm:11.19.1": "090f364639f4c6c021f345dc182c37c0d8370bc7b7ce5d93c546a49a3188d400a9c030106cba27a8c02dd7044384efc51187cee4f2e617109593e3c237a65509",
"@oxc-resolver/binding-linux-x64-musl@npm:11.19.1": "653779d9f6b78df664667e5f8693741727cd7c3e74831e0642a3ecd84fbfb36d302c1ae38a53cf33cc9516aef7d7f5ff66dacbb5f3701805baefc5785a5d7669",
"@oxc-resolver/binding-openharmony-arm64@npm:11.19.1": "4d88027b1ad55ab8b4820e8ee24c3a23b6ab6731c14da0da3c6b27394657bb54dd09d01085a64884e8f7219f719b48ea2221f0d7c8f10d2e7288c8a5e0b68287",
"@oxc-resolver/binding-wasm32-wasi@npm:11.19.1": "53be10977b68276a5e72be2a6b56361ff5548243aac269b93178a6058b0cf4dc14484a73ee5d0b68be1582982d96d434d97838515d1a9034a901080aef9d1b75",
"@oxc-resolver/binding-win32-arm64-msvc@npm:11.19.1": "f7671ed2e4f73d9f5ec386355fc9d93940c32bccdfbb7a7fb16bdc51e3cc42ed920cf9cd2f72d77c56e4a4a2c9357e53df3ae88b36106fcb363771e47f50e19e",
"@oxc-resolver/binding-win32-ia32-msvc@npm:11.19.1": "d60ccab0778023eb6977636c32d05c2369b54390aa8bdba4da1809323149548359bc546bccd9e5e717310c46e2a742ccd4dbc3f4750789aa97b5f9cef10ddcf7",
"@oxc-resolver/binding-win32-x64-msvc@npm:11.19.1": "bd84616bb214bd3f63531299f5576538f3f63411f95f1fb470fc8d7434c409fa1922bcbe535c4137673ceb3517e61b102e739a06b1963df600b717a954d22b16",
"@parcel/watcher-android-arm64@npm:2.5.1": "f99d569e4f6cf78a1b0097fb9d4682cb201a74370ae440c531da4e1d5021e46141bfcdf8ef708b51a5b9cb1c30f78eea933ce75216d5eeb7b969a2ad27c68e4a",
"@parcel/watcher-darwin-arm64@npm:2.5.1": "973c7ef3c94608da9cd1b20b18b9a7de2fb46fe44553731fe372b640de524491976150d0845f3d5953b74ed8ea469cb8d18a48651d0e5fb82f549a6b46b54f79",
"@parcel/watcher-darwin-x64@npm:2.5.1": "848c5516aed9c36e14751200dbbf57e83c0bd46cdab0932df33db120e66b9596de18eeb98980e319efde84014f67d9e7924d7555383d8ffcefe35c501166b84b",
@@ -49,46 +99,21 @@
"@parcel/watcher-win32-arm64@npm:2.5.1": "e015314d6b9b727cbe25eedf963ca8b23bf6d4e78d3c28008bd0d2657940ad54a271330486df3a93a5f1a30f2b8d052d14415b85cc7e7b747c6c73b5dc055628",
"@parcel/watcher-win32-ia32@npm:2.5.1": "920b6ad6a2095aeb9c2d329c5118472a3c14669fa93eaa99aa8050c76c5c2d3d76d92677167ed748c2ac5487c568d5df16d5d94f4bc7c354094fccd8e0d6350c",
"@parcel/watcher-win32-x64@npm:2.5.1": "8f1c8e41ec9f86e4dcd0d4db0a077742d5dcc853f15ea888387183e34e2efcff09fd1cc9ec46fc1121b9ad4ddc0e221283f2ffb23cfd7dbcbb8b03060b461963",
"@rolldown/binding-android-arm64@npm:1.0.0-rc.15": "0c78d6321d2dedc0c6ed4b5541328f6c04e8530a3c294b477cd9741e2af7c8377a51474f0171c85ecf63bff5c8bb31ee586f40f13fa265a869247ec3d6293204",
"@rolldown/binding-darwin-arm64@npm:1.0.0-rc.15": "598b8cb87d8ba8df4e880e0d6903f7f4f32b3e7b2804429cb3ccc47a69b8e7b852b2e3115a8c3a882d14979909f9464e8da55c2c52a52cb18a81df7e8a1aa654",
"@rolldown/binding-darwin-x64@npm:1.0.0-rc.15": "92fdfa58a8d9edaec4c1766c38c34f657715d2c8faec141590812d11ba6a6ce52530e55a6a2515fcd2ec6287e50187a458f06ca3c6813130cb9869a99c9f6f29",
"@rolldown/binding-freebsd-x64@npm:1.0.0-rc.15": "04e8288accf007c82e8bbe75af62d4ed570bddd7b25a178506fcf97daa0907cf6f85ea095be5826095242ac1a4923196059f53a9e8fdd0e3c34d9ed1c00d64ae",
"@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-rc.15": "4cd7452e4fe4433b730585bcbaf210efc50621bca5906204179ffe80748bea187398d4091dae64079f0c7ebfea1987f0b1c045ff60209ab0f60be9e04eccbef7",
"@rolldown/binding-linux-arm64-gnu@npm:1.0.0-rc.15": "fbddea791134b45a94aa5aea640a177d6feacd81a44f9ee3615da3daa824dc2a193ced6e8f2a0bb0676fca7b224525513b451cd8f78b379d7b1983fe6a0360ff",
"@rolldown/binding-linux-arm64-musl@npm:1.0.0-rc.15": "b325fa98753bf41100c5d95145f30ce92b5f69f6989973306344b1644fb21633454aa216f28355c74d0e7bd5885bb6d2c80d0f96dcc2b869ca7e63d8b22dbe91",
"@rolldown/binding-linux-ppc64-gnu@npm:1.0.0-rc.15": "0bff0d2724912079dcedfbc0a86dbad8e3e376d2d619cf36917964701b9ae5a39afa5ff49d3cb5b2c3e17437c559314cf8e17433ad3bfb4b64229d9c8bf1ebca",
"@rolldown/binding-linux-s390x-gnu@npm:1.0.0-rc.15": "6718fd91ead389f3bdefe22fd0344b490d3f9350697e4aa35a0fb55957aa1b127d26aaecf9bc2d49f1dfde62d9d4717cf5dfb7d93ce3b871372ef9c6cb7a1b1a",
"@rolldown/binding-linux-x64-gnu@npm:1.0.0-rc.15": "cb7628e1a7398ab5fd07dc79a38c73a27524d45adc989b5d906ea37e23b7692123d607d07fb9fda35485d6caba545ae41c561b9632aefa0bff76997208f83eae",
"@rolldown/binding-linux-x64-musl@npm:1.0.0-rc.15": "f59fb354b8cac55d123f6f3fe7bf8210402f97ed4be3f3a883c6c544ce1b825e36154f479d45f6e9f23c1fcd8861e9f3873dc24278631db871d263db3bea5580",
"@rolldown/binding-openharmony-arm64@npm:1.0.0-rc.15": "b6c220a48ace9c381d238dce2caaa8453da1d3fe9312bab7babf127a500bdec2bbe30bd381f9945af79c30fe9ca0185108b86ef311fc83ecb83ef24f7a587902",
"@rolldown/binding-wasm32-wasi@npm:1.0.0-rc.15": "9cd39e02ad5f43fc45901d074df10c0e3532d9077a6e334e431de60f90555c15e5445d1b5156c10df49d28839f9f15d5d808666bc8e70ab065bb9af3b8567e7a",
"@rolldown/binding-win32-arm64-msvc@npm:1.0.0-rc.15": "cfc32a72e8a3900f356b0b359520df3f18ac79379a273a4c53b00b1555123dcfd8204cf9976762664898b0c6c949c0edd4be850ae254d2e84a40fcb8352858eb",
"@rolldown/binding-win32-x64-msvc@npm:1.0.0-rc.15": "f0bd2876247f0834f135c1ae150b7d5626d54ff399b4a6193626dc46a0eca22374a43c64afdf3eff8e8e9cf1f20df826bcd9fd4219df3fece03972b8ae080e20",
"@rollup/rollup-android-arm-eabi@npm:4.60.0": "9a4292f59c64fadb8583a1cb20aa76ad07cb14213abcf705a25f21102f618d2c0c225caaa1730d77da3a472ba1660c987f709f364a60ceaf31199ecb2c7bd82e",
"@rollup/rollup-android-arm64@npm:4.60.0": "59f4cffa6b8245a3570479ac30834d18a63bc18d0eef706eec41800fa3256ccf3d5da1d9b0eecd360b8dff4df6c50adf7935b300e5443c72c2348f37307f828d",
"@rollup/rollup-darwin-arm64@npm:4.60.0": "5bdfee08ea0c0c49dd9877773c8a7361628b4274d7ae03925aa83e38dbda0f985d3bf128ee5bba99e50754034e109b8b3faddd47b776e503374fbebec6e98dd4",
"@rollup/rollup-darwin-x64@npm:4.60.0": "eb7bcb4655e1c31eca74ee96bc8c1de3ab3a511de3e5f433d59c14d4075ab6c32f6770722f5faded1cf8b6b64e3cf9378ac50b0722a928f972abb5e9e8b79096",
"@rollup/rollup-freebsd-arm64@npm:4.60.0": "510dc460350a81125c86db154c152af573e97fc77658924ddc126c98fae1b4e7e96274b1943d0c90f6246fc821aa0f90401f8982e18cdc06b5d0d62b0dd8791e",
"@rollup/rollup-freebsd-x64@npm:4.60.0": "5d8f2e66a1d62ddaec83fccce64a407e63174deb6fb4e492a8719c879f18e77baf2b1068b044f5fe0b67a41a80b72ac418f9aeb4baf5d9d9433c7701202d8a06",
"@rollup/rollup-linux-arm-gnueabihf@npm:4.60.0": "ab1f4fcc86f5d25867f84b00dc546f067f2a53ca631452407c03e70c341b554b03d2f77086533f55be20d36d9382a8ec339901bf789482c73dbe59d768adfdc8",
"@rollup/rollup-linux-arm-musleabihf@npm:4.60.0": "e08b56f8e3d7773e5b685100d22b4b0a8a562ea56524817528d214a6aff2319234da462e228d4842d04f5e1b711ceb77f4b041a4d2b69d446b959c1ce5cc603d",
"@rollup/rollup-linux-arm64-gnu@npm:4.60.0": "1cbf82bc9acca2ae204155d38c890faf88c4b02060b3ff4c96993379e48c08e6541aee3adf4e6a6dba986c0accc554eb21f9c23bbfb0257773e607a5d40eb6d1",
"@rollup/rollup-linux-arm64-musl@npm:4.60.0": "94fbd42c786baf0178adb6309c8d2c9fb5daa97cf2db8cd2cbcd88999c80b9de3089240e804f4287545eda3b509aaa67a41a8711ac5799f74261e11469d64dca",
"@rollup/rollup-linux-loong64-gnu@npm:4.60.0": "e840acd88f492be16732c7b365c680e03109702c7e6a33fdae04992abe333378180e713f9d536585348aac09e50dc11fad23d946df7338d13d95913010232bf9",
"@rollup/rollup-linux-loong64-musl@npm:4.60.0": "9775b8fbd12743f82230f4cb42f69c5fa2a96ca132a87d5a141115f8f879e96d37f8f9ee42fa5d9323a9c0e2ff7e5aba4e7ac99fab5aac044e0d47ed4e6dc2b4",
"@rollup/rollup-linux-ppc64-gnu@npm:4.60.0": "343870a783702e938933f8161c9a55abc5899cf52bc4bf44a97c0fe93ede9622f52488d56c33b67ccc18da1f3b369db984a6930d0a005de87221d8d997a827c7",
"@rollup/rollup-linux-ppc64-musl@npm:4.60.0": "3e8bcd82cc55f01a62e900877a56eb307824dc20edc22b0d51f3b21851f873f2da0dd146eaebf4423a7bf1d8ba377e58abf66194deb280d1fae54fb9de3b9d63",
"@rollup/rollup-linux-riscv64-gnu@npm:4.60.0": "3fdef46fa6ec90106db05d313048d970e86a80ed5ac6463b1f6060e1796a9f1c2287787ef47705032e0df704250046b271c9a52e691df727613421953bcb2bb8",
"@rollup/rollup-linux-riscv64-musl@npm:4.60.0": "50fe34aeb87c03f2c5a356884902242d4ddd3b0eec43b946c89ef1323dbab485a504638d024353f6b3aa7fdb1a4ddc979b8b034be22278ced4b0a9595d6ec7b6",
"@rollup/rollup-linux-s390x-gnu@npm:4.60.0": "af9d7f6f876af243960262868146f4f1ebaea0dbf9adeb14ea85b07c60df0e1d4241ddac1008509ee80ef47cac8b924f85099f7076f8c25e807cf87f048f435f",
"@rollup/rollup-linux-x64-gnu@npm:4.60.0": "3ce88bf8a93ab7f732139b3015249c5b8af5f0ceba8058e05f21c3e51144661be844b9a9ab20503b0f420579d930d37e55575dd544d303a0efcc09d979f537b8",
"@rollup/rollup-linux-x64-musl@npm:4.60.0": "893569365547e7fcea9fa83dc5f7824316ba959ee546606df70633576e6223fc5f33db3da89caf18815f2d671e87fd549886bbe7795facb68de9da941680c335",
"@rollup/rollup-openbsd-x64@npm:4.60.0": "ec522dccd3807237927afd6680ba7096041b477d4ebef6142e6a390fcc975fbd6d43d1a0d6e53cf8e97b6d90e528bb51a8ba1029383bbf086f5380fdf90ec6bd",
"@rollup/rollup-openharmony-arm64@npm:4.60.0": "aacd3b633618c1933f413e0ec2c588e75c3dd7830c34e2bc947915a307f97c570d08d103c5b4f30fd6b60a77dc6c81eb9ab4041205ba19414f55ed644a74f180",
"@rollup/rollup-win32-arm64-msvc@npm:4.60.0": "d8ecd24616112de473344717e07481081c0652f0a0d40dcc645ae2ac05e60fc962e2b0f86dcca7ab40b07625886050214403fd125e53297ba3003c877430f71a",
"@rollup/rollup-win32-ia32-msvc@npm:4.60.0": "0362713f7cfeb0b3deeedc11fabd551ec309cf21952735c2e2b76caf083331aef6701a11d2ad7a3824c439a9ff0d0c305aa12ef62f4f0a540eba2e952a18b00c",
"@rollup/rollup-win32-x64-gnu@npm:4.60.0": "1400b3aace00dc90638bfd39d68275bb5f16143d240b9c36eb70f242ed2080c26fe14192fd3375120308ff94a7da1e169a8e0e56efbe41483f59731602d3be84",
"@rollup/rollup-win32-x64-msvc@npm:4.60.0": "c948b3a8ed6e73f2382dc41ffab3e9928f95c4a0e3481272b26ad04a5f73084ca13fd5c253887f9077c37cb1c91bd8494b4a45a7764c874aa105684e8424289a",
"@rolldown/binding-android-arm64@npm:1.1.4": "d59f76669aaf18426811b5e35321cb5598e69bf57c1fe52c384ec157417c2cce95b34af5c41c085eb1098d92b3129ad3f5211df48efc759361ea8df5011efcbc",
"@rolldown/binding-darwin-arm64@npm:1.1.4": "0a1b74f273e25911b0110d289fe517f6273e39b5a08972231ccb74b76035d6229d51ca3a92eb1b0dc774e7377d373404d1c2736493271f576a266c0080a34206",
"@rolldown/binding-darwin-x64@npm:1.1.4": "736b7ee7d9ca8524466c329361c64929fcde7ca98ab99f279383b4e2e8df5824a1cce08bc5b6b0ff5c6753385bb4438b057c0afb7326b568d020848d950b2924",
"@rolldown/binding-freebsd-x64@npm:1.1.4": "d18f28b53889c03a99822f1666684533074329be5519ed79428d0f180d8748a21a1af00cb1de895a4a2e2c4981219d67ffbf894f37b5d45d287402644e4c6c3a",
"@rolldown/binding-linux-arm-gnueabihf@npm:1.1.4": "0229d25aafebcb76beb377ccfa2e4d55ff632563ad1ff8b061e71f5f98408924cd69c7b826265d957f8f392d77503d0acb7b297944915df44718a57ac83c7efb",
"@rolldown/binding-linux-arm64-gnu@npm:1.1.4": "0941dd2d18304ecb46cb08d8be7dfa22f34ed7a6c63632c6a274ff3035987fea4d672ade92d5a4ee5c31113ef66373978a3c9cab598c0b128ab1b2c9e5cee5e1",
"@rolldown/binding-linux-arm64-musl@npm:1.1.4": "a655f61bb3695a470deee665d3b1b6bf1d08e89b71d96e6362de6675dfa058352cb4ae360a4716aa1887cd97163b61411851780b84a2847ccf4cbdbf1dc36565",
"@rolldown/binding-linux-ppc64-gnu@npm:1.1.4": "7af64514357ba55256c6d2c62e1a2f0fc0a807f303353cd5b2703f64f04d1140f0edaa3eea9a94cfb120cb6e4c71a447c30041ecb86983e9a001455de5a1430d",
"@rolldown/binding-linux-s390x-gnu@npm:1.1.4": "abc61c30e8993fec98a17bba70398150b5b1a2a637e869ef767150906e43622ec2dd7cba4d5ec44f2f3aea193c95b75a9b67438e6cf2cb1f2b7e19569821fd80",
"@rolldown/binding-linux-x64-gnu@npm:1.1.4": "a7f99f45df86abb32d0d95023cae3e9923b47f04bad48e276355b9ceda9c9b9c0f70966557d48006bd0d673e7b4b622dd9af4ae3e605f2e7b717fc63f1c43878",
"@rolldown/binding-linux-x64-musl@npm:1.1.4": "1ac0921cfcd2ce3a5fbc70bb8bbc17e7a138a39413cce6a151a943be870d2c91b5679ad6a85ccadc383100f795f52d6fa47a47652a5c217a8bcb1302defddc91",
"@rolldown/binding-openharmony-arm64@npm:1.1.4": "f61e8562d59b91f4c238cfc815d5b43fa170f6a2795f0de6fd18425e155c8a75486f5a1ca53785bc81b4b9fc3b1967d7803b5be89fe50957e823746f6a35484e",
"@rolldown/binding-wasm32-wasi@npm:1.1.4": "e248421de5a5d30667deb15274101b73562e0ccb25de708eb7c1e463d825dfbf42e0a498f70093d8c22bf640d21f660c5d9e158001ecbb0e02c8c2be8db4009a",
"@rolldown/binding-win32-arm64-msvc@npm:1.1.4": "d2893af2319711c04eaab03e248d0f96b320942b7f843267b7d62d829eddd5c47808f0b2534fcce4c79db53da4d4cb57a7912f6ddc2e39ca72f09263d397d87a",
"@rolldown/binding-win32-x64-msvc@npm:1.1.4": "1566f653b56c576927cbe33d6c8aafccc82046ab04bfc6ac1907c58b48d902033610a6db23bfaa3376b2bdcbda1ef1c5c9437367b8bd3df4e247c9469e8beb1f",
"@sentry/cli-darwin@npm:2.58.5": "8bb8a01ab9ba6862304d2efbb40a397cc52859665be38c238b75a3c82c0e6b795513a8e018c591da6b992e9531e8e485ba0ca46c60f2beca7690b0693ac5a771",
"@sentry/cli-linux-arm64@npm:2.58.5": "1755aea6fe1808306fcc51e2d88f1c161118ea9f40d47f97570d121300da083fe405fb64b8fbbe753930c8ebaadb30da24c951e5e38ae5ed39bc97e02d712d73",
"@sentry/cli-linux-arm@npm:2.58.5": "4fa8047b1bfa13969093ab25a643ae8b3e1f65fa3e1c6b2287efb1c6ca086b44e39ed8e7a5dfdac0d71efd7d985eaa12fa9034dfaa0b65e904d0ee082fca0e31",
@@ -107,18 +132,38 @@
"@socketsecurity/socket-patch-win32-arm64@npm:2.0.0": "65418168f7f68cd2373000893d96251ea7ee8216a9730f0d51efe24402d67a5126f5255d6eb2d5ccfc4726e685a3ca17fcf7ed0b0d5feab631136902d5f959cc",
"@socketsecurity/socket-patch-win32-ia32@npm:2.0.0": "b48b42604530d283c2e1230c5d7604fc5c87f97d0d50ca305a89ddc16c24eec6d833cba39a94fe4e6cc3bb85d3a5e1f47fe1013f1bcc0c0906563b823fc8405f",
"@socketsecurity/socket-patch-win32-x64@npm:2.0.0": "8057bbfb19b4601bb1eb4af272fbab315af92c9b870731cdf8cfa7520bfe7b0e4b96c9ad6b1c1959490f97054bc64cc7e3c7dade054a46801b61ddb69e369253",
"@tailwindcss/oxide-android-arm64@npm:4.2.2": "11f6e9bd3c1eb998725a89210a74ec2253e7387e451fad4c9ac171d9299cfd4ca1ce24e687856ff7887a2fd60cfabb267f8bf77e392e3069b2ccb1d22007aac3",
"@tailwindcss/oxide-darwin-arm64@npm:4.2.2": "ddd2d7844ef9be81dfe043b393a4eb7d971d72c53eef241456c132f7c38d5acaf569311dd565d23a345484f0dcc16a3967eb3ed74ad08e672310919f1a0d8502",
"@tailwindcss/oxide-darwin-x64@npm:4.2.2": "29b54e88665e7cb6b08ec143336d56e7bc100f6c621a414ae1c96c5a913de43859d8b5fd197dc9b257c95530dc949d259d841f1b657cc7a037e74b61aee85de9",
"@tailwindcss/oxide-freebsd-x64@npm:4.2.2": "7e89193701c6239dd007eab2e48e4fca0b88337b50bdabd341bbab3660fdc5a151131ae28a24c5a9bb59ee491fd8acc4583018b93dd545e4889da28dc6a445f3",
"@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.2.2": "6bc2f863e02da37c9ce2807ee2fe1f1d00f391d5608fd9092630faefc0902f3982917d9dfb6df38e6e2ae4e3e83d5587db02a178c78a4b896085f3dfe72fa931",
"@tailwindcss/oxide-linux-arm64-gnu@npm:4.2.2": "a8962da367468c8b28b4d0afec55e55dcff3c4c0f885b60ed4ad825b6f3b40c7c7350a646f72cfe502f247d5b3c4c0c1f03b56d96b3867c034e839379e91a78f",
"@tailwindcss/oxide-linux-arm64-musl@npm:4.2.2": "cbab9ca951ccf818c9ccdfa6a9450a18a022fe67ae86c75c30ad325fb2a3e0821362954dc76d188746d3d54cee93b0b1b286bdc3540d6e79a3d504aad8f135ce",
"@tailwindcss/oxide-linux-x64-gnu@npm:4.2.2": "0b6e47b461b9e1168033edb2c72b6405c24e944c5caf867858bd1e5dcdc68dcb5175edc8bbbffc472d00444dc1dfd45d510073fb619cad2887ebb996e485bcbd",
"@tailwindcss/oxide-linux-x64-musl@npm:4.2.2": "c1e258d6d954b0c3fa3c8214478c2b46e5581f60aa1049c11f60a1836668157b023325c691b8ddfabe39b36d8df9ff32e9237d06dc1e8e0beff103324730537d",
"@tailwindcss/oxide-wasm32-wasi@npm:4.2.2": "83ae560e1503cefc9854d5d54b9222d81287a8bd7fc29015f42d032c262cf0ba5ac88f6707219092bb0ec7d8f569a3440e585a9dc084aa07ef7dcfb4dba3defd",
"@tailwindcss/oxide-win32-arm64-msvc@npm:4.2.2": "674ba83bdf03338878cb7839d4a081934404f9fe8771df3c55f6c2f0c09cdf4ab871ec2e821f23eda245c7b0a9b9fdbe32c0d038f887e4958d97c37f9cfe5b3d",
"@tailwindcss/oxide-win32-x64-msvc@npm:4.2.2": "8fd2254df241f2d17417c8a3ecf9ddc51dc23f415a7cd1e7661930296de1a9f4128ae9f3912050f8e9dde4ea0f0f2b2452031b913451aecf12d453f131703c79",
"@tailwindcss/oxide-android-arm64@npm:4.3.2": "d71f84cf523d0b7e617640b2ef6930f8c78321076cca1d0266a531a12f0d1165a0f4b434a1527b3b43640dc19b2ed86c9db8b20de3e2adeb55a63dfbcfa096a8",
"@tailwindcss/oxide-darwin-arm64@npm:4.3.2": "57ee616c3c64a55da3e7a756e7ca82af89a3948646cf4b5117884ab60d922193cb003dc74837b11671f2c888ae28e6c3be69bba898fe7eecdb92cc5e8b6457a7",
"@tailwindcss/oxide-darwin-x64@npm:4.3.2": "30e477d48d3ee6c195583108f70ae861d47eebb35139dce00e57bcde5d58d387918b1ee4b1b1dd320f915a22965faa8caace579cde10707070ca25fdb754a9c3",
"@tailwindcss/oxide-freebsd-x64@npm:4.3.2": "c47f0a698c2e6f13780916468b70de9d13662851ddf085c3a4bc1b481335b4b01028e2446a0f88fe1846c9b325b7cf3c28844b4b5e6c399b768a3481e943637c",
"@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.3.2": "79270082658f16b905cb1861070c87f02a2cf11f24f34b5a543d7da5197c7a7f117847a68f11cc8f39abe1d40a93cd7da9f605f828b2f45eb9fa75e294bbb91c",
"@tailwindcss/oxide-linux-arm64-gnu@npm:4.3.2": "a2a9a54d3a9204585e7af11b17b0f3748d4924364606276938a13a423ae27341dfea6317c35fbaadc436a493a60675851b45ce61c30021d7a4c2cd3c3c839e86",
"@tailwindcss/oxide-linux-arm64-musl@npm:4.3.2": "5abfb9e78a6946f90c1ca2e57b0ac1be87cd5f0dbabb34d9de2e2d652cbfce35d264cc9fd98d0560800f7e000495ab25c45c630916fd621aee7dd20fd3771de8",
"@tailwindcss/oxide-linux-x64-gnu@npm:4.3.2": "5cdd5aaa678665b024d16d557e344d564810e78525be3bde0b86b6b924bcff1e81e2b7e0da88c7f0868c26669955129960c215044a2fd47cb63d2002c6c7e96d",
"@tailwindcss/oxide-linux-x64-musl@npm:4.3.2": "61d39503d79726cae3c497432bf18840c170f198d7ee65b40108e546a24cd661d6f6587adf023254410f11bd6d143a88d09399342f43f4cbcfc017b0aa853d66",
"@tailwindcss/oxide-wasm32-wasi@npm:4.3.2": "6afddcfaf232ac6290ea3368ee3c878bddf8b3c842f3cb71583ef387009de12988067545e9dd4de423f3bca3f93498c4fa46ad105bd9c63582946fbef98e8628",
"@tailwindcss/oxide-win32-arm64-msvc@npm:4.3.2": "68130dff13d07c88b5a59ca1b27acfde384d2c246db910c5a4f98e3fe5ab27ce538e4aca31aa70a68bd5e5a59b50a1875fe9908aeba7b394289c377089753053",
"@tailwindcss/oxide-win32-x64-msvc@npm:4.3.2": "0240e7ab3cb5418d5f655a1b356eb21819c56be193a469b8670a3a89b1f9e66c8cda3120849cffd57c8167ad0098d0e0cfc69ff24577111d5689711f7a13879b",
"@typescript/typescript-aix-ppc64@npm:7.0.2": "6135266f6e9c5928a8efd220b2ec972ecd6fa8c771dea432d2b8ffcec606aedd57b949db98ccb2a216e3fb87d4c6d42fd449258e0ee4cbda3d5994c69c5e84d2",
"@typescript/typescript-darwin-arm64@npm:7.0.2": "c859259821baf9d7a8c1811bc1d0c0cb67b0d7fa9f99f1a3b50aa0e656a2df35c6142f77a9d2b1cd200874fd33bc3bf7ffb5cb5491d57be8e0522319ee3453f8",
"@typescript/typescript-darwin-x64@npm:7.0.2": "4c689effd4a83b881b993903901f58d13aded3c61b2a9b6a0f8f591eeab595dbfab82930b1b2af3b1595829ead0e86c9278ea7b7f8fad47c8c76dd6b0e7fec4c",
"@typescript/typescript-freebsd-arm64@npm:7.0.2": "3339e5cbf127f689cdd977133f903e9549afbf1c85fd12d2b61944bc8cb9cca2c18f45070066476273cb8af992591e340e9b661cbbe62c5bd4882615c2a62892",
"@typescript/typescript-freebsd-x64@npm:7.0.2": "52b1180545def7206ac4a944b3a4bf38809b22b3816e9b0f553e87a4ecbf8e61a6039bb6bcc3a353ad0c16f90195e7ff86f25874ada409dcbbf4c4a587e40c2d",
"@typescript/typescript-linux-arm64@npm:7.0.2": "b3873b9c64ff950230eb1d087eb2f46f7102cbf0f483b5280cb76221626833a1065e4e4dfdd99777151d03c0abde157fde73b605829343a022f3fcc6862490dc",
"@typescript/typescript-linux-arm@npm:7.0.2": "ff6a5f61931a97dd4555c2055001c4720cd0c44e3f102ecb79998799cdf156f39884c87f096036c7a57a09a132b4b545b3830c0ca952292661170a7c10c7ae73",
"@typescript/typescript-linux-loong64@npm:7.0.2": "7cdf90b48bf0792e6cd6f9c151bbfd1963980e50f20e73f75c27fa210ba8de65c8b69092b1dd4c6db5d86396cbe8fb5473ca2986ad45be0afc42e7dc863e5ac6",
"@typescript/typescript-linux-mips64el@npm:7.0.2": "6c669e865878a186249631ac720126ea9a71637170cf14cf6d0aef3dfa0f496cdf8fc1a71db1ed24064b1aa612e9b902c64e53689995a0671e6b6146cc68d156",
"@typescript/typescript-linux-ppc64@npm:7.0.2": "702ac3a57ed2e9932185b2b6a3aaeb12d50152d78b453ced55f936d442d9fd7669a5c8a81c76b44ec60201f96533aa38ad2ca80f70ea8b3e6dcbc5cc4a200208",
"@typescript/typescript-linux-riscv64@npm:7.0.2": "ea92265112cf9320f09fcaef847c8612421cc0a907b50bbc8aa928de1a6306cdf7f4d0c1426c3e475923c99f490dc4469042b2edab3c2eff3afef8c14456650d",
"@typescript/typescript-linux-s390x@npm:7.0.2": "dc6b678125ee4c1b81a91c64076490ec985b84e9dde9c017fbc50ec34808aefe45bf90e04c57bf9d0146ea453d71cd1543ac7c47f7a7ef77635758317d0b2173",
"@typescript/typescript-linux-x64@npm:7.0.2": "93d1142b9099dce38f9f2b25a7c4800289c72699e93e695aba5a6923f3661720b336cdd437f4cb3d49324226b7288c606f24f32a85c8e4be5f97c523f5b27b0a",
"@typescript/typescript-netbsd-arm64@npm:7.0.2": "b3274f1c526a20f4436b0f1167dc0e60dac5606f31491429c61439519a3f6a68fcee3a3f7f26f2fafb6557d918af75795b37d2fb6ede7b857bab772eb529140d",
"@typescript/typescript-netbsd-x64@npm:7.0.2": "d3c15af4176791e21927d35afe4935c8a98d21509db7ecb4dd7769a02c2f983500ef6d0f1646ad614a59a748269d517604af98cbd7c3c0450bb57a12cccd7270",
"@typescript/typescript-openbsd-arm64@npm:7.0.2": "09feda2dcbe2e3f9d31f2e98b09477158da1bb9509fe42dda2ce0b12a33b43bd31bb0caee24c6bde4c735c9d33662bcf65593ee762a2a5fee225798b5d674692",
"@typescript/typescript-openbsd-x64@npm:7.0.2": "e29ffc0538c2843b1e731b90626b5d2855345627fbb6b2ad7ee40b8f88ed1df6f91b03cf5c227645c4fc35a18fb6ff1612de98a9b449da25042f66478e671875",
"@typescript/typescript-sunos-x64@npm:7.0.2": "1647e487c452504c646c01e9e4a504e41c180bc09c9af7ccd2a6db23b6fedad436861de2681674793baccbbfc8970dccc85fce59a4da3d802dd67966774fc188",
"@typescript/typescript-win32-arm64@npm:7.0.2": "26cf8934a58378a2e8467914407f2d06028ca0e211bd68403994f9b27353439d8b0935ebeb7b9a03d8768a64e444285f87756a77ce72211efeecf5239af52bc5",
"@typescript/typescript-win32-x64@npm:7.0.2": "7f8408c4b3a58a2ef8851103c0575b97654e34c5aa0658e32be5584030f395f8a8e8a7fa87eb3afe2c794a01a0eb2e77db743c6025af57ed2915605b8e0a7c82",
"dmg-license@npm:1.0.11": "feef35cfb45270a72daadcca9584be5cb840f924448b9d4e543fcd61f1b6d471151049f277c91de1d8b003fad6203d0176066a5f427a01df5fb073402cb8c8b7",
"iconv-corefoundation@npm:1.1.7": "bc6f08ac421e5e92ed20f3825f123fd705e036612b2b6aa687958de753c06f32e54f0203ef55540869e3ee189eaea15e43a2757f3a90e555c4dd512c9422da43",
"lightningcss-android-arm64@npm:1.32.0": "1cb326ad39dcb02cf9f45025c167b6900e3a04b08f5149d3c5ee26054b00d08db3736fb69183a6c3ed1cb32dddd148608c784b6631b4777623f7dd0c032c392d",
@@ -132,22 +177,22 @@
"lightningcss-linux-x64-musl@npm:1.32.0": "a6f48ccc30a73d30563c7b61856d1fd6a8812ce62b1bee797f227e06612df70aab4ccd1908552952f77ca7ff2a51019f62d14ae5310ca67311635eeec55d3a9e",
"lightningcss-win32-arm64-msvc@npm:1.32.0": "a919be7fb298c1102bccf18b6f83d54946adfac70ab2ac9c95e4ae38ded76d8f530215b0bcda4d38df4ffc40a70abe3afd91d01d35fd122e7d119ed0e46972d0",
"lightningcss-win32-x64-msvc@npm:1.32.0": "5b8d3431aadbdc40a0a7eae32f2415e4f28b547af1a1cd5b35a35d67f772a89492c7fa03e9fc88ce804b14f5f88e412e49fff40d1b0aad67177de815c434207e",
"sass-embedded-all-unknown@npm:1.98.0": "36a9126decd90bb1e7cdb6e5a6ec9913ca644e1ba16748b179daf0b78c87bab1905647b3e4221dcd6dfb8bed9211830ed853d4fab257057f1678a557b4982ec7",
"sass-embedded-android-arm64@npm:1.98.0": "83bcb98adb64adcf01d1bfd0d5726cd28942e3a276b1cf2b8ed426fcb6de4345539b9cde44b6cc3593fd7643f6ac4138ccc5107bccc195438fefe63140f0cecf",
"sass-embedded-android-arm@npm:1.98.0": "7083ddf06fb3685351cef3d95c78044d25b6798f6c9db2898d75ac6f61a140344d591888f8760445e952dfdb6610934b97edab3c323431edc49655ef47d3d3a8",
"sass-embedded-android-riscv64@npm:1.98.0": "dedb467cf1b72c100409268889131ac85f08b517c76ba1fff2a05d829c1f38e14acde11a3081b4ae7063c8a7ee0fda5cdd880cde0d43c3f5bb616419209eb85e",
"sass-embedded-android-x64@npm:1.98.0": "9030281251fa16600de1c90ab8a8995d022fbbb2c7d7a6447ee262f3b3fcd4cbe772c1c9067b7296b8dd6a3311ef5655246ca9c03051b838b978cced82515896",
"sass-embedded-darwin-arm64@npm:1.98.0": "0955f52140dbcd6cc2a35592cbe147e271f988a8d9e2807e28e3c4ba49e950e8d9fbbca00e2187c36530d28de2916e9e79f3ad9ec5c0f214449e3f3d10b15a1b",
"sass-embedded-darwin-x64@npm:1.98.0": "aba47e0c1b61a64f9e0a3899bb84725dfb2b45fb4b3a38e7c2e5d767d0b0ca429ce49dba98699298a2491f4ef2e2e40f2dd32905bf268ec4ef7acaa1ca3730da",
"sass-embedded-linux-arm64@npm:1.98.0": "766a5f93c80ba64f3f1733dbf01ee71e0f0a5a56bf75227f0455bd5151ec0348b85501fb4ee09da6393655638b4c34cfcff420ea96645fb25ba7e6afe5a1a1f9",
"sass-embedded-linux-arm@npm:1.98.0": "109131a0d1173f6b34c987192607d148721f980396f8288df29bd407dbc160142e088320ac95a63fdfda464a07953e6092f00a5d3f1e56540cf2553ad21e2b68",
"sass-embedded-linux-musl-arm64@npm:1.98.0": "bcddf4d567b1e335bb5bdad25469d773d3a965cf9c9972e8c43cf943016d010a79ea441df0c1f47a7c67e7330f4f88fc2d13d07d4fe720138f44e8837f660468",
"sass-embedded-linux-musl-arm@npm:1.98.0": "e1572282ac95d9b20afe7053c9415b21490aebb49d276838d256189387df3cc5804f6ba21794ad43dce0531e925f89722a5bea139f327bd51ff4bcf754a84589",
"sass-embedded-linux-musl-riscv64@npm:1.98.0": "6f0f51d3daac10c8a6ca79f0627304f191ab0db1e9dc120084c23231cc7c60929b51e75d64b6afb77abf5054cea89c2d0b129e40ed552489bfb1662a152017e9",
"sass-embedded-linux-musl-x64@npm:1.98.0": "51e55184d36b60a8777dd89f84354fbc4e0e5c09d8b0a2bd842138bb6a766c7e42bf7817cab5784416541a8e31c5a872121b24ec8d945768ced9e0074e648c1f",
"sass-embedded-linux-riscv64@npm:1.98.0": "6dc8669e8e23f8079a1d29073b8c3947314b4dae7c88db86b7dc6642a86e3aebf1a4f7cf38903423552aa9388fa4aef5c137f332aba5fa37b8447ca11640dcd4",
"sass-embedded-linux-x64@npm:1.98.0": "67dc506dd51e139173539008c07e2a7a397a3d47c7192039a3bc1c9af578a8c19c91fa03768851af653002b850098340e401de7af9041fafc7bb49162848e63b",
"sass-embedded-unknown-all@npm:1.98.0": "c6bc5bc3828d9091e7b669379f7248771ff0b5bae78c5f52d4cc193a387ef0ff30b7a7f17ccb576fcf18502134727a2433ebc5470f67f0b6f5cababdda52a9e4",
"sass-embedded-win32-arm64@npm:1.98.0": "b799485e7afb87d08901bbbb419217ae94e57c60a38ab1ffa74c0f521b1e5f77cb30769807a8403dc0ee27003fbaec402cec2add8ce8bc8d625f48c7afbd5a0d",
"sass-embedded-win32-x64@npm:1.98.0": "c8cb13fafca66b403e829c166ddb57fbecbe7433f515b90841ad49deeb6641b5f8db2238fcfb11a03df094f16ff7e63c0454f4ecdba314a7d7cf7408abfd3658"
"sass-embedded-all-unknown@npm:1.100.0": "ed802ec849fb09307294e942382bd19d72c79f53dd348db51fd431f18354876f50e47bef586a27fa1546fe68c1df638e05d9eace5925074b3e117419f1bd486f",
"sass-embedded-android-arm64@npm:1.100.0": "0a219201304c6e3b37e7099092730e978e1e77bb5ab1b0ecb84d72bb4f78b4703552d7f2937ba29250fa67032a23b0417e47ddbe497ce3abd8386d492fbcbdfb",
"sass-embedded-android-arm@npm:1.100.0": "460f04093b37d7bb0a2b6b689622e084795a0c0b820327ce57b7905e6495de777d669b6ac663bf728fb9f62c99e1ad3a6dfe7cc15aca5005037a217130aeac95",
"sass-embedded-android-riscv64@npm:1.100.0": "5b84b0b8a00197571f7d82977af81c0d88053cda91cc1c283f80821a4d8e45532fc8bc974b2c53a3ff869f49f60b2c8f412c90694fb9fa1e5f7396fb3ca7dc8a",
"sass-embedded-android-x64@npm:1.100.0": "d225b29000a7ff1e0aa2a64e5d60ee63679630eaf717311b20e972326ac31711928c2deb2f78d6a5ad2d3b9ef0bfa918d40940dea01e75232db7146624e66323",
"sass-embedded-darwin-arm64@npm:1.100.0": "ae3b9b1ef84b5cc53f2c364295070b8ef8fe7c8cbde6ea278d34d3fa0e1636168f13abe074155549587300c1c91d90d07b2fba25f1f765f62aa26729a0f2d37c",
"sass-embedded-darwin-x64@npm:1.100.0": "85b6aecb66dfe00a3600eac244b1611c04e608f42fc64720519d0996a5a59692b619176ea726647aa031b496c6a147b3f1b2dc8aef43c61c9cecec63bfe1d138",
"sass-embedded-linux-arm64@npm:1.100.0": "9ea709b02c24242bcbae8cc299913b1b28ea85c95c3a4a14b645b59f7cebe283c199b2e823edf8cb76255216c160c5642b0ff02d63cd9649ed2fc67aec900adf",
"sass-embedded-linux-arm@npm:1.100.0": "1f673e52323446f60d069182dc3488e957df3b7e4b17a6973c39bd1922d073521e665371a64d76f527287a0b1c3e47825b4252c51de0817d02c069c4b3839252",
"sass-embedded-linux-musl-arm64@npm:1.100.0": "f87777a45b855531b990c2969b2a7c8dae02b5a3e80e712e093b61632384db5c176cb776507f886791cc378b504e936da30e4bf97d105454ee7d520f662c25d9",
"sass-embedded-linux-musl-arm@npm:1.100.0": "66887ed9ce2f552942a463f2276c4d93dc2ef6ad55797507e667580f8b1911c5b471a941c3a1a999516fd4802cc833a4f39a738d2e65bb2a2d76172bc56f280b",
"sass-embedded-linux-musl-riscv64@npm:1.100.0": "ceb308bd10e2176e6885303e8f64a414eec5d6db4badf1517069c744fedc4fd05f0d34abae2f71dfa9db4b73b2269e7f1d793a600ff4610f165abda35b06c4a2",
"sass-embedded-linux-musl-x64@npm:1.100.0": "64b02ea419edea470f485b87631f065b891adca5cb555b3089c6922200dc2cd6982ff51dcdf2bd44cb7aa3b6e81590346f672f1f64481609734176536cce6e47",
"sass-embedded-linux-riscv64@npm:1.100.0": "9f443b08cf057d1577b5178608b2fa34963a614e9fe06b132d77065650536f1013dc567f8754e3d059f036e39a4f58013c512cb94bd7497ca839f5d5febce25d",
"sass-embedded-linux-x64@npm:1.100.0": "85307c181232f792bf6b7ed3c4849d043802d4b0a2988cf589efcbf83e4c49099f0a599084d08dea160723ff21a931c5f4cb4eded7d300765c77dd13efd7f1ea",
"sass-embedded-unknown-all@npm:1.100.0": "576eea8f7e866bc5aee12995e219f65c2ddc9da3c848950740c2568e1dd4433a782be6a8b6a87e1c9fb27a03e6e06982efa3da04df8a2dec8cdb685f72f56a63",
"sass-embedded-win32-arm64@npm:1.100.0": "bfd7231a5965a4f9c31cf9778c664a6917ead537742beeacb7042c4e7f40301cc305c409620643bfa255a31efec69bad637ae359e8573376891b41ba9f4eb450",
"sass-embedded-win32-x64@npm:1.100.0": "d78da6f82e616e5ecfc8221648029343320ac2cff8357152ecb582ab5ac5dbd20a838cce78d29a8c9986310e2a097c263dbab93c105affc5c009c71fdb1de5fc"
}

View File

@@ -3,7 +3,7 @@
lib,
fetchFromGitHub,
fetchurl,
nodejs,
nodejs_26,
git,
python3,
udev,
@@ -20,8 +20,8 @@ let
builtinSurfaces = {
elgato-stream-deck = fetchurl {
url = "https://s4.bitfocus.io/developer-module-builds/surface/elgato-stream-deck/v1.4.3-70e2c01d15a0f58c52a8e80d7d6f4977f157d58e/elgato-stream-deck-v1.4.3.tgz";
hash = "sha256-bZnXvkyfllzHZTAJtH/hSYIv+J5ZOYWZycUHdz9srGI=";
url = "https://s4.bitfocus.io/developer-module-builds/surface/elgato-stream-deck/v1.4.6-c7ea9961c73fc6bf184b563d03c64b5607312d8d/elgato-stream-deck-v1.4.6.tgz";
hash = "sha256-0zYgn2ao2yhy3CSlHbdqfV9YWWwUiQ5kibDjT4uqOn8=";
};
xkeys = fetchurl {
url = "https://s4.bitfocus.io/developer-module-builds/surface/xkeys/v1.0.2-876f00ee194faa57ec14468b7019bbaa516a9e6d/xkeys-v1.0.2.tgz";
@@ -41,7 +41,7 @@ in
stdenv.mkDerivation rec {
pname = "bitfocus-companion";
version = "4.3.4";
version = "5.0.5";
__structuredAttrs = true;
strictDeps = true;
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
owner = "bitfocus";
repo = "companion";
tag = "v${version}";
hash = "sha256-ojSXiWaRKFCjHmAMs/RtzNhgSNUy7RKTZ4CE/wCxEaI=";
hash = "sha256-Q5XQ/r4YYYqLk6YaSlBZqcqEH8nFmpqyzMf7/fMWX74=";
};
passthru.updateScript = nix-update-script { };
@@ -59,15 +59,10 @@ stdenv.mkDerivation rec {
# patch out git calls to generate version strings.
substituteInPlace tools/lib.mts --replace-fail "return await fcn()" "return \"v${version}\" as unknown as T"
# remove unsupported yarn config options (npmMinimalAgeGate, npmPreapprovedPackages removed in newer yarn)
# approvedGitRepositories and compressionLevel required by yarn >= 4.14 for lockfile version < 9
printf "nodeLinker: node-modules\nenableScripts: false\ncompressionLevel: 0\napprovedGitRepositories:\n - '**'\n" > .yarnrc.yml
# remove yarn config options which require network access at install time
printf "nodeLinker: node-modules\nenableScripts: false\n" > .yarnrc.yml
# remove the yarn install during the build, since there is no internet connection, and everything has already been installed by yarnBerryConfigHook
substituteInPlace tools/build/dist.mts \
--replace-fail 'await $`yarn --cwd node_modules/better-sqlite3 prebuild-install --arch=''${platformInfo.nodeArch} --platform=''${platformInfo.nodePlatform}`' "" \
--replace-fail 'await $`yarn --cwd node_modules/better-sqlite3 prebuild-install`' ""
substituteInPlace tools/build/package.mts --replace-fail "await $\`yarn install --no-immutable\`" ""
# remove node download, since we'll use the nix version
@@ -76,11 +71,16 @@ stdenv.mkDerivation rec {
--replace-fail "await fs.createSymlink(latestRuntimeDir, path.join(runtimesDir, 'main'), 'dir')" ""
substituteInPlace companion/lib/Instance/NodePath.ts \
--replace-fail "if (!(await fs.pathExists(nodePath))) return null" "return '${lib.getExe nodejs}'" \
--replace-fail "if (!(await fs.pathExists(nodePath))) return null" "return '${lib.getExe nodejs_26}'"
# allow all surface modules (builtin and user-downloaded) to find libudev, by adding
# LD_LIBRARY_PATH to the env whitelist companion uses when spawning module child processes
substituteInPlace companion/lib/Instance/Environment.ts \
--replace-fail "'DISABLE_IPV6'," "'DISABLE_IPV6', 'LD_LIBRARY_PATH',"
'';
nativeBuildInputs = [
nodejs
nodejs_26
yarn-berry.yarnBerryConfigHook
git
python3
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libusb1
dart-sass
nodejs
nodejs_26
electron
udev
];
@@ -100,15 +100,13 @@ stdenv.mkDerivation rec {
offlineCache = yarn-berry.fetchYarnBerryDeps {
inherit src missingHashes;
hash = "sha256-XDXxv+LSr9fYhVhwkcvmd56fAL6gY9FK6kiQlXxTWXo=";
hash = "sha256-Fuh/D3FVtm08h7pW+LHgrEiyN9vmCjy+WekfpIz/Xc4=";
};
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
SKIP_LAUNCH_CHECK = true;
ELECTRON = 0;
# prevent yarn >= 4.14 from triggering a lockfile refresh for v8 lockfiles
YARN_LOCKFILE_VERSION_OVERRIDE = 8;
};
# with dontConfigure it doesn't seem to retrieve node_modules, so empty configurePhase instead
@@ -142,20 +140,13 @@ stdenv.mkDerivation rec {
rm -rf dist/node-runtimes
'';
postInstall = ''
# patch the env whitelist companion uses when spawning module child processes to include
# LD_LIBRARY_PATH, so all surface modules (builtin and user-downloaded) can find libudev
substituteInPlace $out/share/bitfocus-companion/dist/main.js \
--replace-fail '"DISABLE_IPV6"],t={}' '"DISABLE_IPV6","LD_LIBRARY_PATH"],t={}'
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share/bitfocus-companion
cp -r * $out/share/bitfocus-companion/
makeWrapper ${lib.getExe nodejs} $out/bin/bitfocus-companion \
makeWrapper ${lib.getExe nodejs_26} $out/bin/bitfocus-companion \
--add-flags $out/share/bitfocus-companion/dist/main.js \
--set LD_LIBRARY_PATH "${
lib.makeLibraryPath [

View File

@@ -27,13 +27,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "pds";
version = "0.4.5034";
version = "0.4.5027";
src = fetchFromGitHub {
owner = "bluesky-social";
repo = "pds";
tag = "v${finalAttrs.version}";
hash = "sha256-fsbnD9y0wxXq3NmVe5vMhI613G4HlZyqsv7+DNKzZzY=";
hash = "sha256-XHHVeowq0SYLyhascy0380swKBvfX5vJDvwR2BJGnnY=";
};
sourceRoot = "${finalAttrs.src.name}/service";
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
;
inherit pnpm;
fetcherVersion = 4;
hash = "sha256-nnhtJNw/D6Tir3n6rrURjL/cw1EWocs4/r4K7Yq4Fdk=";
hash = "sha256-T0yqfY6b+Kfti5cIWH++QFh3cII9znBcf6kkZCwLSZg=";
};
buildPhase = ''

View File

@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "bdwgc";
repo = "bdwgc";
rev = "v${finalAttrs.version}";
tag = "v${finalAttrs.version}";
hash = "sha256-5yeAB5Y92YjOutwRXBJkMxoOLkmzmqIJs4PirKX89fE=";
};
@@ -43,6 +43,8 @@ stdenv.mkDerivation (finalAttrs: {
autoreconfHook
];
strictDeps = true;
configureFlags = [
"--enable-cplusplus"
"--with-libatomic-ops=none"

View File

@@ -12,13 +12,13 @@
buildGoModule (finalAttrs: {
pname = "bootdev-cli";
version = "1.32.3";
version = "1.32.2";
src = fetchFromGitHub {
owner = "bootdotdev";
repo = "bootdev";
tag = "v${finalAttrs.version}";
hash = "sha256-6IwqKV/PWy+QMfHcDmhHvKUo9so5EECXgCrA4hg4oSs=";
hash = "sha256-GD/VD4NCCC4ptf37T/JfKB7m8GabhtC8NCLeeX+DfkY=";
};
vendorHash = "sha256-ZDioEU5uPCkd+kC83cLlpgzyOsnpj2S7N+lQgsQb8uY=";

View File

@@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "bpftrace";
version = "0.27.0";
version = "0.26.1";
src = fetchFromGitHub {
owner = "bpftrace";
repo = "bpftrace";
rev = "v${version}";
hash = "sha256-wYDSx2WngWS4Ucj82hLO0G46tiXhqskhMjmv7NuUVfw=";
hash = "sha256-h3gFnQq48oM5uK07xrykOCSJxhr6dqcyVUDoIKIRREY=";
};
buildInputs = with llvmPackages; [

View File

@@ -18,13 +18,13 @@
buildGoModule (finalAttrs: {
pname = "buildah";
version = "1.45.1";
version = "1.45.0";
src = fetchFromGitHub {
owner = "podman-container-tools";
repo = "buildah";
tag = "v${finalAttrs.version}";
hash = "sha256-WQiTHyRparVxYavnh7j/BHQGgg7ApClABMzmp6KzGO4=";
hash = "sha256-s+94gep69JEJCeS+HuPt2VuK64QzH/Gc1v8sFeyaIjw=";
};
outputs = [

View File

@@ -11,7 +11,7 @@
nix-update-script,
boost,
glibmm,
glibmm_2_4,
gmpxx,
gtkmm3,
jsoncpp,
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
boost
glibmm
glibmm_2_4
gmpxx
jsoncpp
onetbb

View File

@@ -1,15 +0,0 @@
diff --git a/tests/SelfTest/UsageTests/Misc.tests.cpp b/tests/SelfTest/UsageTests/Misc.tests.cpp
index 3697f0695c..8c10aace7b 100644
--- a/tests/SelfTest/UsageTests/Misc.tests.cpp
+++ b/tests/SelfTest/UsageTests/Misc.tests.cpp
@@ -384,10 +384,6 @@
REQUIRE(x.size() > 0);
}
-TEMPLATE_PRODUCT_TEST_CASE("Product with differing arities", "[template][product]", std::tuple, (int, (int, double), (int, double, float))) {
- REQUIRE(std::tuple_size<TestType>::value >= 1);
-}
-
using MyTypes = std::tuple<int, char, float>;
TEMPLATE_LIST_TEST_CASE("Template test case with test types specified inside std::tuple", "[template][list]", MyTypes)
{

View File

@@ -7,23 +7,17 @@
spdlog,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "catch2";
version = "3.15.3";
version = "3.16.0";
src = fetchFromGitHub {
owner = "catchorg";
repo = "Catch2";
tag = "v${version}";
hash = "sha256-ZuH3tUWNklq0bKp0Yu9w3L5FNsQwUxe6lyGBv4M6U1E=";
tag = "v${finalAttrs.version}";
hash = "sha256-vvPZTQzLNGIcdDbuo0w6sQvxzLdKFCl2LNwcHu0d5I8=";
};
patches = lib.optionals stdenv.cc.isClang [
# This test fails to compile with Clang 20
# See: https://github.com/catchorg/Catch2/issues/2991
./clang-20-disable-broken-test.patch
];
postPatch = ''
substituteInPlace CMake/*.pc.in \
--replace-fail "\''${prefix}/" ""
@@ -37,10 +31,10 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DCATCH_DEVELOPMENT_BUILD=ON"
"-DCATCH_BUILD_TESTING=${if doCheck then "ON" else "OFF"}"
"-DCATCH_BUILD_TESTING=${if finalAttrs.doCheck then "ON" else "OFF"}"
"-DCATCH_ENABLE_WERROR=OFF"
]
++ lib.optionals (stdenv.cc.isClang && doCheck) [
++ lib.optionals (stdenv.cc.isClang && finalAttrs.doCheck) [
# test has a faulty path normalization technique that won't work in
# our darwin/LLVM build environment https://github.com/catchorg/Catch2/issues/1691
"-DCMAKE_CTEST_ARGUMENTS=-E;ApprovalTests"
@@ -69,9 +63,9 @@ stdenv.mkDerivation rec {
meta = {
description = "Modern, C++-native, test framework for unit-tests";
homepage = "https://github.com/catchorg/Catch2";
changelog = "https://github.com/catchorg/Catch2/blob/${src.tag}/docs/release-notes.md";
changelog = "https://github.com/catchorg/Catch2/blob/${finalAttrs.src.tag}/docs/release-notes.md";
license = lib.licenses.boost;
maintainers = with lib.maintainers; [ dotlambda ];
platforms = with lib.platforms; unix ++ windows;
};
}
})

View File

@@ -11,7 +11,7 @@
wrapGAppsHook4,
evolution-data-server,
feedbackd,
glibmm,
glibmm_2_4,
libsecret,
gnome-desktop,
gspell,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
evolution-data-server
feedbackd
glibmm
glibmm_2_4
libsecret
gnome-desktop
gspell

View File

@@ -1,10 +1,11 @@
{
lib,
stdenvNoCC,
buildGraalvmNativeImage,
fetchurl,
writeScript,
writableTmpDirAsHomeHook,
versionCheckHook,
nix-update-script,
}:
buildGraalvmNativeImage (finalAttrs: {
@@ -33,7 +34,30 @@ buildGraalvmNativeImage (finalAttrs: {
versionCheckHook
];
passthru.updateScript = nix-update-script { };
passthru.updateScript = writeScript "update-clojure-lsp" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl common-updater-scripts gnused jq nix
set -eu -o pipefail
source "${stdenvNoCC}/setup"
old_version="$(nix-instantiate --strict --json --eval -A clojure-lsp.version | jq -r .)"
latest_version="$(curl -s https://api.github.com/repos/clojure-lsp/clojure-lsp/releases/latest | jq -r .tag_name)"
if [[ $latest_version == $old_version ]]; then
echo "Already at latest version $old_version"
exit 0
fi
old_jar_hash="$(nix-instantiate --strict --json --eval -A clojure-lsp.jar.drvAttrs.outputHash | jq -r .)"
curl -o clojure-lsp-standalone.jar -sL "https://github.com/clojure-lsp/clojure-lsp/releases/download/$latest_version/clojure-lsp-standalone.jar"
new_jar_hash="$(nix-hash --flat --type sha256 clojure-lsp-standalone.jar | xargs -n1 nix --extra-experimental-features nix-command hash convert --hash-algo sha256)"
rm -f clojure-lsp-standalone.jar
update-source-version clojure-lsp "$latest_version" "$new_jar_hash"
'';
meta = {
description = "Language Server Protocol (LSP) for Clojure";
@@ -41,10 +65,7 @@ buildGraalvmNativeImage (finalAttrs: {
changelog = "https://github.com/clojure-lsp/clojure-lsp/releases/tag/${finalAttrs.version}";
sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
ericdallo
jlesquembre
];
maintainers = [ lib.maintainers.ericdallo ];
mainProgram = "clojure-lsp";
};
})

View File

@@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation rec {
pname = "cloudlog";
version = "2.8.19";
version = "2.8.18";
src = fetchFromGitHub {
owner = "magicbug";
repo = "Cloudlog";
rev = version;
hash = "sha256-QE3AGwsiZUFbtmGN+Dnxrp6EniYFmO6GvJoPDFtvDG0=";
hash = "sha256-gQgEWjR/ezKmk19NLERr8f4+VdK7h9FqXjy0/fgJ90g=";
};
postPatch = ''

View File

@@ -1,8 +1,8 @@
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
index e95da44ea4..bdf4155232 100644
index 9aa659e4fd..ba9974c316 100644
--- a/Modules/Platform/UnixPaths.cmake
+++ b/Modules/Platform/UnixPaths.cmake
@@ -71,28 +71,38 @@
@@ -81,28 +81,38 @@ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
/lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
)

View File

@@ -1,21 +1,21 @@
diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake
index 196ab18b0b..31dd4346b1 100644
index c9c88b36f5..0b1fda27d7 100644
--- a/Modules/Platform/Darwin-Initialize.cmake
+++ b/Modules/Platform/Darwin-Initialize.cmake
@@ -16,7 +16,7 @@
endif()
@@ -290,7 +290,7 @@ endif()
# CMAKE_OSX_DEPLOYMENT_TARGET
if(NOT CMAKE_CROSSCOMPILING)
- execute_process(COMMAND sw_vers -productVersion
+ execute_process(COMMAND @sw_vers@ -productVersion
OUTPUT_VARIABLE _CMAKE_HOST_OSX_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
OUTPUT_STRIP_TRAILING_WHITESPACE
RESULT_VARIABLE _result)
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
index c65587edbe..0a7cc380c3 100644
index 743c224437..173ceb0a64 100644
--- a/Source/kwsys/SystemInformation.cxx
+++ b/Source/kwsys/SystemInformation.cxx
@@ -3833,7 +3833,7 @@
@@ -3835,7 +3835,7 @@ long long SystemInformationImplementation::GetHostMemoryUsed()
}
char const* names[3] = { "Pages wired down:", "Pages active:", nullptr };
long long values[2] = { 0 };
@@ -24,7 +24,7 @@ index c65587edbe..0a7cc380c3 100644
if (ierr) {
return -1;
}
@@ -5586,7 +5586,7 @@
@@ -5506,7 +5506,7 @@ int SystemInformationImplementation::CallSwVers(char const* arg,
{
#ifdef __APPLE__
std::vector<char const*> args;
@@ -34,10 +34,10 @@ index c65587edbe..0a7cc380c3 100644
args.push_back(nullptr);
ver = this->RunProcess(args);
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 15a1e2c0c3..33bb304cf7 100644
index 8020d96833..d32e6a6693 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1958,7 +1958,7 @@
@@ -1977,7 +1977,7 @@ if(BUILD_TESTING)
if(CMake_TEST_XCODE_VERSION AND NOT CMake_TEST_XCODE_VERSION VERSION_LESS 5)
if(NOT CMake_TEST_XCTest_DEPLOYMENT_TARGET)
execute_process(
@@ -45,4 +45,4 @@ index 15a1e2c0c3..33bb304cf7 100644
+ COMMAND @sw_vers@ -productVersion
OUTPUT_VARIABLE OSX_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
RESULT_VARIABLE _sw_vers_result

View File

@@ -1,8 +1,8 @@
diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
index dc26258eac..dd8d30e3d9 100644
index c70fea184d..10b18675b0 100644
--- a/Modules/CMakeDetermineSystem.cmake
+++ b/Modules/CMakeDetermineSystem.cmake
@@ -68,7 +68,7 @@
@@ -74,7 +74,7 @@ if(CMAKE_HOST_UNIX)
endif()
if(_CMAKE_APPLE_SILICON_PROCESSOR)
if(";${_CMAKE_APPLE_SILICON_PROCESSOR};" MATCHES "^;(arm64|x86_64);$")
@@ -12,10 +12,10 @@ index dc26258eac..dd8d30e3d9 100644
ERROR_VARIABLE _sysctl_stderr
RESULT_VARIABLE _sysctl_result
diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake
index 31dd4346b1..7c4f123a1d 100644
index 0b1fda27d7..f5491ef048 100644
--- a/Modules/Platform/Darwin-Initialize.cmake
+++ b/Modules/Platform/Darwin-Initialize.cmake
@@ -28,7 +28,7 @@
@@ -22,7 +22,7 @@ set(CMAKE_OSX_ARCHITECTURES "$ENV{CMAKE_OSX_ARCHITECTURES}" CACHE STRING
if(NOT CMAKE_CROSSCOMPILING AND
CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND
CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(arm64|x86_64)$")
@@ -25,10 +25,10 @@ index 31dd4346b1..7c4f123a1d 100644
ERROR_VARIABLE _sysctl_stderr
RESULT_VARIABLE _sysctl_result
diff --git a/Modules/ProcessorCount.cmake b/Modules/ProcessorCount.cmake
index 260b6631c0..ffb8fcd8d2 100644
index b8fa1fabc0..7c3112b817 100644
--- a/Modules/ProcessorCount.cmake
+++ b/Modules/ProcessorCount.cmake
@@ -87,8 +87,7 @@
@@ -87,8 +87,7 @@ function(ProcessorCount var)
if(NOT count)
# Mac, FreeBSD, OpenBSD (systems with sysctl):
@@ -52,10 +52,10 @@ index 8c22b4e43a..6d9ccef5e7 100644
#elif defined(__sun) && (defined(__SVR4) || defined(__svr4__)) /* Solaris */
# define KWSYSPE_PS_COMMAND "ps -e -o pid,ppid"
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
index 0a7cc380c3..9923dc4ab9 100644
index 173ceb0a64..7bddddf955 100644
--- a/Source/kwsys/SystemInformation.cxx
+++ b/Source/kwsys/SystemInformation.cxx
@@ -3876,7 +3876,7 @@
@@ -3878,7 +3878,7 @@ long long SystemInformationImplementation::GetProcMemoryUsed()
long long memUsed = 0;
pid_t pid = getpid();
std::ostringstream oss;
@@ -65,10 +65,10 @@ index 0a7cc380c3..9923dc4ab9 100644
if (!file) {
return -1;
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 33bb304cf7..7dbda40a81 100644
index d32e6a6693..683e27ece7 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -216,7 +216,7 @@
@@ -249,7 +249,7 @@ if(BUILD_TESTING)
endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT DEFINED CMake_TEST_APPLE_SILICON)

View File

@@ -1,8 +1,8 @@
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index b8d4765692..902c1e5290 100644
index e9e8dfd4b9..d115cd1897 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -312,6 +312,11 @@ void cmFindBase::FillCMakeEnvironmentPath()
@@ -308,6 +308,11 @@ void cmFindBase::FillCMakeEnvironmentPath()
// Add CMAKE_*_PATH environment variables
std::string var = cmStrCat("CMAKE_", this->CMakePathName, "_PATH");
paths.AddEnvPrefixPath("CMAKE_PREFIX_PATH");
@@ -15,10 +15,10 @@ index b8d4765692..902c1e5290 100644
if (this->CMakePathName == "PROGRAM") {
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 6201894fd1..9533862a2b 100644
index 2f2c5c6662..4594afd0e7 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -2467,6 +2467,7 @@ void cmFindPackageCommand::FillPrefixesCMakeEnvironment()
@@ -2520,6 +2520,7 @@ void cmFindPackageCommand::FillPrefixesCMakeEnvironment()
// And now the general CMake environment variables
paths.AddEnvPath("CMAKE_PREFIX_PATH");

View File

@@ -52,11 +52,11 @@ stdenv.mkDerivation (finalAttrs: {
+ lib.optionalString isMinimalBuild "-minimal"
+ lib.optionalString cursesUI "-cursesUI"
+ lib.optionalString qt5UI "-qt5UI";
version = "4.4.2";
version = "4.4.3";
src = fetchurl {
url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz";
hash = "sha256-HbnmHmC24IdMhjhjQLkQOC88XnW5+/tE0SIGMSmieJ0=";
hash = "sha256-xGQAYYtPHytDUH8k+yLzroMMNBbPI7d24W4dQTqokvA=";
};
patches = [

File diff suppressed because it is too large Load Diff

View File

@@ -1,7 +1,6 @@
{
acl,
bash,
buildPackages,
cockpit,
coreutils,
fetchFromGitHub,
@@ -15,7 +14,7 @@
mbuffer,
msmtp,
nix-update-script,
nodejs_22,
nodejs,
openssh,
samba,
shadow,
@@ -27,22 +26,6 @@
yarn-berry,
zfs,
}:
let
# Pin to Node <24.15.0: Yarn Berry's PnP linker breaks `require.cache` on
# newer Node, which crashes tailwindcss mid-build (and ESLint, per
# yarnpkg/berry#7106). See NixOS/nixpkgs#530137.
#
# `nodejs` is rebound here (rather than touched at every call site below)
# so the rest of this file is unaffected.
#
# yarn-berry's own `yarn` binary gets patchShebang'd against whatever
# `nodejs` *it* was built with, so overriding nativeBuildInputs alone does
# nothing - we have to rebuild yarn-berry itself against nodejs_22, for
# both the host and build-platform (cross-compilation) variants.
nodejs = nodejs_22;
yarnBerry = yarn-berry.override { inherit nodejs; };
yarnBerryForBuild = buildPackages.yarn-berry.override { nodejs = buildPackages.nodejs_22; };
in
stdenv.mkDerivation (finalAttrs: {
pname = "cockpit-zfs";
@@ -59,17 +42,17 @@ stdenv.mkDerivation (finalAttrs: {
missingHashes = ./missing-hashes.json;
# Use buildPackages for cross-compilation support
offlineCache = yarnBerryForBuild.fetchYarnBerryDeps {
offlineCache = yarn-berry.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes;
hash = "sha256-nm3iHf9Rm5JFKzH0HAvglkQPFIV6Fl1e9WvNdqevTug=";
};
nativeBuildInputs = [
makeWrapper
nodejs_22
nodejs
jq
yarnBerry
yarnBerryForBuild.yarnBerryConfigHook
yarn-berry
yarn-berry.yarnBerryConfigHook
];
disallowedRequisites = [ finalAttrs.offlineCache ];
@@ -86,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
lsscsi
mbuffer
msmtp
nodejs_22
nodejs
openssh
samba
shadow

View File

@@ -10,16 +10,16 @@
buildNpmPackage (finalAttrs: {
pname = "codex-acp";
version = "1.12.0";
version = "1.10.0";
src = fetchFromGitHub {
owner = "agentclientprotocol";
repo = "codex-acp";
tag = "v${finalAttrs.version}";
hash = "sha256-GIMJm+kifPEMb7XLPSssUu87eEE+aaBr2jZUk8aPD2s=";
hash = "sha256-D8uYd30NRXQYUSBFCi66Oq0iRZXpl8P7nWv2m3+KBig=";
};
npmDepsHash = "sha256-BeRj6LpIpGV4ONEHE//nYXTfkB1nfVQpPeJF3LRlyRM=";
npmDepsHash = "sha256-df1/kPiZFBEq9Um26Qbo9XaYj2J8BOXQmunCQWquDTo=";
nativeBuildInputs = [ makeBinaryWrapper ];

View File

@@ -11,13 +11,13 @@
buildGoModule (finalAttrs: {
pname = "coroot";
version = "1.26.1";
version = "1.26.0";
src = fetchFromGitHub {
owner = "coroot";
repo = "coroot";
tag = "v${finalAttrs.version}";
hash = "sha256-BN76EkYw8YIz+BRio1GPzO071EAkum3QIqrsmgmG5kk=";
hash = "sha256-Rwj5dyAlAHDk7aimRDrUncwNTi4pCESxYmjSMPqweeI=";
};
vendorHash = "sha256-qKqfPRmp9hdlug9O90R5zRgslHOANcxGBoEzFipf7+w=";

View File

@@ -5,26 +5,24 @@
fetchFromGitHub,
just,
libcosmicAppHook,
autoAddDriverRunpath,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-ext-applet-minimon";
version = "1.2.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "cosmic-utils";
repo = "minimon-applet";
tag = "v${finalAttrs.version}";
hash = "sha256-0ZLyjcn+h/IUXEMbTvbyKI7Qt5YRNBxUXV/7OHRsHLU=";
hash = "sha256-7DAP4Cmg0xIPTiAKwCIxHBEhTdPPX1KywZqTaoRIRhk=";
};
cargoHash = "sha256-MF5XK9U1Dj5IdC8Pd6W+8GPWvEhusO+MacMutEnaymk=";
cargoHash = "sha256-vj5PzOXpTRXGXgxIz0Q2BmGbsWInuxA4aYlhM77ZTMM=";
nativeBuildInputs = [
just
libcosmicAppHook
autoAddDriverRunpath # for GPU monitoring
];
dontUseJustBuild = true;
@@ -36,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
(placeholder "out")
"--set"
"bin-src"
"target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-ext-applet-minimon"
"target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-applet-minimon"
];
passthru.updateScript = nix-update-script { };
@@ -46,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
description = "COSMIC applet for displaying CPU/Memory/Network/Disk/GPU usage in the Panel or Dock";
homepage = "https://github.com/cosmic-utils/minimon-applet";
license = lib.licenses.gpl3Only;
mainProgram = "cosmic-ext-applet-minimon";
mainProgram = "cosmic-applet-minimon";
maintainers = with lib.maintainers; [ HeitorAugustoLN ];
platforms = lib.platforms.linux;
};

View File

@@ -25,7 +25,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cryptsetup";
version = "2.8.7";
version = "2.8.8";
outputs = [
"bin"
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
url =
"mirror://kernel/linux/utils/cryptsetup/v${lib.versions.majorMinor finalAttrs.version}/"
+ "cryptsetup-${finalAttrs.version}.tar.xz";
hash = "sha256-53bw04HobKYQQsRXBpSR/o4KwoZ4DHw7Hk+ZIavJYdo=";
hash = "sha256-Os+mhfLdf8yDLgt3vHCTqn2lVKUc6Nr7tBOOqoVO7jU=";
};
patches = [

View File

@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ddccontrol-db";
version = "20260915";
version = "20260902";
src = fetchFromGitHub {
owner = "ddccontrol";
repo = "ddccontrol-db";
tag = finalAttrs.version;
sha256 = "sha256-n538zzL8lRln6eLCJDivwh90RO2RZ7lykEDLVKV3Sa0=";
sha256 = "sha256-Nu0SC9Qh4+wUzVCdo7m2z4pZH50FvCXehF3IiCoHXKM=";
};
nativeBuildInputs = [

View File

@@ -9,13 +9,13 @@
buildGoModule (finalAttrs: {
pname = "delve";
version = "1.27.2";
version = "1.27.1";
src = fetchFromGitHub {
owner = "go-delve";
repo = "delve";
tag = "v${finalAttrs.version}";
hash = "sha256-vq8RSqSoPmDT/l6izYdM0a6SVJyaIbZ8gsXbgkFPaOw=";
hash = "sha256-H91QnLyqywgoc3zdTaclzzUxVPagNnxLzKub2gnL25w=";
};
patches = [

View File

@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "diamond";
version = "2.2.7";
version = "2.2.6";
src = fetchFromGitHub {
owner = "bbuchfink";
repo = "diamond";
tag = "v${finalAttrs.version}";
hash = "sha256-bWJIcQJR2BQED8YGnDSWIO+UehWThgJwHv7hGuT99D8=";
hash = "sha256-8IlF/PQpceFx8THy1T9zD+yMxPLIyqvntwij3TJZB4M=";
};
nativeBuildInputs = [ cmake ];

View File

@@ -128,7 +128,6 @@ python.pkgs.buildPythonApplication rec {
patches = [
./androguard-4.1.4.patch
./ignore_links.patch
./radare2.patch
];
postPatch = ''
@@ -155,7 +154,9 @@ python.pkgs.buildPythonApplication rec {
# otool
# Other tools:
# docx2txt (needs Debian's package called this, not the python package)
# radare2 (the exact output of the r2 version debian ships is expected, and our more recent version has a slightly different one)
# radare2
# > FAILED tests/comparators/test_elf_decompiler.py::test_radare2_diff - KeyError: 'offset'
# > FAILED tests/comparators/test_macho_decompiler.py::test_radare2_diff - KeyError: 'offset'
#
# We filter automatically all packages for the host platform (some dependencies are not supported on Darwin, aarch64, etc.).
# Packages which are marked broken for a platform are not automatically filtered to avoid accidentally removing them without noticing it.

View File

@@ -1,26 +0,0 @@
Fix comparing ELF objects when r2 is in PATH
https://github.com/radareorg/radare2/issues/21201 renamed the "offset" key of
the json output diffoscope uses to "addr". As a result running diffoscope on an
ELF object results in this error:
KeyError: 'offset'
This patch does not include the modifications to the test suite required to
submit it upstream.
Upstream issue: https://salsa.debian.org/reproducible-builds/diffoscope/-/work_items/432
diff --git a/diffoscope/comparators/decompile.py b/diffoscope/comparators/decompile.py
index bf85deb9..f6a5564f 100644
--- a/diffoscope/comparators/decompile.py
+++ b/diffoscope/comparators/decompile.py
@@ -242,6 +242,9 @@ class AsmFunction(File):
@property
def offset(self):
+ if "addr" in self.data_dict:
+ return self.data_dict["addr"]
+ # backward compat with r2 version < 5.9.0
return self.data_dict["offset"]
@property

View File

@@ -7,18 +7,18 @@
buildGoModule (finalAttrs: {
pname = "dolt";
version = "2.3.4";
version = "2.3.3";
src = fetchFromGitHub {
owner = "dolthub";
repo = "dolt";
tag = "v${finalAttrs.version}";
hash = "sha256-NMDe/B3COn5EjbO2xt5VMuBiRYSDbguIqJeYd1MPSbc=";
hash = "sha256-9t4bpv35gQ+vAHf5M7XwDlY7vzeVb5k36DOERWT4l6g=";
};
modRoot = "./go";
subPackages = [ "cmd/dolt" ];
vendorHash = "sha256-La6uJEyGKNSnSFMlisEMNoKb8RX9HsP+rZY8b+Cq/Ko=";
vendorHash = "sha256-dS3OM2ghudvCldFkTQyVsdyaYFU8lkUcZ99y5xD3oc0=";
proxyVendor = true;
doCheck = false;

View File

@@ -2,8 +2,8 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
gitUpdater,
writers,
alsa-lib,
autoreconfHook,
ffmpeg,
@@ -28,25 +28,27 @@
zlib,
}:
let
check-dosbox-conf = writers.writeText "check-dosbox.conf" ''
[autoexec]
MOUNT C .
VER > C:\BLUB
'';
in
stdenv.mkDerivation (finalAttrs: {
pname = "dosbox-x";
version = "2026.08.31";
version = "2026.08.02";
src = fetchFromGitHub {
owner = "joncampbell123";
repo = "dosbox-x";
rev = "dosbox-x-v${finalAttrs.version}";
hash = "sha256-RYnepkAHwLOQFBXNZSPkH4L9bi3BkVC2RKd+YReGMqU=";
hash = "sha256-zipg/eTz/k6IQeUovgpZ/ezOJNEjSQwHpkpGYOtdpS0=";
};
patches = [
# https://github.com/joncampbell123/dosbox-x/issues/6446
# Remove when version > 2026.08.02
(fetchpatch {
name = "0001-dosbox-x-Fix-FFmpeg-9-compat.patch";
url = "https://github.com/joncampbell123/dosbox-x/commit/18062c0ffb33db35fa52ce937ce25223140c0293.patch";
hash = "sha256-S6DMmofFBloZFut0M3ZVAV/awG8Af9xjO2AcfVusOdg=";
})
];
# sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants
# iconutil is unavailable, replace with png2icns from libicns
# Patch bad hardcoded compiler
@@ -120,26 +122,6 @@ stdenv.mkDerivation (finalAttrs: {
makeWrapper $out/Applications/dosbox-x.app/Contents/MacOS/dosbox-x $out/bin/dosbox-x
'';
# Can't personally check Darwin anymore
doInstallCheck = !stdenv.hostPlatform.isDarwin;
installCheckPhase = ''
runHook preInstallCheck
env \
SDL_AUDIODRIVER=dummy \
SDL_VIDEODRIVER=dummy \
$out/bin/dosbox-x \
-nopromptfolder -nogui \
-exit \
-machine pc98 \
-conf ${check-dosbox-conf}
grep -q 'Reported DOS version' BLUB
runHook postInstallCheck
'';
passthru = {
tests.version = testers.testVersion {
package = finalAttrs.finalPackage;

View File

@@ -28,7 +28,7 @@
# Build tools
autoconf,
autoconf-archive,
automake,
automake116x,
bison,
cmake,
gcc-unwrapped,
@@ -223,7 +223,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [
autoconf
autoconf-archive
automake
automake116x
bison
cmake
ninja

View File

@@ -14,40 +14,43 @@
replaceVars,
swig,
libyaml,
gitUpdater,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dtc";
version = "1.7.2";
version = "1.8.1";
src = fetchzip {
url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/dtc-v${finalAttrs.version}.tar.gz";
hash = "sha256-KZCzrvdWd6zfQHppjyp4XzqNCfH2UnuRneu+BNIRVAY=";
hash = "sha256-l32ZGygimwSB2xmwQEvS+C2c5n86OMH92jQZ/tPI+YI=";
};
patches = [
# backport of https://github.com/dgibson/dtc/pull/141
# to 1.7.2, to drop in 1.8.
./static.patch
# backport fix for SWIG 4.3
# These 4 patches fix build failures on x86_64-linux for tests/dumptrees by replacing it.
(fetchpatch2 {
url = "https://github.com/dgibson/dtc/commit/9a969f3b70b07bbf1c9df44a38d7f8d1d3a6e2a5.patch";
hash = "sha256-YrRzc3ATNmU6LYNHEQeU8wtjt1Ap7/gNFvtRR14PQEE=";
url = "https://github.com/dgibson/dtc/commit/9b53b9a4c2f953a37d8f68d72f5910b20cf5aee0.patch?full_index=1";
hash = "sha256-HHX3zg1uwD3ZFHbHcANX85gNDpeEMVbkG7zMhyc/87k=";
})
# glibc-2.41 support
(fetchpatch2 {
url = "https://github.com/dgibson/dtc/commit/ce1d8588880aecd7af264e422a16a8b33617cef7.patch";
hash = "sha256-t1CxKnbCXUArtVcniAIdNvahOGXPbYhPCZiTynGLvfo=";
url = "https://github.com/dgibson/dtc/commit/f116f4800edce6cd58f680a36fbaed656018d528.patch?full_index=1";
hash = "sha256-XcLzfruD3DGs4girNxsqrhBW3Ct/+vAltn8OzIRyU6w=";
})
(fetchpatch2 {
url = "https://github.com/dgibson/dtc/commit/4df9ca4c8ddb83c40900bf13916b42914a25caf4.patch?full_index=1";
hash = "sha256-ap3D2DxHxLYOSJPhWAUP/nooi/n2/wLc65NfbjlYl2M=";
})
(fetchpatch2 {
url = "https://github.com/dgibson/dtc/commit/214372a27398121f8266cf9bb9592561508c4c0f.patch?full_index=1";
hash = "sha256-Fk0dA1J14NsIfd5qSknOMkB769TEwvWem8e+uEleM84=";
})
]
++
lib.optional pythonSupport
# Make Meson use our Python version, not the one it was built with itself
(
replaceVars ./python-path.patch {
python_bin = lib.getExe python;
}
);
++ lib.optionals pythonSupport [
# Make Meson use our Python version, not the one it was built with itself
(replaceVars ./python-path.patch {
python_bin = lib.getExe python;
})
];
nativeBuildInputs = [
meson
@@ -55,21 +58,17 @@ stdenv.mkDerivation (finalAttrs: {
flex
bison
pkg-config
which
]
++ lib.optionals pythonSupport [
python
python.pkgs.setuptools-scm
swig
];
buildInputs = [ libyaml ];
postPatch = ''
patchShebangs setup.py
# Align the name with pypi
sed -i "s/name='libfdt',/name='pylibfdt',/" setup.py
substituteInPlace pyproject.toml --replace-fail "name = 'libfdt'" "name = 'pylibfdt'"
'';
# Required for installation of Python library and is innocuous otherwise.
@@ -97,6 +96,11 @@ stdenv.mkDerivation (finalAttrs: {
# hostPlatform binaries during the configurePhase.
(with stdenv; buildPlatform.canExecute hostPlatform);
passthru.updateScript = gitUpdater {
url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git";
rev-prefix = "v";
};
meta = {
description = "Device Tree Compiler";
homepage = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git";

View File

@@ -1,150 +0,0 @@
commit a881a5b110d2f23a11924604bff64ab3c2755bc6
Author: Brandon Maier <brandon.maier@gmail.com>
Date: Thu Mar 6 20:30:47 2025 -0600
meson: support building libfdt without static library
Some packaging systems like NixOS don't support compiling static
libraries. However libfdt's meson.build uses `both_library()` which
forces the build to always compile shared and static libraries. Removing
`both_library()` will make packaging easier.
libfdt uses `both_libraries()` to support the 'static-build' option.
But we do not need the 'static-build' option as Meson can natively
build static using
> meson setup builddir/ -Dc_link_args='-static' --prefer-static --default-library=static
So drop 'static-build' and then replace `both_libraries()` with
`library()`.
Signed-off-by: Brandon Maier <brandon.maier@gmail.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
diff --git a/libfdt/meson.build b/libfdt/meson.build
index bf8343f..c2f4bd6 100644
--- a/libfdt/meson.build
+++ b/libfdt/meson.build
@@ -26,7 +26,7 @@ else
endif
link_args += version_script
-libfdt = both_libraries(
+libfdt = library(
'fdt', sources,
version: meson.project_version(),
link_args: link_args,
@@ -34,17 +34,11 @@ libfdt = both_libraries(
install: true,
)
-if static_build
- link_with = libfdt.get_static_lib()
-else
- link_with = libfdt.get_shared_lib()
-endif
-
libfdt_inc = include_directories('.')
libfdt_dep = declare_dependency(
include_directories: libfdt_inc,
- link_with: link_with,
+ link_with: libfdt,
)
install_headers(
diff --git a/meson.build b/meson.build
index 310699f..603ffaa 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
project('dtc', 'c',
version: files('VERSION.txt'),
license: ['GPL2+', 'BSD-2'],
- default_options: 'werror=true',
+ default_options: ['werror=true', 'default_library=both'],
meson_version: '>=0.57.0'
)
@@ -27,16 +27,8 @@ add_project_arguments(
language: 'c'
)
-if get_option('static-build')
- static_build = true
- extra_link_args = ['-static']
-else
- static_build = false
- extra_link_args = []
-endif
-
yamltree = 'yamltree.c'
-yaml = dependency('yaml-0.1', version: '>=0.2.3', required: get_option('yaml'), static: static_build)
+yaml = dependency('yaml-0.1', version: '>=0.2.3', required: get_option('yaml'))
if not yaml.found()
add_project_arguments('-DNO_YAML', language: 'c')
yamltree = []
@@ -92,7 +84,6 @@ if get_option('tools')
],
dependencies: util_dep,
install: true,
- link_args: extra_link_args,
)
endif
@@ -113,11 +104,10 @@ if get_option('tools')
],
dependencies: [util_dep, yaml],
install: true,
- link_args: extra_link_args,
)
foreach e: ['fdtdump', 'fdtget', 'fdtput', 'fdtoverlay']
- dtc_tools += executable(e, files(e + '.c'), dependencies: util_dep, install: true, link_args: extra_link_args)
+ dtc_tools += executable(e, files(e + '.c'), dependencies: util_dep, install: true)
endforeach
install_data(
diff --git a/meson_options.txt b/meson_options.txt
index 36f391a..62b31b3 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -8,7 +8,5 @@ option('valgrind', type: 'feature', value: 'auto',
description: 'Valgrind support')
option('python', type: 'feature', value: 'auto',
description: 'Build pylibfdt Python library')
-option('static-build', type: 'boolean', value: false,
- description: 'Build static binaries')
option('tests', type: 'boolean', value: true,
description: 'Build tests')
diff --git a/tests/meson.build b/tests/meson.build
index 9cf6e3d..baed174 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -96,22 +96,20 @@ tests += [
'truncated_string',
]
+test_deps = [testutil_dep, util_dep, libfdt_dep]
+
dl = cc.find_library('dl', required: false)
-if dl.found() and not static_build
+if dl.found()
tests += [
'asm_tree_dump',
'value-labels',
]
-endif
-
-test_deps = [testutil_dep, util_dep, libfdt_dep]
-if not static_build
test_deps += [dl]
endif
tests_exe = []
foreach t: tests
- tests_exe += executable(t, files(t + '.c'), dependencies: test_deps, link_args: extra_link_args)
+ tests_exe += executable(t, files(t + '.c'), dependencies: test_deps)
endforeach
run_tests = find_program('run_tests.sh')

View File

@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
substitute,
yarn-berry_4,
nodejs,
jq,
@@ -15,14 +16,25 @@ let
owner = "expo";
repo = "eas-cli";
rev = "v${version}";
hash = "sha256-EMN54PR9lhrZcGMq2iNUsdyBP3wVk4G/isjsneIGslI=";
hash = "sha256-WfzCV304xgTqiKBCsZc5rnzaC+UHA6c155FG+HWBY7s=";
# Remove after upstream updates to Yarn 4.15
# https://github.com/expo/eas-cli/blob/main/package.json#L38
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry_4.lockfileVersion
];
})
}
'';
};
missingHashes = ./missing-hashes.json;
patches = [
# Remove after upstream updates to Yarn 4.14
# https://github.com/expo/eas-cli/blob/v18.7.0/package.json#L37
./yarn-4.14-support.patch
];
in
# cc is necessary because of building an npm package without a prebuilt binary
# for ARM. See comment in nativeBuildInputs below.
@@ -32,12 +44,11 @@ stdenv.mkDerivation (finalAttrs: {
src
version
missingHashes
patches
;
yarnOfflineCache = yarn-berry_4.fetchYarnBerryDeps {
inherit src missingHashes patches;
hash = "sha256-dOx4T009+FMFEvTZtlyJpAUo2UYBm1O1hIyBnSbqIgw=";
inherit src missingHashes;
hash = "sha256-Iqdk0MpXeiKm5hgF68XOKvl0a+5LpXsNNcelCcbfj3s=";
};
nativeBuildInputs = [

View File

@@ -15,6 +15,6 @@ diff --git a/yarn.lock b/yarn.lock
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0

View File

@@ -1,7 +1,6 @@
{
buildFHSEnv,
fetchFromGitHub,
fetchYarnDeps,
electron,
git,
lib,
@@ -10,6 +9,7 @@
stdenvNoCC,
util-linux,
yarn-berry_4,
substitute,
zip,
}:
@@ -22,7 +22,23 @@ let
owner = "electron";
repo = "fiddle";
tag = "v${version}";
hash = "sha256-nmmj1PvW9LOoEdwwWRRXe9q9J8z6Fp45Tt038BjWD+k=";
hash = "sha256-5Pw889lHRwWoTUVbLmToPF8/bDz382qFMO9mL/EKLo0=";
# Remove after upstream updates to Yarn 4.15
# https://github.com/electron/fiddle/blob/main/package.json#L163
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry.lockfileVersion
];
})
}
'';
};
patches = [
@@ -31,9 +47,6 @@ let
# zip extraction fails on newer nodejs versions without this fix
./bump-yauzl.patch
# https://github.com/nixos/nixpkgs/issues/542343
./yarn-metadata-version.patch
];
missingHashes = ./missing-hashes.json;
@@ -49,7 +62,7 @@ let
offlineCache = yarn-berry.fetchYarnBerryDeps {
inherit src patches missingHashes;
hash = "sha256-xxguRiyZDGdVt3eYh+KUI/odLZZ/LeScRBfexMxAOVI=";
hash = "sha256-O9zaCL0W8JPYQz8EBWOz0qGjW57Js3oMosUbz72YBc4=";
};
nativeBuildInputs = [

View File

@@ -0,0 +1,58 @@
diff --git a/.yarnrc.yml b/.yarnrc.yml
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -1,7 +1,5 @@
nodeLinker: node-modules
-yarnPath: .yarn/releases/yarn-4.10.3.cjs
-
# see package.json for Electron postinstall
enableScripts: false
diff --git a/yarn.lock b/yarn.lock
index 365f8b4d..ffa89a3d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,6 @@
# Manual changes might be lost - proceed with caution!
__metadata:
- version: 8
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -11277,27 +11277,27 @@ __metadata:
"resolve@patch:resolve@npm%3A^1.22.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A~1.22.2#optional!builtin<compat/resolve>":
version: 1.22.11
- resolution: "resolve@patch:resolve@npm%3A1.22.11#optional!builtin<compat/resolve>::version=1.22.11&hash=c3c19d"
+ resolution: "resolve@patch:resolve@npm%3A1.22.11#optional!builtin<compat/resolve>::version=1.22.11&hash=9bd1a5"
dependencies:
is-core-module: "npm:^2.16.1"
path-parse: "npm:^1.0.7"
supports-preserve-symlinks-flag: "npm:^1.0.0"
bin:
resolve: bin/resolve
- checksum: 10c0/ee5b182f2e37cb1165465e58c6abc797fec0a80b5ba3231607beb4677db0c9291ac010c47cf092b6daa2b7f518d69a0e21888e7e2b633f68d501a874212a8c63
+ checksum: 10c0/55f7a298977b1aacf6dbec6dcfc81100ba98675bced193b57d3ac58ced65acc40c3a38927853cea86b7f75edb3c20e1f099a09d48b0d8ceccc25d466993eec47
languageName: node
linkType: hard
"resolve@patch:resolve@npm%3A^2.0.0-next.4#optional!builtin<compat/resolve>":
version: 2.0.0-next.4
- resolution: "resolve@patch:resolve@npm%3A2.0.0-next.4#optional!builtin<compat/resolve>::version=2.0.0-next.4&hash=c3c19d"
+ resolution: "resolve@patch:resolve@npm%3A2.0.0-next.4#optional!builtin<compat/resolve>::version=2.0.0-next.4&hash=9bd1a5"
dependencies:
is-core-module: "npm:^2.9.0"
path-parse: "npm:^1.0.7"
supports-preserve-symlinks-flag: "npm:^1.0.0"
bin:
resolve: bin/resolve
- checksum: 10c0/ed2bb51d616b9cd30fe85cf49f7a2240094d9fa01a221d361918462be81f683d1855b7f192391d2ab5325245b42464ca59690db5bd5dad0a326fc0de5974dd10
+ checksum: 10c0/c86731c5e95ceaa3bf7a0e5d451a9c5e50f7d8c545300de905cda347b5c6d7e23b500b365757673cc884f9be93c23b8aa4dc5c5350b7e6cdfec8149c4b257479
languageName: node
linkType: hard

View File

@@ -1,23 +1,27 @@
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
installShellFiles,
buildGoModule,
go,
makeWrapper,
writableTmpDirAsHomeHook,
viceroy,
}:
buildGoModule (finalAttrs: {
pname = "fastly";
version = "16.1.0";
version = "16.0.0";
src = fetchFromGitHub {
owner = "fastly";
repo = "cli";
tag = "v${finalAttrs.version}";
hash = "sha256-xGp5Fa4ruHpc2YAAbrva0zurt4wxC6XRdSpMMQGEB7c=";
hash = "sha256-gVKlAbiznaRKwDpiyap4Q3mIhn/ZbnUIFwG3l01ZXQ8=";
# The git commit is part of the `fastly version` original output;
# leave that output the same in nixpkgs. Use the `.git` directory
# to retrieve the commit SHA, and remove the directory afterwards,
# since it is not needed after that.
leaveDotGit = true;
postFetch = ''
cd "$out"
@@ -26,34 +30,39 @@ buildGoModule (finalAttrs: {
'';
};
subPackages = [ "cmd/fastly" ];
subPackages = [
"cmd/fastly"
];
vendorHash = "sha256-JUYBaiAz91jv8QFrfjpHnY442+qK7T0VZJcC/rCGhD4=";
vendorHash = "sha256-U2Ix8ZKGCDrWUJFFXJaL+1EBTbqblWp8slhruHhouIc=";
nativeBuildInputs = [
installShellFiles
makeWrapper
writableTmpDirAsHomeHook
];
# Flags as provided by the build automation of the project:
# https://github.com/fastly/cli/blob/7844f9f54d56f8326962112b5534e5c40e91bf09/.goreleaser.yml#L14-L18
ldflags = [
"-s"
"-w"
"-X github.com/fastly/cli/pkg/revision.AppVersion=v${finalAttrs.version}"
"-X github.com/fastly/cli/pkg/revision.Environment=release"
"-X github.com/fastly/cli/pkg/revision.GoHostOS=${go.GOHOSTOS}"
"-X github.com/fastly/cli/pkg/revision.GoHostArch=${go.GOHOSTARCH}"
];
preBuild = ''
cp ./.fastly/config.toml ./pkg/config/config.toml
ldflags+=" -X github.com/fastly/cli/pkg/revision.GitCommit=$(cat COMMIT)"
'';
ldflags = [
"-s"
"-X github.com/fastly/cli/pkg/revision.AppVersion=v${finalAttrs.version}"
"-X github.com/fastly/cli/pkg/revision.Environment=release"
];
# must embed viceroy to prevent fetching binary release on `fastly compute serve` invocation
preFixup = ''
wrapProgram $out/bin/fastly \
--prefix PATH : ${lib.makeBinPath [ viceroy ]} \
wrapProgram $out/bin/fastly --prefix PATH : ${lib.makeBinPath [ viceroy ]} \
--set FASTLY_VICEROY_USE_PATH 1
'';
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
export HOME="$(mktemp -d)"
installShellCompletion --cmd fastly \
--bash <($out/bin/fastly --completion-script-bash) \
--zsh <($out/bin/fastly --completion-script-zsh)
@@ -66,7 +75,6 @@ buildGoModule (finalAttrs: {
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
ereslibre
stepbrobd
];
mainProgram = "fastly";
};

View File

@@ -8,6 +8,7 @@
fetchPnpmDeps,
pnpmConfigHook,
pnpm_11,
nodejs-slim_latest,
darwin,
actool,
copyDesktopItems,
@@ -19,17 +20,18 @@
let
electron = electron_43;
pnpm = pnpm_11;
# Fix pnpm issue on darwin https://github.com/NixOS/nixpkgs/issues/525627
pnpm = pnpm_11.override { nodejs-slim = nodejs-slim_latest; };
in
buildNpmPackage (finalAttrs: {
pname = "feishin";
version = "1.17.0";
version = "1.15.1";
src = fetchFromGitHub {
owner = "jeffvli";
repo = "feishin";
tag = "v${finalAttrs.version}";
hash = "sha256-1ZIw5XiN+2EhpHmdvN0HxgMSvn4QvN9B+ZJ3RlPXhLw=";
hash = "sha256-2UKJBUZNUpUUZIG1JFXok7YJdzqt+Ge0ykHUm8BeNcw=";
};
__structuredAttrs = true;
@@ -46,7 +48,7 @@ buildNpmPackage (finalAttrs: {
src
;
fetcherVersion = 4;
hash = "sha256-ltpz4e5Vv2vxt/93M4+vHUFJZjwTRwb2zrwvl1Lqjo8=";
hash = "sha256-9uG0AxIBAmuIPywg3p9fFCXmRvM9zDLhWfluSLRnUXY=";
};
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
@@ -63,7 +65,7 @@ buildNpmPackage (finalAttrs: {
postPatch = ''
# release/app dependencies are installed on preConfigure
substituteInPlace package.json \
--replace-fail '"postinstall": "install-electron && electron-builder install-app-deps",' ""
--replace-fail '"postinstall": "electron-builder install-app-deps",' ""
'';
postBuild = lib.optionalString (!webVersion) ''

View File

@@ -5,7 +5,7 @@
dbus,
dbus_cplusplus,
fetchurl,
glibmm,
glibmm_2_4,
libavc1394,
libconfig,
libiec61883,
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
buildInputs = [
dbus
dbus_cplusplus
glibmm
glibmm_2_4
libavc1394
libconfig
libiec61883

View File

@@ -11,17 +11,17 @@
buildNpmPackage rec {
pname = "firebase-tools";
version = "15.30.0";
version = "15.28.2";
nodejs = nodejs_22;
src = fetchFromGitHub {
owner = "firebase";
repo = "firebase-tools";
tag = "v${version}";
hash = "sha256-pnEdnZWI9osazHlEBCnbqisvxHq3RbfKtJl7u6RxNdQ=";
hash = "sha256-19cIgkZ0luZYYx+9Cs077b5Q+sLxf+4ahwWO6hspxDw=";
};
npmDepsHash = "sha256-bHXyMeyzatoW+BHRWNNXYi/aeCdVWbGozHhDfPhNTd4=";
npmDepsHash = "sha256-ZcI4Do4NcTIhJx1o/Hb9fZysv7WyGMLOUKMb4SUbeTY=";
# No more package-lock.json in upstream src
postPatch = ''

View File

@@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "fn";
version = "0.6.66";
version = "0.6.65";
src = fetchFromGitHub {
owner = "fnproject";
repo = "cli";
rev = finalAttrs.version;
hash = "sha256-eAXBlpfGFo4hRpg+WaWtrvfPWdsVJXhDd7YK3Cb2uRE=";
hash = "sha256-ERJgATTZKeUtM3PZwjZvbbmFEgr9AiM+K7loE6L1RJ8=";
};
vendorHash = null;

View File

@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "fromager";
version = "0.95.0";
version = "0.94.0";
pyproject = true;
src = fetchFromGitHub {
owner = "python-wheel-build";
repo = "fromager";
tag = finalAttrs.version;
hash = "sha256-9+JYWEVfqG8e0OYE0AxTTtGESLTR/xcZhQMsDEuAM34=";
hash = "sha256-h+WQlz1JIwlAF2wXVaUWScEE87P/r5bBFcDVMLalsEM=";
};
build-system = with python3Packages; [

View File

@@ -28,7 +28,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gdk-pixbuf";
version = "2.44.7";
version = "2.44.8";
outputs = [
"out"
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/gdk-pixbuf/${lib.versions.majorMinor finalAttrs.version}/gdk-pixbuf-${finalAttrs.version}.tar.xz";
hash = "sha256-Fy+A42JuwxUgqXBADxo2lOBHGPbCzSiF91JQ+1pplaQ=";
hash = "sha256-kZ9SlRKWGhLoHNS0tGakjDkzRp5/mjEMZRPNT7JSujw=";
};
patches = [

View File

@@ -86,6 +86,11 @@ let
AuthenSASL
DigestHMAC
];
gitJumpBinPath = lib.makeBinPath [
"$out"
perlPackages.perl
coreutils
];
in
stdenv.mkDerivation (finalAttrs: {
@@ -197,6 +202,7 @@ stdenv.mkDerivation (finalAttrs: {
(if stdenv.hostPlatform.isFreeBSD then libiconvReal else libiconv)
bash
]
++ lib.optionals pythonSupport [ python3 ]
++ lib.optionals perlSupport [ perlPackages.perl ]
++ lib.optionals guiSupport [
tcl
@@ -385,9 +391,11 @@ stdenv.mkDerivation (finalAttrs: {
# Also put git-http-backend into $PATH, so that we can use smart
# HTTP(s) transports for pushing
ln -s $out/libexec/git-core/git-http-backend${stdenv.hostPlatform.extensions.executable} $out/bin/git-http-backend
ln -s $out/share/git/contrib/git-jump/git-jump $out/bin/git-jump
''
+ lib.optionalString perlSupport ''
makeWrapper $out/share/git/contrib/git-jump/git-jump $out/bin/git-jump \
--prefix PATH : "${gitJumpBinPath}"
# wrap perl commands
makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/libexec/git-core/git-credential-netrc \
--set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
@@ -414,6 +422,10 @@ stdenv.mkDerivation (finalAttrs: {
done
''
+ lib.optionalString pythonSupport ''
patchShebangs $out/share/git/contrib/fast-import/import-zips.py
''
+ (
if svnSupport then
''

View File

@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
substitute,
nodejs,
gnutar,
makeBinaryWrapper,
@@ -17,14 +18,24 @@ stdenv.mkDerivation (finalAttrs: {
owner = "jdalrymple";
repo = "gitbeaker";
tag = finalAttrs.version;
hash = "sha256-EVxDUEuxCnMiqqsKFs9JpRVJ86d9hW22K4a4we8eoJA=";
};
hash = "sha256-zGcSilIQUKn7iMGFkDZuvPZZM9UcZadczelB7JgVYb4=";
patches = [
# Remove this when updating since upstream migrated to pnpm
# https://github.com/jdalrymple/gitbeaker/blob/main/package.json#L59
./yarn-4.14-support.patch
];
# Remove when updating since upstream migrated to pnpm
# https://github.com/jdalrymple/gitbeaker/blob/main/package.json#L61
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry_4.lockfileVersion
];
})
}
'';
};
# Set for the `nodejsInstall` hooks
npmWorkspace = "@gitbeaker/cli";
@@ -42,8 +53,8 @@ stdenv.mkDerivation (finalAttrs: {
missingHashes = ./missing-hashes.json;
offlineCache = yarn-berry_4.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes patches;
hash = "sha256-RTgdHicbfbJbToif51TchLCfdIPZynvT0n/KwrydLYU=";
inherit (finalAttrs) src missingHashes;
hash = "sha256-OMsa/4pRyZVjgYPfYsaj1D+auKOHRAXKtEDYWenI33I=";
};
buildPhase = ''

View File

@@ -17,6 +17,6 @@ diff --git a/yarn.lock b/yarn.lock
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0

View File

@@ -37,6 +37,7 @@ let
gdk-pixbuf
harfbuzz
glib.out
gobject-introspection
];
in
stdenv.mkDerivation (finalAttrs: {

View File

@@ -15,6 +15,9 @@ stdenv.mkDerivation (finalAttrs: {
pname = "glibmm";
version = "2.66.8";
__structuredAttrs = true;
strictDeps = true;
src = fetchurl {
url = "mirror://gnome/sources/glibmm/${lib.versions.majorMinor finalAttrs.version}/glibmm-${finalAttrs.version}.tar.xz";
hash = "sha256-ZPEdO5WiTiqNQWbs/1GHMPeezCciLvQfr3x+A0D8kyk=";
@@ -42,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru = {
updateScript = gnome.updateScript {
packageName = "glibmm";
attrPath = "glibmm_2_4";
versionPolicy = "odd-unstable";
freeze = true;
};

View File

@@ -15,6 +15,9 @@ stdenv.mkDerivation (finalAttrs: {
pname = "glibmm";
version = "2.88.1";
__structuredAttrs = true;
strictDeps = true;
outputs = [
"out"
"dev"

View File

@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "goawk";
version = "1.32.0";
version = "1.31.0";
src = fetchFromGitHub {
owner = "benhoyt";
repo = "goawk";
rev = "v${finalAttrs.version}";
hash = "sha256-eYybVWqaN9iSoMe2HG0dOyzaYZOmYJsV8RN1Q2w2L6w=";
hash = "sha256-Luz6boPGIJqF/PJHZmnu3zChT5g8Wt37eOMtFS7j2pI=";
};
vendorHash = null;

Some files were not shown because too many files have changed in this diff Show More