diff --git a/pkgs/by-name/ht/httptoolkit/bump-node-abi.patch b/pkgs/by-name/ht/httptoolkit/bump-node-abi.patch new file mode 100644 index 0000000000000..5c622a036ddeb --- /dev/null +++ b/pkgs/by-name/ht/httptoolkit/bump-node-abi.patch @@ -0,0 +1,59 @@ +diff --git a/package-lock.json b/package-lock.json +index 8823235..a014292 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -498,10 +498,11 @@ + } + }, + "node_modules/@electron/rebuild/node_modules/node-abi": { +- "version": "3.74.0", +- "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.74.0.tgz", +- "integrity": "sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w==", ++ "version": "3.77.0", ++ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.77.0.tgz", ++ "integrity": "sha512-DSmt0OEcLoK4i3NuscSbGjOf3bqiDEutejqENSplMSFA/gmB8mkED9G4pKWnPl7MDU4rSHebKPHeitpDfyH0cQ==", + "dev": true, ++ "license": "MIT", + "dependencies": { + "semver": "^7.3.5" + }, +@@ -5239,9 +5240,10 @@ + } + }, + "node_modules/node-abi": { +- "version": "2.30.0", +- "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.0.tgz", +- "integrity": "sha512-g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg==", ++ "version": "2.30.1", ++ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz", ++ "integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==", ++ "license": "MIT", + "dependencies": { + "semver": "^5.4.1" + } +@@ -7774,9 +7776,9 @@ + } + }, + "node-abi": { +- "version": "3.74.0", +- "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.74.0.tgz", +- "integrity": "sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w==", ++ "version": "3.77.0", ++ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.77.0.tgz", ++ "integrity": "sha512-DSmt0OEcLoK4i3NuscSbGjOf3bqiDEutejqENSplMSFA/gmB8mkED9G4pKWnPl7MDU4rSHebKPHeitpDfyH0cQ==", + "dev": true, + "requires": { + "semver": "^7.3.5" +@@ -11329,9 +11331,9 @@ + "dev": true + }, + "node-abi": { +- "version": "2.30.0", +- "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.0.tgz", +- "integrity": "sha512-g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg==", ++ "version": "2.30.1", ++ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz", ++ "integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==", + "requires": { + "semver": "^5.4.1" + }, diff --git a/pkgs/by-name/ht/httptoolkit/package.nix b/pkgs/by-name/ht/httptoolkit/package.nix index 36829a8176223..49c69b1e5448f 100644 --- a/pkgs/by-name/ht/httptoolkit/package.nix +++ b/pkgs/by-name/ht/httptoolkit/package.nix @@ -6,11 +6,12 @@ makeWrapper, makeDesktopItem, copyDesktopItems, - electron_35, + electron_37, httptoolkit-server, }: + let - electron = electron_35; + electron = electron_37; in buildNpmPackage rec { pname = "httptoolkit"; @@ -23,7 +24,12 @@ buildNpmPackage rec { hash = "sha256-6iiXOBVtPLdW9MWUcu2Hggm7uPHudASebRPQ34JJTMQ="; }; - npmDepsHash = "sha256-n4he0Z9XPQIZ8vZcWA7Vo36Oz5RGPGdnV2VJVu5OZRg="; + patches = [ + # generated via running: `npm update node-abi` + ./bump-node-abi.patch + ]; + + npmDepsHash = "sha256-WtnL9Gf1zGWnIjMifh0l3fwaeur+iI1l/Vwta+X6EAM="; makeCacheWritable = true;