From d577374140454293ffbb2fe6e20ff822281a69fe Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sat, 14 Feb 2026 11:31:02 +0100 Subject: [PATCH 1/5] prettier: Update Yarn hash as part of package update Otherwise it can't build. --- pkgs/by-name/pr/prettier/package.nix | 5 +++-- pkgs/by-name/pr/prettier/update.sh | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prettier/package.nix b/pkgs/by-name/pr/prettier/package.nix index 791506a71b0f..ecc0d1cbf653 100644 --- a/pkgs/by-name/pr/prettier/package.nix +++ b/pkgs/by-name/pr/prettier/package.nix @@ -68,6 +68,7 @@ let pathAbsoluteNaive -> ${pathAbsoluteNaive} pathAbsoluteFallback -> ${pathAbsoluteFallback} '' throw "${plugin.pname}: does not provide parse-able entry point"; + yarnHash = "sha256-dpxzbtWyXsHS6tH6DJ9OqSsUSc+YqYeAPJYb95Qy5wQ="; in stdenv.mkDerivation (finalAttrs: { pname = "prettier"; @@ -89,8 +90,8 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes patches; - hash = "sha256-+cDMrVwkTU5rYOQ7d2TqpsYx5F4JVZCpmf1vjOBhZ3M="; + inherit (finalAttrs) src missingHashes; + hash = yarnHash; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/prettier/update.sh b/pkgs/by-name/pr/prettier/update.sh index 623a5a8f0d63..3013d3f75bea 100755 --- a/pkgs/by-name/pr/prettier/update.sh +++ b/pkgs/by-name/pr/prettier/update.sh @@ -45,4 +45,7 @@ update-source-version "${package}" "${latest_version}" echo "Update yarn offline cache hash…" nix-build --attr "${package}.src" yarn-berry-fetcher missing-hashes result/yarn.lock >"${package_dir}/missing-hashes.json" +yarn_hash="$(yarn-berry-fetcher prefetch result/yarn.lock "${package_dir}/missing-hashes.json")" rm -f "${package_dir}/package.json" + +sed --in-place --expression='s/yarnHash = ".*"/yarnHash = "'${yarn_hash}'"/' "${package_dir}/package.nix" From 0cdb062a2241966f3a09757c6b8a6910eb4b6fce Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sat, 14 Feb 2026 11:31:43 +0100 Subject: [PATCH 2/5] prettier: 3.6.2 -. 3.8.1 --- pkgs/by-name/pr/prettier/missing-hashes.json | 149 ++++++++++--------- pkgs/by-name/pr/prettier/package.nix | 8 +- 2 files changed, 83 insertions(+), 74 deletions(-) diff --git a/pkgs/by-name/pr/prettier/missing-hashes.json b/pkgs/by-name/pr/prettier/missing-hashes.json index 48b570c426e2..e82a4ce88272 100644 --- a/pkgs/by-name/pr/prettier/missing-hashes.json +++ b/pkgs/by-name/pr/prettier/missing-hashes.json @@ -1,72 +1,81 @@ { - "@esbuild/aix-ppc64@npm:0.25.5": "098d4c3ebe965823ee43fa708457c768caea59a5fab521e1129fbf1bc47dadf8319d7170e25a91a6af779a3b91cf4ce0b01a053410fe796b2235c262f7008e30", - "@esbuild/android-arm64@npm:0.25.5": "0a3b0db67072835d003519a7b297f2618b8c65cf168be7421656a3eaa7240499e3f89708e5aec507007bf8637f486dd4a2aeb48183702a5a8d0ee29432c22c8d", - "@esbuild/android-arm@npm:0.25.5": "3f85e15beb85467d5ac0bd19774fca6db353f4927a792c2281302e0f29f66931eb4ceac61216e19d9b21a5fc90c556b58bf54b4ed9d3205e81ecba16cff842d9", - "@esbuild/android-x64@npm:0.25.5": "2033f7eb50910b4b9f8064926a8d2baf62597230dc07fd931c8def2022bc8d8e15c3ed7aa892041b6605b24d31e80afeb03e59cf7b0dc2f88a6959b821defd58", - "@esbuild/darwin-arm64@npm:0.25.5": "08d7238c6ea25cbf7de55ab2378b8bf3bf3d36de9bb3ca9fca15c41e5cec6cfcc619b2cbefd0d71722bd780ef5d1bcff5246b1676b62d131673532aa14e6ae5f", - "@esbuild/darwin-x64@npm:0.25.5": "274767e53270755c1d1814eddd25a20e6ebd68cdf8432303d9e73b45a782579a4a898ffd68920f4052c4a5ba6ca85e59ba1a87e0005b94cac98e479e3f623a22", - "@esbuild/freebsd-arm64@npm:0.25.5": "b9ef91ca56536e988a72009c04e95f4ce18a6439151029d736c6df2af97a753f5b55f73d14da76c2c22693592a9468d57435af72bf535b2731b8fdda2aadb930", - "@esbuild/freebsd-x64@npm:0.25.5": "8b6f53b0c0ffc7770ab078d694b705ca0169e08e0a88849fb0a54280e55f7339abc26aee969799ba6ee725b494653fc7188dc184d2f318be78506132b5e8f955", - "@esbuild/linux-arm64@npm:0.25.5": "c0e1925988f0b07aa8c4712f04f3cc858b52d7180ba1600c311206eeef023dbd6f0a00cb2d50fbd81064c15e69502ab95aabb433318638a5af0d9a4bd02f7294", - "@esbuild/linux-arm@npm:0.25.5": "b14daff5e6b0e9d6a613e6f11a6c0c4c1a275effe762383e6b3461c6318ec371f69d8c512bda475d634154ded6e0269345fb58281ca64c406d9dd0acfdfcf042", - "@esbuild/linux-ia32@npm:0.25.5": "f962303d6dd5062bf8cfa31801c43c4ecf2c33cf42e8e4abbcbbea2d54619ba8bd0700a342e94e13deff856e6985e50f31bf97af283b26ff36b185da40a0f7a3", - "@esbuild/linux-loong64@npm:0.25.5": "884863922180e39e9ae05c93f0d5e4e52627416237d892dca80f39bd1ce94c24920868cdeb8a8378b384332343c2b76bd7eba0ab56defaa4fa942bc361941a46", - "@esbuild/linux-mips64el@npm:0.25.5": "90da507ace130201e4653e08187b6ec95d4acb9acf37fbd14f7c0aa60ac299cb9a8a2cc1c8541e376ac14206e10abc52e99bd2c1614dce53f6f66d00165671df", - "@esbuild/linux-ppc64@npm:0.25.5": "1a82c32464c6e446bba510c5cafff685c113cadc3f65966465a54bed455cfc737ea3c11628785cd4ad8b169be03ef3b3c3e46b4ecd3e1a64a501d6ae3aa500d0", - "@esbuild/linux-riscv64@npm:0.25.5": "d9f49b01639ec4ceebf5455151e2632191a2bc0d96ba27ba661f4b97e314c1496a99ed5ea2d3c0bddbcf9da09bf1c06ba8f94bcab283a2f181a1c2c514848631", - "@esbuild/linux-s390x@npm:0.25.5": "14ce910d0ed879bf6549c4892a020e2a652fe5cbf8897a7a967ba20801e89582e70a3567659b96049a789a6b3fa5b34b330f4002de51f87bc734a2c83d8089a8", - "@esbuild/linux-x64@npm:0.25.5": "31edf2a53f0dede747f57405d2d9e277b1ae25e40eef7a7567b8d9c11c0d23c7aa6d4f94493f5295f95dc0f75a77f8cf3a52144501a6db7bf914cff8a5370258", - "@esbuild/netbsd-arm64@npm:0.25.5": "d35b97cf24a5f7e32e880b40a451c7409959acb26c9adaba1c4d5d469853982ce7e5f5e6ff33f32bde78d400c869923d2933d1620779d127e95a693422b4cc07", - "@esbuild/netbsd-x64@npm:0.25.5": "7a8ecc712deda1af96de426998f39934ed5fad0cdb12b13ff31170c9dfe44f679d179c16dca7db2d686044a941a7addb9378a01f15b25efe424453ac61a0031f", - "@esbuild/openbsd-arm64@npm:0.25.5": "9e1ccd8e6cc87b7f8c83b8fb7091b98078ac96e18d58c7a45c22c981e58be1f86d8328d48906a1869226edf1a21e62eba64e43dd2aed9046a57795ed31b8d617", - "@esbuild/openbsd-x64@npm:0.25.5": "a13696c3b5ea9971df702c3c6cf8ddd17490d4becd3c2596a33230e53523c2d8d11d43857973d06292ad6670163e42ca6203dbad5a4f708f250d2d5fc23dc4d0", - "@esbuild/sunos-x64@npm:0.25.5": "87789cae50b1aacd24d3f25b903d8016f370c6bc9c2618c243283921eea00119728e824c052fb41056ab7a5c8295442b32f598343788117499fb4145f52b6795", - "@esbuild/win32-arm64@npm:0.25.5": "4a02984bb78737aec94eac24347be38aa17e504dc7702b3de9cb59179d5df14a812ecab387ce7654e4e23e58ea7989079bdf90e515bbf774a66243387ad55c52", - "@esbuild/win32-ia32@npm:0.25.5": "e214bba446a70d3072c124f45b948af6dba335115c2f17b2bd64f64c1ef875db815cc7f6b5a57e2b9bec0bb76d7b4ebcd3afcb857b9b7e76a7c9d1a80ba0963e", - "@esbuild/win32-x64@npm:0.25.5": "4c6381c6dd3ab7c8aa9fdcda4faf0f08c0982c497348844c764d5b0f7b3d1ccb3fc5bf341057a79ce4fdbb8dcddc115a7b9d5af3ea247b3434d3d451a88c7072", - "@oxc-parser/binding-android-arm64@npm:0.75.0": "ffbf389dd3930f89c8730e6f2a19238fbab409d26d1daf18c023c42a1a0cded25b7f4dc961a7dacbb65c073566657e84902a09c645059bd6c7e278f1e95c6eaa", - "@oxc-parser/binding-darwin-arm64@npm:0.75.0": "14793b0a782e43eac2a1b2452ba813660cc28497f51e848217c21010ade67e1393b91f49d571e6741f26657c7499bf9eb49190077ff082ebead6c789244cee67", - "@oxc-parser/binding-darwin-x64@npm:0.75.0": "6f07df67a1311cb1c48e152afb0720b00efb716e0ca4a156b0a0bf7116b1eeaf2583fd420ca29d5d6fe90f4128c97caae704a9885995b16e5db6ec8b558d166e", - "@oxc-parser/binding-freebsd-x64@npm:0.75.0": "cc6ae75ff1d3d01cb56ced4dc5801a98ed8211a73b08001a4d88ca48e42796ab3e736c638afd7c95081739a0d50c5de1c9b2afe950752abc75c7f0af7152f5ff", - "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.75.0": "84476e3d2792cf589bf1217b22d6108cbd925b30b0910ed1970a221264a2d99da9e53343158f26b310e1f662dc576b128a3035c36c53d9e870379e6a93324085", - "@oxc-parser/binding-linux-arm-musleabihf@npm:0.75.0": "f9b9c0b6170394e7cce5f6f48ad7484871f324ed078f861cfd577910e392e4a4350f912d8591b3678451748f3b1a4d90ff181fd642540d03f745c2f7ad6760dc", - "@oxc-parser/binding-linux-arm64-gnu@npm:0.75.0": "d0f232b73675c496f12f49351a1f4374e450ada0735ba81113fe3d834ad0475aaa7785a6a4636500e4cea2a51c19c15d0f88395e411eaf801ddc42c397cf3df7", - "@oxc-parser/binding-linux-arm64-musl@npm:0.75.0": "f849e9c9e1d6875dc5244ca86391d63ec46c165c6afb3cb1b6ae99254db83c9a4da1167dbdb32f08ae51352ba5d57267b6cdd8c53eff0962e9ca1ddd4285fc94", - "@oxc-parser/binding-linux-riscv64-gnu@npm:0.75.0": "bfd17943ac7292388736621ef19fe1d4eac9e0a52386ee4d6969be3ae34ace8bdf2dc2bce60e3be8f94a91eea1095a9ff02dd88891e985f91bd741e944d59fd6", - "@oxc-parser/binding-linux-s390x-gnu@npm:0.75.0": "002c4e8f27c73fedab9b7a1792b4e5887edef4953e209b444a468698acd32e26789c28b9ec0bf9a2c6d2057e47db5975ba507820b7bbc1219001e92d2dd034dd", - "@oxc-parser/binding-linux-x64-gnu@npm:0.75.0": "430a01fc11a8d8b7a98f8af0ffe9a8f58d3c3b0443657cee8cc65dc951dab36607bf991a878e22783316a25cf734b9d09bd6e8db04d217c7f0415cee2da7a802", - "@oxc-parser/binding-linux-x64-musl@npm:0.75.0": "b6d45f29ccf955440d44b021716b1e7568423bf70a7e604fd4d6cef8838a40e1610fab2aa86fd502bba803c042806b3edde065b214960811b6b4991ca0d80402", - "@oxc-parser/binding-wasm32-wasi@npm:0.75.0": "98498e1911bf7cf75930d388a5b27e3912554637ec28fbff82746b46958e23251ea4537d0b5364a923c9dd62eaeec2fd48e0d9e633ef3fcc636db478e705efc8", - "@oxc-parser/binding-win32-arm64-msvc@npm:0.75.0": "c7cded4af688cbf460ae2104fcda8bc920d94d5f9fe3d9c81e751e815344e0a6caab806c7bd63c4ceb19e9eccbbba66b1d298d3c20b6da3d1b353ef6a213f8ce", - "@oxc-parser/binding-win32-x64-msvc@npm:0.75.0": "c518f673f8a03394d7a58f6015e9c54693ff039dba82deef84ebf46414a4b2a1ff596023d40133866e8de2def50a3bc866b6fcfa5954dcec8a8de47252981f08", - "@oxc-resolver/binding-darwin-arm64@npm:11.2.0": "e372a937dd7023a600c0bf65bda92ab17a7456738bd67425c0586e10391d61cdd46e52d89f8ae64c96bdcb8f6b8d8f6dc2327f88a6bb6a56d75dfaf3239011e8", - "@oxc-resolver/binding-darwin-x64@npm:11.2.0": "811e8bc26c7c49fcf55980bd43eaec43e8741478030eba80cfbf0768706e8dec4b228adc621e82b971356046cb5d64da9caf596baf429439ac6e72ca98ca265f", - "@oxc-resolver/binding-freebsd-x64@npm:11.2.0": "29ecf9af4df5c2289677fb1c7cdba86178d829070065b4e4fdc14bf316ce7d83b8a26cb43bca70bcc759caf53b372727dba40a5b75d2975c18bb00ce1b9e0430", - "@oxc-resolver/binding-linux-arm-gnueabihf@npm:11.2.0": "05a919357edc9334384f75b75f004f1380435d62aeb6f83a98ebbdbf0006a57808a4da5b85580c5658b15643f0c6ad2a7b872f80f321053b58705da803fab201", - "@oxc-resolver/binding-linux-arm64-gnu@npm:11.2.0": "20176fdde6e834ab963b19eb0dc0440c0dbd218e70d42c907ecb53f9444038f534871115549cf18b545d2e51b9c52af549ef49d043ba69e6ce4fdad0e72af768", - "@oxc-resolver/binding-linux-arm64-musl@npm:11.2.0": "518dce0dc638179d1e20d9b7ad90d71cbc89432df660c39d1d1c61a51ec9cdd0de0c046efee8afd80734410320d592433ae9cd0e227d9f2f8821bac5d28bf581", - "@oxc-resolver/binding-linux-riscv64-gnu@npm:11.2.0": "0b1648c4d838fc3269af744d9bea732078c5545f5fd6bcd8141550c244927ca968eda6f59b9ea6ff71960c5312e711c27994f98aabe92ff039644a67140ff1bf", - "@oxc-resolver/binding-linux-s390x-gnu@npm:11.2.0": "39b489ba03d1ed364cab5b4224670e95c984d7775fd9296aa0ed54ec7da20af23c729e8a900f7f28ad81ee7be8ed3b187f4904813ef2fd03a1485ebba4489f46", - "@oxc-resolver/binding-linux-x64-gnu@npm:11.2.0": "330a0bc725b9d090f77a1dea372118a6959d958090358fb12e48ecb9cd498facc2fcc306229f88addea5303f350238d645bf116447b4b6c388aba84a7f2accdb", - "@oxc-resolver/binding-linux-x64-musl@npm:11.2.0": "1e2f22c8f0130f9556f4ea3f6a208d8e8697a9983aab40f2e75c9b18330a952244f5ffb624114dafe6b91eac090b341e6cd83567cf415e24a31d7c927ffdeba5", - "@oxc-resolver/binding-wasm32-wasi@npm:11.2.0": "d94a7788a293b6a77b34e07dd198d451b43478196b55d86727636cd56643ef133113d6c9904fe33c2ea330683f68bf8aeb1e0a360740976036c13578729ebdc6", - "@oxc-resolver/binding-win32-arm64-msvc@npm:11.2.0": "3342de93cda0d7787d496a2434c41bca0e3641fa3ed381bd1a53b02afdb16dd76b4cc4bb062e7b238d5964ba3f8220e771233ce7c4bbd7a79f2c8c61139b4f2c", - "@oxc-resolver/binding-win32-x64-msvc@npm:11.2.0": "4a6929145a189b998f46bc0826d736f11039bcd3fc5bba7a3c06bd81130f24721cf849232d01ca45f017ad01cbe66316c36530bf2b362e1dcc23b70d1a174650", - "@unrs/resolver-binding-darwin-arm64@npm:1.7.11": "d7ba4ca14ae2e1787312b5c1e4ad33a91a0d19578c58176604bebbfd727d9c21bd4cf0d105f48a7e224968bdf3cd53b3b9ec8b6d882b2baf22624ac8ccaf2e2b", - "@unrs/resolver-binding-darwin-x64@npm:1.7.11": "615bd56e1534c33f3636b999c8f74ff8350301c0b2396f4289e5b984ddddf09537d973fe92d5e7e5cd145c2d4384a9663362ebf367f8b7534ab398043b189c2d", - "@unrs/resolver-binding-freebsd-x64@npm:1.7.11": "33981db9d3bc4bb0f7682ef5ba51cb9ad9eb51d8f5c62703f17524000fa9c38f21d1c566474efcf0d8637be8ffad3b510214908387238633da3282b477018502", - "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.7.11": "0a12a184a31d5ce33d11d5d424a3f3ac68c15594f6cb71e0c8670cfca585e24b1f22b022f9abc0f4a93b844f5232a3b660e4c8cb8df0480a3bef3e3ae994d7fa", - "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.7.11": "c8540d77a0dc7354e6c61d988d242b0013ce923790828671e13bc12db216fc04e72da8a241c815d66194df6a69d959bddf20d4bf72139f33b7c41579078e3d15", - "@unrs/resolver-binding-linux-arm64-gnu@npm:1.7.11": "b0f1126eea72b1932091eb78fdd4a9556973a120b11d29a8501aa4000120d719859e373daf80f83096d301879b0ee8e5209e716a1f0d2a873e880ff9fbe59985", - "@unrs/resolver-binding-linux-arm64-musl@npm:1.7.11": "4d3a716fdb227a30c963c9c2783839783577941885b9bcae214529550e8786d503756a1f32969d0ef5a76fbe9293c865dc4cbc998a19b0aba3c404c1508c246e", - "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.7.11": "2fa07f67eeb0131e13c474a3d9031d7b2aa79388fd033a885b4c188c1c3a6392e3393949a4870b6050d4987e7fc6bc32fd602016878f76b135bcc381b99b87d7", - "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.7.11": "0df9391c8149f14939c227c007f974921b831af2fac907325191f7d59cc3a08c097e569c16564d2053202fc1fdd3e079853729f4428ba05561cc729313789d65", - "@unrs/resolver-binding-linux-riscv64-musl@npm:1.7.11": "10e1aeac0c690651d3c6ad3450da853a2421215a5a39373b67ca3dc50463f9194e5ee89fd2cb1943330e8c40f81ef6fde5b7ab86e6a2b20651b4de0d9fbe40a7", - "@unrs/resolver-binding-linux-s390x-gnu@npm:1.7.11": "c3258f7a68bece5e196d9da37105d416d833484ea59d23849d9acb69f9d12205a8dfac6cd5ba09c185276c923f460bafdb5607abe8aff3cda4213cd9ff11a2ee", - "@unrs/resolver-binding-linux-x64-gnu@npm:1.7.11": "937493b8986b3b39866c6955e6b64cb04365b4940ca1d78d3ebb37365087326c4ffad404e03977d50d190c765670c1e82629a6f842dba30f08845f47c4f8cb71", - "@unrs/resolver-binding-linux-x64-musl@npm:1.7.11": "bec6e6105cefc9e927c66cc378cce466c9e560a96b100dde914c12c1ed2111172363813609ea0075187cc74a6f863591da72dc9f437b768b5b29e3a4b349d72c", - "@unrs/resolver-binding-wasm32-wasi@npm:1.7.11": "e4875afc3026b934da497a7426c5092094a63162a229119f750a2a7133c3fef1b4e79e4d8068aafd14b69475c0f137f3369d38e646a97a578a839c4235a793f6", - "@unrs/resolver-binding-win32-arm64-msvc@npm:1.7.11": "5db590463e19b572d89414da9377cbb027ec8c4ad9987895925ff497ffbad4e2bcad577e0308cb8842d66d8c697ace5d20d22756317d7b055b187eadc00b4236", - "@unrs/resolver-binding-win32-ia32-msvc@npm:1.7.11": "c30223076e76dfd69c1ee4fe3735adca56bbfed874ab9b09baebe6b4e9d33b23a49bc068b31812a3c7aba54f026209c91d4921d9402d8c376045095528d07513", - "@unrs/resolver-binding-win32-x64-msvc@npm:1.7.11": "1ddf771f3aea07a590869ad9bdb59f9c896cfdd489941978e554f54a07c8f175e7d34bdae64b0749580d7c1cb522d66529a5a578ac77c60222c1cd78fa7af68f" + "@esbuild/aix-ppc64@npm:0.27.0": "a2ca52fdd0d14ed54b30f13cfa4792635cd3f5316194059c80693bcd004e303c30b687837cb50135ef7662977c53670ec6bfc62a199f905b06272326ecbc01e0", + "@esbuild/android-arm64@npm:0.27.0": "fbeff03846e18887d3f7e167e186ac31bc7ae4bccbc9e30c5f44d9070dd1b7f60162c73d4b05474fa7488a2e8b19b38f23a7f393cf7c4e4f742782c989c4dd58", + "@esbuild/android-arm@npm:0.27.0": "b89b4ed9ab236cb26c82714f691f9a34889091c486678bab3adc5732e6ca39c1c1981ca2986387025eb85605cef97da93c36134da8cbeb574531aeaac2e9d841", + "@esbuild/android-x64@npm:0.27.0": "b4567ca295f9aad8b75c1c9586c9219c6494859611d03c906a1fc31dffec8120591f37e4ff2f3e8329027662ab3501a8f4cab6d35ddae10b2422296e974df716", + "@esbuild/darwin-arm64@npm:0.27.0": "5bff3ed7158f73866f9a4e80a8a407f0ef326c34ece1bd6b62a792b219471e0e58f852e256823a3e8fb6a667a9b1f5b901ab2247c0bef3e4df079328ded3035e", + "@esbuild/darwin-x64@npm:0.27.0": "bb723cb91f9f76905d7e61125e7a01a9b1e43501e48bb4411e7df87c3e6b1520114d9dba1bb1eedb41412a894f5128294e31f8fe8c9e614d7f8e10acf2729e6f", + "@esbuild/freebsd-arm64@npm:0.27.0": "a48ebc756ee45f74c2edb47674a99288ff48438622afdf9cf6f36a9b260558ec06c09645dfbee84fc7389be53b174907a2bc3f5cbc3e729720d512fdf2d73c31", + "@esbuild/freebsd-x64@npm:0.27.0": "baa873cde5d6902b130e6193afa3d15db82d0fc9d87e83cf53330a85ae813f498fbd8ed287ac302b745ce9abeb7d551b49da9ee6029c4f18cfd7aea6c593b44c", + "@esbuild/linux-arm64@npm:0.27.0": "9a2086d7f044574bf92a841d9e904d7ab556561400f45faa60999d3c26bb88fffb0b0c23d50fe7fd8f5af9d2c8dd42293b1956118fa1703c6c6106b5b166affd", + "@esbuild/linux-arm@npm:0.27.0": "fca02378927bd2b9e79044aa4d8d12a86a7166cc170ca181840749a0336f1fe934c0b57903447642d4a0c78d89efecf26dc6267fba615e6c34844cd33d4e5ef2", + "@esbuild/linux-ia32@npm:0.27.0": "84592030cafe4df7acc412fe6896c409d6759bcb1ddeea0399413dc4ca351e592aa4cb98cfbc62cbf6d96cf45440ad64a20e5b6680b2ba268cd3f73439245865", + "@esbuild/linux-loong64@npm:0.27.0": "61e5964361208c18201b794bb1adc94b49f0522b9d07ff7d3172c639cb6745c93cccdfcc1e235574b73a98f7b84ed34a24bb4f4aabaf83232f5905e7040da2a1", + "@esbuild/linux-mips64el@npm:0.27.0": "4c7d2f27e2985bae6a15a8575dd009c574d8b37f4a10a192eb8eb6c99113b32d9a1d0dfc75fcd686c1f6f9c8156d690ed8488ae7b44f47de47787df2afd8a0a2", + "@esbuild/linux-ppc64@npm:0.27.0": "3b89ad3037e6293965c3228538886164ed499ae54471520c0c3a37d05d7485ca148c9e08dcfbc8eb5479d12e4ae4d5d786b8dd854f031548a390ae7f59c505e5", + "@esbuild/linux-riscv64@npm:0.27.0": "91a6cf3ed8b9c98f1cf9056c160c070581f3020a29c1bd8e664a8a13414bd2dd5f1a1ad95c4ce6bed8849fb7a82cb195c47cd6bfada61876a76668371636286b", + "@esbuild/linux-s390x@npm:0.27.0": "0be7179d33e7a985b717e6dd4a40ce6315714cf41075ef455f60fad88217fd9455f0d6434109b270c33979255361b8a894f1152bfa629798ae520fa97e98a71d", + "@esbuild/linux-x64@npm:0.27.0": "591315fd88c446bb5940dfcf9878116bc60d757b72566f905dc93aeb2b9e7b9998bd70442aa5f7772a102c87ecc131d7561941c2aeb475786a91651c0666bdcd", + "@esbuild/netbsd-arm64@npm:0.27.0": "54fdc4bcbe40945c6ba84ec133c94be1e8dec7dc1bde6d5d8675244e72689640300e99485c4feb87f118ffbe8ada58a519fe99a4342cdca052636da587fb2333", + "@esbuild/netbsd-x64@npm:0.27.0": "7d2a840fc0c9977555b4afb3070c56fab56765f5b10d9a93b6cbc78550e47366e5bc1b6221df1895a19a5a9de856780ac1b7e8634e4d54416dd1db26d3001831", + "@esbuild/openbsd-arm64@npm:0.27.0": "ae418b74912c55b0445bdc0efa4f183c2ee5af6c2a09057380c8311421ccb57f0c38170f2bb035ebf05d51864704570a5917f617b779135ed312bb1ec2917d3e", + "@esbuild/openbsd-x64@npm:0.27.0": "178c015043f641105d280a2b2649f46b7d3666a130ab1f808969d83f55d44c8d15fb0971905c4a594eb56b5b4ea805ddc03cb8c504650e5a7167fca3675d548b", + "@esbuild/openharmony-arm64@npm:0.27.0": "736634e14e01e13f9567e751b53bea51a511aab5b63ec73cbf499d252badc3695c573ce70b88d3a6e4b5b991ece2f11bc9152b8e4ee57b0c863df846af73e360", + "@esbuild/sunos-x64@npm:0.27.0": "397ea01ebf2d2a6359d04e6498eb12b5e0ad68688620a73392b72bee9c1ff4e8435d6717dd6148344f8c918eed40fbdcfabe05a378bc121c6572d146b3cd6672", + "@esbuild/win32-arm64@npm:0.27.0": "0764563ecbfcad9c5468ff73e415a5ab2379471d5eccc6077baa81efe7965954da040f79095bfc021a8d717908b7c19cee80017b1dca8fdf1dc565f47d7334c1", + "@esbuild/win32-ia32@npm:0.27.0": "94252e06dc62e4b3774f2d881bb5cac43c430895f32e61b53ad06f034ed75dc87a45891cf1c0281388e2ca39e7d44e33c42bf4e113e67001359be5a4542ffa93", + "@esbuild/win32-x64@npm:0.27.0": "fd6554d61494458b8f08e6bee8ea5d08b4885f9f9ed765caab9b13430238f7a0d6cb85136eaef439acfed7740abe864d2ba198d39e12a405d73abde641e7f448", + "@oxc-parser/binding-android-arm64@npm:0.99.0": "67f5d78706eb18c381da059ae3c47bce9d1e24c35cdf4d9b060b0f8a3654143e39c0ea2204b5eec83f19742a53ab42581ce71ccd218ba3b62b92c3ed13ea9403", + "@oxc-parser/binding-darwin-arm64@npm:0.99.0": "d822bf4aca7f46327c3f34c627434924b9c08b5077d313fdb6bc6f5ecfec6cef3887ea77c7c3bbe88ae62004cfcfa28fe8ee1907e0277cf61b6187ca0dca718c", + "@oxc-parser/binding-darwin-x64@npm:0.99.0": "06b7e5fed0e72a4b205336a79e6bb8fcbd28e30187c7af53df01762bebcff5d4ce3ed68808cebee50cc07017f2863406d0001b930f330424e39a2f05703bab14", + "@oxc-parser/binding-freebsd-x64@npm:0.99.0": "715114d0c25c28c183e11dc6ee71d873bbd2d3725863b2d6c1e68d61751770fb53dd87df263f9781c7069b7c6a54eb0a1bf68eaf24526209a2a78b284517326f", + "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.99.0": "830974d13180cfee4529dbf7b392268c84b530a2c087603bae467db37ad515ac0f1bc77dddb6b3f06680534719802e44f458ab423012c01ccdd7253542902f7f", + "@oxc-parser/binding-linux-arm-musleabihf@npm:0.99.0": "2c00ed90f4bda8ffa9160dea79aeaedaf4c281c0b567e46ac2a6e44c96daccb7d432afc4bd2ac016fde6c976f47d05fe36d43d426e93db301c3079d8dbbbae2d", + "@oxc-parser/binding-linux-arm64-gnu@npm:0.99.0": "2105b990aea1025febf4b3271838b680d7944e10c9e7b75a8356c06a5223482191f12f61d262d85c3d4a64eed0e208cb08d83b8530c487326c6137d50f09e6c4", + "@oxc-parser/binding-linux-arm64-musl@npm:0.99.0": "028e47ff6cd4a0ea83a7ded4f4ca505a42de9d97035b069c21f264f491e494817987ca1666bf5da62e79387065f8950a000314a1d9a499984b640e5ba44caa82", + "@oxc-parser/binding-linux-riscv64-gnu@npm:0.99.0": "a8f4d2992cf67f6406246f0b4da7db40e69ddd4c8cd41afd98fe6131e058bac553fe7e8fcbb6d03416ba8fe715fa38881ffcf5894e9b2745a819e66394489529", + "@oxc-parser/binding-linux-s390x-gnu@npm:0.99.0": "93aa18a75a4c0bb5d44e8f8e3a13ef02aec1fb337fa1d22213abe851fc2973ea9b6079f768640b8460460398c3f182732ed062bacf26cdfbec6e455aa21e59b2", + "@oxc-parser/binding-linux-x64-gnu@npm:0.99.0": "83eff6a63048989bfc1f5f710350d239a93c71491d8bce641f249f73f85fa7d5456d15df2ce53317782fe11ec1b3abd5cdc78994a71fb69642f5c0fb2012c0e1", + "@oxc-parser/binding-linux-x64-musl@npm:0.99.0": "3d424f14be5adcf90c16a9fd85ec5fd5e790529f4b559a404a0a19732749a0e89f12c7360fd14c5974a3b8bc56d731289c33b8fb88e8db4c234884b5832108cd", + "@oxc-parser/binding-wasm32-wasi@npm:0.99.0": "77e3eddf6de9d41666cd16046c39a7db8808328844e591d9aa1018165ebacc401b0a02e0c8a2101e028760c63687064a704b053b9ac5534c12aa063c64deaf43", + "@oxc-parser/binding-win32-arm64-msvc@npm:0.99.0": "de68b6c17c68bdd0b99507e346ead518fa7213d4ee2965c5ac934276c44e4d2588158a68370a67ab99cc3d57d251a8f5b079bbddb43f1ab1c39a08eba071830c", + "@oxc-parser/binding-win32-x64-msvc@npm:0.99.0": "d10d5202611f73257c6479dc90212dbdab3e298fe5a54d5e2942504bf33793235018d43234490f2192511277e38fccc6486408a85ab482c9d197609ff837dbe1", + "@oxc-resolver/binding-android-arm-eabi@npm:11.13.2": "7433ba278c276c8727ce61d380b468ce7c0a8d95178710978229c5e9474a6a36fcbc13c220d25bf027d423eb54ae5ed665fabc2203f429bb55f227f50afb7a85", + "@oxc-resolver/binding-android-arm64@npm:11.13.2": "3f809e1faf8078fbde69dbf8fc6874587a99707153010f6c1adca0759fe20860f8b4d47830f9055215801903c3c663e6c141bc83d327a0726429e4c322ab13c6", + "@oxc-resolver/binding-darwin-arm64@npm:11.13.2": "bc623cbf2983d133f1db852f9526e861c3eba1868687ac18c176995f9963677a7cb8d21dcde0409579bf348461610469f66ae9754dc0378efa30a1761280f8cf", + "@oxc-resolver/binding-darwin-x64@npm:11.13.2": "576dcb841d09e5a20d76b9b8aaa245ef8c7b51a22e9fb03780e0bc9fbfc24a097cc947d8e8d02a31739f08e269e9031fc4c45fcdfad81a83fbc11504573adb5d", + "@oxc-resolver/binding-freebsd-x64@npm:11.13.2": "4003ff07f4faf4e8fe4176ca8f37cc0c16365852f5a24c082f761067b922451cd227bcfceadd7d2ac6ef65ce6a96177cddf42f03595761ea65127a5fbfb09d88", + "@oxc-resolver/binding-linux-arm-gnueabihf@npm:11.13.2": "8ab3605ee226f3486f449d96f440b99bef0335640d2babebc3a180ea25cba34e0ea1b117e702b8f62e6ce889b3cdcf309010dc7f41cf2bdbcbf48206e669f23d", + "@oxc-resolver/binding-linux-arm-musleabihf@npm:11.13.2": "1e556acdfc4e68c6dc139ae48c2ddc754a2852bc6c4857baa2131971910353e711cfd546e63b610dade6c012e90f750643ca9739f4f72472038f40aaaf8d72b7", + "@oxc-resolver/binding-linux-arm64-gnu@npm:11.13.2": "8ff507dde692731dec867437d649bc1a5a3d7cca7136e129291a88812356a875388255ab2c00b03687649c32e07b94a7d780cc8c305513889bdd8d344d2fb329", + "@oxc-resolver/binding-linux-arm64-musl@npm:11.13.2": "1f8741d4ef260e24485b3d8304b8ffdd8ca8e0ee98ded0e0462e53da48de52500ed4637a104e3cd3ba1c62c59b89407c76f9bb82299a949c5bf2c27210bb50ec", + "@oxc-resolver/binding-linux-ppc64-gnu@npm:11.13.2": "bf9b9ade08c7b8bc11c613b46ee911544760c2d8b2f5947353fd13482f14a6f969afde66d7277deb8a469e09bcde2ae95d855623e75d24e0152b49176508a221", + "@oxc-resolver/binding-linux-riscv64-gnu@npm:11.13.2": "d1018d409b429194be4e84a6b7549ce364f72130de567071d7722c594e5b2478d8897cfb5c726732aeefcab8ad5995a6ef3e207c8ae39a839397635a457ae67a", + "@oxc-resolver/binding-linux-riscv64-musl@npm:11.13.2": "e3f05778e0f54eaed054876f2588be7241d58578d23c6f1d5905cf3e15d1c297586ad668015cad5b0c461869ef72b0b61429da68eac3bcba9a9951aeb899bb9d", + "@oxc-resolver/binding-linux-s390x-gnu@npm:11.13.2": "12a538c9e7cf53967e48053adc3f8ab54d2538ef9ca7946a02beb530f7eb0f822f5267875363d99dc58f0552e438f4173073a3592537891c32960ef40a19fe40", + "@oxc-resolver/binding-linux-x64-gnu@npm:11.13.2": "3ebb57542dcf4c2ebf0ede033f022e9ada9c3c26fd9e69e78dda59644419b1996a379070bf2f8689bb9c7942b4c02f820078a5a9ec0214dcdc838347cf6926fa", + "@oxc-resolver/binding-linux-x64-musl@npm:11.13.2": "882bff960eaa7392dbd25df5a69886ac1613360d406b32a6b548cda39772c0d2d407584930e4d2909c55cfff6f2db9b8519c0c94f55dfdd284cd3852614fc40f", + "@oxc-resolver/binding-wasm32-wasi@npm:11.13.2": "f252f01fde4b40d046a31ec70dd2493545a18b5d7da70b970b9311741701827219e4e27aace84cfb669b37360968810396993cd4e30a5c13832a68691546d419", + "@oxc-resolver/binding-win32-arm64-msvc@npm:11.13.2": "e23db915180d06f88c38d7b71e0397ba3ffdc6af2b15346662b4c3eed43cb6087893f0bddba333a26a87389f8be5314e68089439e6fc53e2b327eb3438320d68", + "@oxc-resolver/binding-win32-ia32-msvc@npm:11.13.2": "1e8c27b77cf8fb53e42e07295c23c1ececdad06fd2049e8efad6f0d7d6bbc790e53d034ff6835a686369e08a6f2e0ee5603a210b491e524d144d581b664f3834", + "@oxc-resolver/binding-win32-x64-msvc@npm:11.13.2": "ae00dd7c036b55c54c85be7c5a53b1af6a52967a9b0b3f95371c30f313bd642db991a3390f0874552fd800cdabc4dfd8238a2de0bec4a3aa7c7d852fca5be6c2", + "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "5c8769703d724915224711f718085f541d8558e95d8646c6cca5709f1f7dd00ce65d0e2d0bc03bb1c0c74d22d70d54cfc490176dbb7c6f5d06072365ec7ef6b6", + "@unrs/resolver-binding-android-arm64@npm:1.11.1": "7ab93a01b7f4cbc99bfaf8cd35a1454f78826bb2840f0387a19491cb4835b16d81d30ca2b4b71a43643f58aaceb83a63cd89274a3f16637e35887e67a93ea21e", + "@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "f8bd59a69ca200f9590a94de5699a0cecbcba120f5b82b2295468d36f943be48d957a8ca466f3fb30466abafee4a9672831c382ff9dea4ccdaa0a92992bb41b1", + "@unrs/resolver-binding-darwin-x64@npm:1.11.1": "423acf3a8032b6bde50fabcdeccd4c1954bbede56f8c2fc5134621fd957f931a08ad74b3690762e3e18e2f5f31f35dc93b826a1c2626031d218dc4b16d415efc", + "@unrs/resolver-binding-freebsd-x64@npm:1.11.1": "d6b88ea9447328f4f5e373e77524daa52d5630ecc7035ca67121082e2017a91dc9e3fd7b8230e41f1307137ee7487b0bc0c8a922dda1b77b01f735202486e36f", + "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.1": "d4a3248f64ab92ea680b3bd5f74c19f15c8f82eb1628e32aeaa058a7fd2efdbba4b5d4e011e453389e42e79cbf00847c79a172ef66d8c9b555feada7a2693772", + "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.1": "1426c4a182922d16b684cfaff9a2d1cc6ddb06eba6fbe966d8d5a88fc0ed6660f4742c7d90659dc14f9f152132fcbde4afd483b5d0c8aa22eedd1154b0f3c632", + "@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.1": "baa3911178e6462c8d682d3ec182e95fc33f308d5b50662f07108a9a5572d365c97604932887113053fada46949580fabc9ca704822c714160ba8eee0387b286", + "@unrs/resolver-binding-linux-arm64-musl@npm:1.11.1": "cb7763961f472f201e885753c3daf72231990c65fa5112a76a996f7c5754f2e6688cdc58f1861b05b5f176dae9255e34a860c40b21401318395eb4939759e46a", + "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.1": "148d28b05c5d50bc4d429f5da3e675b1285387b54c8e5363d7c288b53f2f38688bf9472ac5f2e4ba7fa3c3d7f19bac19738b1815a8973ba29c6bae76990b66f7", + "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.1": "40ba923597ae297b7be85de1769025578e16af29def72060e7603ec3311fefe537c9608520e771291e934af7e64e3a52d74ccb5ee1f7a657ba2f2a2fcfbf3df7", + "@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.1": "193da09875cf4ce3ea9ef24a141f9235da9095808b157b4dc83ce431f97732f2d19f65d4030771187d1a8424f6843e8a50ac6ba2ab4391271f80680c1166b2d7", + "@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.1": "c376fbbfbe0909844c188f23eec33c937fbf4a1f2fe81418726aa9bab91b44d9411ec98560ed73aaf15fa2082483fb0907a335535449623e3e4a604ee18b7ac3", + "@unrs/resolver-binding-linux-x64-gnu@npm:1.11.1": "c3011171259f4f4c5c1751e565fd6f0ec203558484234cc438279a26f6fb2ec0d4bbed72ed9bfbc9967e43351fd8e3aa716269b8e670a7c9421ff64a1a9123eb", + "@unrs/resolver-binding-linux-x64-musl@npm:1.11.1": "27da30650ec1e6378bc47665a944913839ef95e9af1bc7892f6ad3fd7cd10468d5b4da8caa03f83e3c56e03253cae4034ba1ee64d3ceb19a3656f31d362eaabf", + "@unrs/resolver-binding-wasm32-wasi@npm:1.11.1": "ca69e8caeed033c074d9413112264fe1c0bdaaedb4fa9e6f5bcbf3a64ee98fa8261a6b5e54c3d7b7144cf020217c9a89f308086ec64d11d78480bd5885dc2e1a", + "@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1": "4aabb2e8c80590650bd2b46f205f24e9f345ead68e7b53c20adb219d0c3f030c605d5434f3895fde68ebfa521ea97ea6da974e342e19487086da6a16332860df", + "@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1": "5b364708ea2985d0e59f235a00e05bf3668704a81e9d32e8929980c84fd0bd67102c2041337b08e266a8bc4883ddf618ac7cb5e1f64614d8f9861cc4e3208905", + "@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "92ff0d27efe168480a14c8d705c0f68624f01251bdc5f8f41bbd6c7ed8ea23effb8481f01eb93270896822397fe2fd78a427c1756ecabc3cb13a746c918b5949" } diff --git a/pkgs/by-name/pr/prettier/package.nix b/pkgs/by-name/pr/prettier/package.nix index ecc0d1cbf653..22148eeabe9e 100644 --- a/pkgs/by-name/pr/prettier/package.nix +++ b/pkgs/by-name/pr/prettier/package.nix @@ -68,17 +68,17 @@ let pathAbsoluteNaive -> ${pathAbsoluteNaive} pathAbsoluteFallback -> ${pathAbsoluteFallback} '' throw "${plugin.pname}: does not provide parse-able entry point"; - yarnHash = "sha256-dpxzbtWyXsHS6tH6DJ9OqSsUSc+YqYeAPJYb95Qy5wQ="; + yarnHash = "sha256-WncAReGKs9cZvPTf87bKKOrmte5ORyHOb5pTAgHsb8M="; in stdenv.mkDerivation (finalAttrs: { pname = "prettier"; - version = "3.6.2"; + version = "3.8.1"; src = fetchFromGitHub { owner = "prettier"; repo = "prettier"; tag = finalAttrs.version; - hash = "sha256-uMLRFBZP7/42R6nReONcb9/kVGCn3yGHLcLFajMZLmQ="; + hash = "sha256-SzrpkWyT/Vdt21KUQ0cTQ0QmCivazY6rrgmApsvXZWs="; }; patches = [ @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; + inherit (finalAttrs) src missingHashes patches; hash = yarnHash; }; From b6852f72164972e9ab2c8d8581ec0b73be6f199d Mon Sep 17 00:00:00 2001 From: S0AndS0 Date: Sun, 19 Apr 2026 08:16:17 -0700 Subject: [PATCH 3/5] prettier: Package and patch dynamic dependency --- pkgs/by-name/pr/prettier/package.nix | 75 ++++++++++++++++++- .../pnpm-lock_prettier-oxc-wasm-parser.yaml | 63 ++++++++++++++++ 2 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/pr/prettier/pnpm-lock_prettier-oxc-wasm-parser.yaml diff --git a/pkgs/by-name/pr/prettier/package.nix b/pkgs/by-name/pr/prettier/package.nix index 22148eeabe9e..865566272f05 100644 --- a/pkgs/by-name/pr/prettier/package.nix +++ b/pkgs/by-name/pr/prettier/package.nix @@ -1,8 +1,11 @@ { fetchFromGitHub, + fetchPnpmDeps, lib, makeBinaryWrapper, nodejs, + pnpmConfigHook, + pnpm_9, stdenv, versionCheckHook, yarn-berry, @@ -68,7 +71,64 @@ let pathAbsoluteNaive -> ${pathAbsoluteNaive} pathAbsoluteFallback -> ${pathAbsoluteFallback} '' throw "${plugin.pname}: does not provide parse-able entry point"; + yarnHash = "sha256-WncAReGKs9cZvPTf87bKKOrmte5ORyHOb5pTAgHsb8M="; + + prettier-oxc-wasm-parser = stdenv.mkDerivation (finalAttrs: { + pname = "binding-wasm32-wasi"; + version = "0.99.0"; + + src = builtins.fetchTarball { + url = "https://registry.npmjs.org/@oxc-parser/${finalAttrs.pname}/-/${finalAttrs.pname}-${finalAttrs.version}.tgz"; + sha256 = "05ndf32qlx5qnrp0r4jrgb8219mihvha68b1jcvk24ys76gpmxpm"; + }; + + nativeBuildInputs = [ + nodejs + pnpmConfigHook + pnpm_9 + ]; + + prePnpmInstall = '' + install --mode=644 -T ${./pnpm-lock_prettier-oxc-wasm-parser.yaml} ./pnpm-lock.yaml + ''; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) + pname + version + src + prePnpmInstall + ; + + pnpm = pnpm_9; + fetcherVersion = 2; + hash = "sha256-i3zxUTy8vRo+Scn+ZQkZ2/j9emjurCNR4Cz8C8XsHjQ="; + }; + + buildPhase = '' + runHook preBuild + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -r . $out/ + + runHook postInstall + ''; + + doCheck = false; + doInstallCheck = false; + + meta = { + description = "Oxc Parser Node API"; + homepage = "https://oxc.rs/docs/guide/usage/parser"; + license = "MIT"; + }; + }); in stdenv.mkDerivation (finalAttrs: { pname = "prettier"; @@ -90,8 +150,9 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes patches; + inherit (finalAttrs) src missingHashes; hash = yarnHash; + }; nativeBuildInputs = [ @@ -104,6 +165,18 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall yarn install --immutable + + mkdir -p .tmp/prettier-oxc-wasm-parser/node_modules/@oxc-parser + + cp -r ${prettier-oxc-wasm-parser.out} .tmp/prettier-oxc-wasm-parser/node_modules/@oxc-parser/binding-wasm32-wasi + + find .tmp/prettier-oxc-wasm-parser -type f -exec chmod u+w {} \; + find .tmp/prettier-oxc-wasm-parser -type d -exec chmod u+w {} \; + + sed --in-place --expression '/^\s\+const installDirectory = await install(version);$/ { + s#await install(version)#new URL("../../.tmp/prettier-oxc-wasm-parser", import.meta.url)#; + }' scripts/build/build-oxc-wasm-parser.js + yarn build --clean mkdir -p $out/lib/node_modules diff --git a/pkgs/by-name/pr/prettier/pnpm-lock_prettier-oxc-wasm-parser.yaml b/pkgs/by-name/pr/prettier/pnpm-lock_prettier-oxc-wasm-parser.yaml new file mode 100644 index 000000000000..fd7e25a6e37d --- /dev/null +++ b/pkgs/by-name/pr/prettier/pnpm-lock_prettier-oxc-wasm-parser.yaml @@ -0,0 +1,63 @@ +lockfileVersion: '9.0' + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + +importers: + + .: + dependencies: + '@napi-rs/wasm-runtime': + specifier: ^1.0.7 + version: 1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) + +packages: + + '@emnapi/core@1.10.0': + resolution: {integrity: sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==} + + '@emnapi/runtime@1.10.0': + resolution: {integrity: sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==} + + '@emnapi/wasi-threads@1.2.1': + resolution: {integrity: sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==} + + '@napi-rs/wasm-runtime@1.1.4': + resolution: {integrity: sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==} + peerDependencies: + '@emnapi/core': ^1.7.1 + '@emnapi/runtime': ^1.7.1 + + '@tybys/wasm-util@0.10.1': + resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==} + + tslib@2.8.1: + resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} + +snapshots: + + '@emnapi/core@1.10.0': + dependencies: + '@emnapi/wasi-threads': 1.2.1 + tslib: 2.8.1 + + '@emnapi/runtime@1.10.0': + dependencies: + tslib: 2.8.1 + + '@emnapi/wasi-threads@1.2.1': + dependencies: + tslib: 2.8.1 + + '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)': + dependencies: + '@emnapi/core': 1.10.0 + '@emnapi/runtime': 1.10.0 + '@tybys/wasm-util': 0.10.1 + + '@tybys/wasm-util@0.10.1': + dependencies: + tslib: 2.8.1 + + tslib@2.8.1: {} From 2849682c4ed753e6d0c3aa34a30babce59aac090 Mon Sep 17 00:00:00 2001 From: Ivy Pierlot Date: Mon, 11 May 2026 12:53:29 +1000 Subject: [PATCH 4/5] prettier: fix fetching --- pkgs/by-name/pr/prettier/missing-hashes.json | 35 +++++----- pkgs/by-name/pr/prettier/package.nix | 26 ++++---- .../pnpm-lock_prettier-oxc-wasm-parser.patch | 66 +++++++++++++++++++ .../pnpm-lock_prettier-oxc-wasm-parser.yaml | 63 ------------------ .../pr/prettier/yarn-4.14-support.patch | 2 +- 5 files changed, 101 insertions(+), 91 deletions(-) create mode 100644 pkgs/by-name/pr/prettier/pnpm-lock_prettier-oxc-wasm-parser.patch delete mode 100644 pkgs/by-name/pr/prettier/pnpm-lock_prettier-oxc-wasm-parser.yaml diff --git a/pkgs/by-name/pr/prettier/missing-hashes.json b/pkgs/by-name/pr/prettier/missing-hashes.json index e82a4ce88272..58edbab4eb91 100644 --- a/pkgs/by-name/pr/prettier/missing-hashes.json +++ b/pkgs/by-name/pr/prettier/missing-hashes.json @@ -25,21 +25,26 @@ "@esbuild/win32-arm64@npm:0.27.0": "0764563ecbfcad9c5468ff73e415a5ab2379471d5eccc6077baa81efe7965954da040f79095bfc021a8d717908b7c19cee80017b1dca8fdf1dc565f47d7334c1", "@esbuild/win32-ia32@npm:0.27.0": "94252e06dc62e4b3774f2d881bb5cac43c430895f32e61b53ad06f034ed75dc87a45891cf1c0281388e2ca39e7d44e33c42bf4e113e67001359be5a4542ffa93", "@esbuild/win32-x64@npm:0.27.0": "fd6554d61494458b8f08e6bee8ea5d08b4885f9f9ed765caab9b13430238f7a0d6cb85136eaef439acfed7740abe864d2ba198d39e12a405d73abde641e7f448", - "@oxc-parser/binding-android-arm64@npm:0.99.0": "67f5d78706eb18c381da059ae3c47bce9d1e24c35cdf4d9b060b0f8a3654143e39c0ea2204b5eec83f19742a53ab42581ce71ccd218ba3b62b92c3ed13ea9403", - "@oxc-parser/binding-darwin-arm64@npm:0.99.0": "d822bf4aca7f46327c3f34c627434924b9c08b5077d313fdb6bc6f5ecfec6cef3887ea77c7c3bbe88ae62004cfcfa28fe8ee1907e0277cf61b6187ca0dca718c", - "@oxc-parser/binding-darwin-x64@npm:0.99.0": "06b7e5fed0e72a4b205336a79e6bb8fcbd28e30187c7af53df01762bebcff5d4ce3ed68808cebee50cc07017f2863406d0001b930f330424e39a2f05703bab14", - "@oxc-parser/binding-freebsd-x64@npm:0.99.0": "715114d0c25c28c183e11dc6ee71d873bbd2d3725863b2d6c1e68d61751770fb53dd87df263f9781c7069b7c6a54eb0a1bf68eaf24526209a2a78b284517326f", - "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.99.0": "830974d13180cfee4529dbf7b392268c84b530a2c087603bae467db37ad515ac0f1bc77dddb6b3f06680534719802e44f458ab423012c01ccdd7253542902f7f", - "@oxc-parser/binding-linux-arm-musleabihf@npm:0.99.0": "2c00ed90f4bda8ffa9160dea79aeaedaf4c281c0b567e46ac2a6e44c96daccb7d432afc4bd2ac016fde6c976f47d05fe36d43d426e93db301c3079d8dbbbae2d", - "@oxc-parser/binding-linux-arm64-gnu@npm:0.99.0": "2105b990aea1025febf4b3271838b680d7944e10c9e7b75a8356c06a5223482191f12f61d262d85c3d4a64eed0e208cb08d83b8530c487326c6137d50f09e6c4", - "@oxc-parser/binding-linux-arm64-musl@npm:0.99.0": "028e47ff6cd4a0ea83a7ded4f4ca505a42de9d97035b069c21f264f491e494817987ca1666bf5da62e79387065f8950a000314a1d9a499984b640e5ba44caa82", - "@oxc-parser/binding-linux-riscv64-gnu@npm:0.99.0": "a8f4d2992cf67f6406246f0b4da7db40e69ddd4c8cd41afd98fe6131e058bac553fe7e8fcbb6d03416ba8fe715fa38881ffcf5894e9b2745a819e66394489529", - "@oxc-parser/binding-linux-s390x-gnu@npm:0.99.0": "93aa18a75a4c0bb5d44e8f8e3a13ef02aec1fb337fa1d22213abe851fc2973ea9b6079f768640b8460460398c3f182732ed062bacf26cdfbec6e455aa21e59b2", - "@oxc-parser/binding-linux-x64-gnu@npm:0.99.0": "83eff6a63048989bfc1f5f710350d239a93c71491d8bce641f249f73f85fa7d5456d15df2ce53317782fe11ec1b3abd5cdc78994a71fb69642f5c0fb2012c0e1", - "@oxc-parser/binding-linux-x64-musl@npm:0.99.0": "3d424f14be5adcf90c16a9fd85ec5fd5e790529f4b559a404a0a19732749a0e89f12c7360fd14c5974a3b8bc56d731289c33b8fb88e8db4c234884b5832108cd", - "@oxc-parser/binding-wasm32-wasi@npm:0.99.0": "77e3eddf6de9d41666cd16046c39a7db8808328844e591d9aa1018165ebacc401b0a02e0c8a2101e028760c63687064a704b053b9ac5534c12aa063c64deaf43", - "@oxc-parser/binding-win32-arm64-msvc@npm:0.99.0": "de68b6c17c68bdd0b99507e346ead518fa7213d4ee2965c5ac934276c44e4d2588158a68370a67ab99cc3d57d251a8f5b079bbddb43f1ab1c39a08eba071830c", - "@oxc-parser/binding-win32-x64-msvc@npm:0.99.0": "d10d5202611f73257c6479dc90212dbdab3e298fe5a54d5e2942504bf33793235018d43234490f2192511277e38fccc6486408a85ab482c9d197609ff837dbe1", + "@oxc-parser/binding-android-arm-eabi@npm:0.125.0": "6ff43763cca0b1c8ca86e126db259cb604135e33c2151fd700d7492161af9c144f0214252c0c66025532788667297846f740399b3f075a6a0302dfb9cde3a261", + "@oxc-parser/binding-android-arm64@npm:0.125.0": "49a8a368d6d826b7052eeffadcfd6004cc24268e6d6ffb1959d480c902bca597242f0ef1267d6ae1b60477641429c842dc1cbf33b639320b7bacf17e3f1b8589", + "@oxc-parser/binding-darwin-arm64@npm:0.125.0": "d9f41dfb1fd7639903aec3d5ce440a408c9681459f55bac1c97da1a2a7106e19c4387a3686d78dd735dcb1b1698722d07e8ce973ea68a37ae3bc6dc57d144aa3", + "@oxc-parser/binding-darwin-x64@npm:0.125.0": "e0797ff4f2d7671717603e5e611176c7c4982b78fccc3356c05f8f0c168ac1f47e5eec4751f12d885be214c1c36bf4bc6c163724000084a8cd64796fa84b07ad", + "@oxc-parser/binding-freebsd-x64@npm:0.125.0": "515e3133b6db6e9539ee04a63f27efa8f7ab049cdddb8ddb8d746baa89cdd4c336a75a48dc6269e2c1c3b1ffe2390f86c211615b114f763d7b1c44896a560dc9", + "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.125.0": "ba8a51e6ff74e81294257eb123441d1bbaa74d5b800e29ee6ef2b4e3b96ebfdcd84e15dda6f3ba4f6063bab088e9889cdce5fe6b351b0d9fd2a14392dc9a18b3", + "@oxc-parser/binding-linux-arm-musleabihf@npm:0.125.0": "0cea4f6b9a1bb0f51929c01bbc37c79e1822727e3659a927c50317436c349b4972726a1e1318a8c32fcb554bc570cdb5451c50f480514283dd2e64a395cb13ab", + "@oxc-parser/binding-linux-arm64-gnu@npm:0.125.0": "be490df3c5778d4fab023d7b4c277b398fd8fb55e9e61c1f4c27ba62e7ae627c53c1846096ddce77223fe3dc4baba09e2afde4c3778b70297d59708659ad71e3", + "@oxc-parser/binding-linux-arm64-musl@npm:0.125.0": "c98e6f4ad3a4c780e55425fcbc127ecc20cede7c75d340ef3249424fde831c2dccba3d3fb0c8b48ad1f185d93e12ba70e05d8569414431c2e067debceec98def", + "@oxc-parser/binding-linux-ppc64-gnu@npm:0.125.0": "bd0d00ed0c75f424e26ddd8badefe80e345fbcbdefe9b6a5d872e90775d10d6ff797daa393d2c6158ab8cb1b7f88dd09cb4631601e254ce0c6d61a4bf925ed38", + "@oxc-parser/binding-linux-riscv64-gnu@npm:0.125.0": "363576c9612bd36bd870134a3e0fc69b29feeb958a467ea8fd02425364cb6bf33b9a870e8a530c813d6f9742d0980add5393a2aecea254d29b95e6adf9032dbd", + "@oxc-parser/binding-linux-riscv64-musl@npm:0.125.0": "fb8b7307478537640fd0a617f32c62faef1dc014eaa51a13bdc325444b39074c51317be69df2ce38eeae8d5b9c1b172fcc95bcdda4d718c7e9895de5a11493bc", + "@oxc-parser/binding-linux-s390x-gnu@npm:0.125.0": "39e5d72eaca1b28851fa9d00d3b5d6bca317bbfd390c421215e7153204d0e7d5c1228108d998876b36dfdd9399f9761d338e6c67cd8aee08cb2d62a713fa45bf", + "@oxc-parser/binding-linux-x64-gnu@npm:0.125.0": "43bf4a3efbd42656560357dc2a84d90189fdd07dc0c7cd24a0e45060bd8b61123e210af458ca8ada99c1147ea361c14bd86c86e9360e45a32cc9440a10dc5cca", + "@oxc-parser/binding-linux-x64-musl@npm:0.125.0": "64d1e08bd8f67d53a173a1eb67b4f2743afda6832bb0fc7ea3996d0821e5f3b9e5d7f55594e17e303cc3057219c903ca5a34221a96064403ca21361e41e37709", + "@oxc-parser/binding-openharmony-arm64@npm:0.125.0": "49cf95d5d9433a423581ffaae921bb9a894836da786f178086d326799be4f7370061a12856e1cc6cd2c213117614bf9419aba9420347fe3de38f0b7a191723a0", + "@oxc-parser/binding-wasm32-wasi@npm:0.125.0": "b7eaba3d967e41d4edbb8530cbcca56aec2047cd6d77b66dc2e8769f1644db95a841a28b9edceb0bc4eff403e057448ab19c29d3ffeaf5e5269bee6dd274b537", + "@oxc-parser/binding-win32-arm64-msvc@npm:0.125.0": "c42b9f91a19d9ecc1346d799b381ed05a7e0b081a6984eed1c171123e6ad99a507e132c93cd2935360d8580de9b8a8238ab89870580acaa4f791f3346d98a548", + "@oxc-parser/binding-win32-ia32-msvc@npm:0.125.0": "1671a8aa624c7bb75c0fddb91247a64c0060865a2ec005b8ae8f1c1b6366054326a28e85e8e74ff638bb5a8549a21f4128612d88404ebb8cead77b0d025ca268", + "@oxc-parser/binding-win32-x64-msvc@npm:0.125.0": "053cf4c93299f728628617b7f47a69927981b44cc2fc2ea6ca08f3017bf6949b169e75ffbba10ad0fb918a6425e2fd4fa37868519bc8e55c90631c27415c6801", "@oxc-resolver/binding-android-arm-eabi@npm:11.13.2": "7433ba278c276c8727ce61d380b468ce7c0a8d95178710978229c5e9474a6a36fcbc13c220d25bf027d423eb54ae5ed665fabc2203f429bb55f227f50afb7a85", "@oxc-resolver/binding-android-arm64@npm:11.13.2": "3f809e1faf8078fbde69dbf8fc6874587a99707153010f6c1adca0759fe20860f8b4d47830f9055215801903c3c663e6c141bc83d327a0726429e4c322ab13c6", "@oxc-resolver/binding-darwin-arm64@npm:11.13.2": "bc623cbf2983d133f1db852f9526e861c3eba1868687ac18c176995f9963677a7cb8d21dcde0409579bf348461610469f66ae9754dc0378efa30a1761280f8cf", diff --git a/pkgs/by-name/pr/prettier/package.nix b/pkgs/by-name/pr/prettier/package.nix index 865566272f05..0f071d92102a 100644 --- a/pkgs/by-name/pr/prettier/package.nix +++ b/pkgs/by-name/pr/prettier/package.nix @@ -2,6 +2,7 @@ fetchFromGitHub, fetchPnpmDeps, lib, + fetchurl, makeBinaryWrapper, nodejs, pnpmConfigHook, @@ -72,15 +73,15 @@ let pathAbsoluteFallback -> ${pathAbsoluteFallback} '' throw "${plugin.pname}: does not provide parse-able entry point"; - yarnHash = "sha256-WncAReGKs9cZvPTf87bKKOrmte5ORyHOb5pTAgHsb8M="; + yarnHash = "sha256-KQywjBgJcT6CXT8bd11wT26qmfLen8E/gXhPBA5TY9A="; prettier-oxc-wasm-parser = stdenv.mkDerivation (finalAttrs: { pname = "binding-wasm32-wasi"; version = "0.99.0"; - src = builtins.fetchTarball { + src = fetchurl { url = "https://registry.npmjs.org/@oxc-parser/${finalAttrs.pname}/-/${finalAttrs.pname}-${finalAttrs.version}.tgz"; - sha256 = "05ndf32qlx5qnrp0r4jrgb8219mihvha68b1jcvk24ys76gpmxpm"; + sha256 = "sha256-7qPLrjsQ6+F565/k4HbVtcbr5HDok5AcaR8W+zTy/SM="; }; nativeBuildInputs = [ @@ -89,21 +90,21 @@ let pnpm_9 ]; - prePnpmInstall = '' - install --mode=644 -T ${./pnpm-lock_prettier-oxc-wasm-parser.yaml} ./pnpm-lock.yaml - ''; + patches = [ + ./pnpm-lock_prettier-oxc-wasm-parser.patch + ]; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src - prePnpmInstall + patches ; pnpm = pnpm_9; - fetcherVersion = 2; - hash = "sha256-i3zxUTy8vRo+Scn+ZQkZ2/j9emjurCNR4Cz8C8XsHjQ="; + fetcherVersion = 3; + hash = "sha256-WPsVL05rVku2YSbfjHX4/BoFM+qvIm4sZip7pISg0vA="; }; buildPhase = '' @@ -132,13 +133,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prettier"; - version = "3.8.1"; + version = "3.8.3"; src = fetchFromGitHub { owner = "prettier"; repo = "prettier"; tag = finalAttrs.version; - hash = "sha256-SzrpkWyT/Vdt21KUQ0cTQ0QmCivazY6rrgmApsvXZWs="; + hash = "sha256-7B8AnLPC2CcgdR/Jz0TvMhqYCCEf345U6xlWB7QaIqg="; }; patches = [ @@ -150,7 +151,8 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; + + inherit (finalAttrs) src missingHashes patches; hash = yarnHash; }; diff --git a/pkgs/by-name/pr/prettier/pnpm-lock_prettier-oxc-wasm-parser.patch b/pkgs/by-name/pr/prettier/pnpm-lock_prettier-oxc-wasm-parser.patch new file mode 100644 index 000000000000..47369947c7d7 --- /dev/null +++ b/pkgs/by-name/pr/prettier/pnpm-lock_prettier-oxc-wasm-parser.patch @@ -0,0 +1,66 @@ +--- /dev/null 2026-05-11 13:04:22 ++++ ./pnpm-lock.yaml 2026-05-11 12:52:25 +@@ -0,0 +1,63 @@ ++lockfileVersion: '9.0' ++ ++settings: ++ autoInstallPeers: true ++ excludeLinksFromLockfile: false ++ ++importers: ++ ++ .: ++ dependencies: ++ '@napi-rs/wasm-runtime': ++ specifier: ^1.0.7 ++ version: 1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) ++ ++packages: ++ ++ '@emnapi/core@1.10.0': ++ resolution: {integrity: sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==} ++ ++ '@emnapi/runtime@1.10.0': ++ resolution: {integrity: sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==} ++ ++ '@emnapi/wasi-threads@1.2.1': ++ resolution: {integrity: sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==} ++ ++ '@napi-rs/wasm-runtime@1.1.4': ++ resolution: {integrity: sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==} ++ peerDependencies: ++ '@emnapi/core': ^1.7.1 ++ '@emnapi/runtime': ^1.7.1 ++ ++ '@tybys/wasm-util@0.10.1': ++ resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==} ++ ++ tslib@2.8.1: ++ resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} ++ ++snapshots: ++ ++ '@emnapi/core@1.10.0': ++ dependencies: ++ '@emnapi/wasi-threads': 1.2.1 ++ tslib: 2.8.1 ++ ++ '@emnapi/runtime@1.10.0': ++ dependencies: ++ tslib: 2.8.1 ++ ++ '@emnapi/wasi-threads@1.2.1': ++ dependencies: ++ tslib: 2.8.1 ++ ++ '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)': ++ dependencies: ++ '@emnapi/core': 1.10.0 ++ '@emnapi/runtime': 1.10.0 ++ '@tybys/wasm-util': 0.10.1 ++ ++ '@tybys/wasm-util@0.10.1': ++ dependencies: ++ tslib: 2.8.1 ++ ++ tslib@2.8.1: {} diff --git a/pkgs/by-name/pr/prettier/pnpm-lock_prettier-oxc-wasm-parser.yaml b/pkgs/by-name/pr/prettier/pnpm-lock_prettier-oxc-wasm-parser.yaml deleted file mode 100644 index fd7e25a6e37d..000000000000 --- a/pkgs/by-name/pr/prettier/pnpm-lock_prettier-oxc-wasm-parser.yaml +++ /dev/null @@ -1,63 +0,0 @@ -lockfileVersion: '9.0' - -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false - -importers: - - .: - dependencies: - '@napi-rs/wasm-runtime': - specifier: ^1.0.7 - version: 1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) - -packages: - - '@emnapi/core@1.10.0': - resolution: {integrity: sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==} - - '@emnapi/runtime@1.10.0': - resolution: {integrity: sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==} - - '@emnapi/wasi-threads@1.2.1': - resolution: {integrity: sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==} - - '@napi-rs/wasm-runtime@1.1.4': - resolution: {integrity: sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==} - peerDependencies: - '@emnapi/core': ^1.7.1 - '@emnapi/runtime': ^1.7.1 - - '@tybys/wasm-util@0.10.1': - resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==} - - tslib@2.8.1: - resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} - -snapshots: - - '@emnapi/core@1.10.0': - dependencies: - '@emnapi/wasi-threads': 1.2.1 - tslib: 2.8.1 - - '@emnapi/runtime@1.10.0': - dependencies: - tslib: 2.8.1 - - '@emnapi/wasi-threads@1.2.1': - dependencies: - tslib: 2.8.1 - - '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)': - dependencies: - '@emnapi/core': 1.10.0 - '@emnapi/runtime': 1.10.0 - '@tybys/wasm-util': 0.10.1 - - '@tybys/wasm-util@0.10.1': - dependencies: - tslib: 2.8.1 - - tslib@2.8.1: {} diff --git a/pkgs/by-name/pr/prettier/yarn-4.14-support.patch b/pkgs/by-name/pr/prettier/yarn-4.14-support.patch index ac5d685b2049..879ad1098041 100644 --- a/pkgs/by-name/pr/prettier/yarn-4.14-support.patch +++ b/pkgs/by-name/pr/prettier/yarn-4.14-support.patch @@ -5,7 +5,7 @@ diff --git a/.yarnrc.yml b/.yarnrc.yml plugins: - .yarn/plugins/plugin-setup-editor.cjs --yarnPath: .yarn/releases/yarn-4.9.2.cjs +-yarnPath: .yarn/releases/yarn-4.12.0.cjs +approvedGitRepositories: + - "**" + From e6486b9b6cddef121635dc6be08176681bdbb4bf Mon Sep 17 00:00:00 2001 From: Ivy Pierlot Date: Mon, 11 May 2026 15:35:25 +1000 Subject: [PATCH 5/5] prettier: remove settings --- .../pr/prettier/pnpm-lock_prettier-oxc-wasm-parser.patch | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/by-name/pr/prettier/pnpm-lock_prettier-oxc-wasm-parser.patch b/pkgs/by-name/pr/prettier/pnpm-lock_prettier-oxc-wasm-parser.patch index 47369947c7d7..eb2197f9dbe5 100644 --- a/pkgs/by-name/pr/prettier/pnpm-lock_prettier-oxc-wasm-parser.patch +++ b/pkgs/by-name/pr/prettier/pnpm-lock_prettier-oxc-wasm-parser.patch @@ -1,12 +1,8 @@ --- /dev/null 2026-05-11 13:04:22 +++ ./pnpm-lock.yaml 2026-05-11 12:52:25 -@@ -0,0 +1,63 @@ +@@ -0,0 +1,59 @@ +lockfileVersion: '9.0' + -+settings: -+ autoInstallPeers: true -+ excludeLinksFromLockfile: false -+ +importers: + + .: