prettier: fix fetching

2026-05-11 13:51:02 +10:00
parent b6852f7216
commit 2849682c4e
5 changed files with 101 additions and 91 deletions
@@ -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",
@@ -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;

  };
@@ -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: {}
@@ -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: {}
@@ -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:
 + - "**"
 +