gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

httptoolkit: 1.22.1 -> 1.24.4; httptoolkit-server: 1.24.0 -> 1.24.2 (#484069)

Browse Source
This commit is contained in:
Yureka
2026-01-29 08:44:07 +00:00
committed by GitHub
parent 04a51f17b8 6a37dea112
commit e8a5fdd7ef
3 changed files with 16 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/ht/httptoolkit-server/package.nix
+8 -8
View File
@@ -1,6 +1,6 @@
{
lib,
nodejs_20,
nodejs_22,
buildNpmPackage,
fetchFromGitHub,
writeShellScriptBin,
@@ -13,16 +13,18 @@
}:
let
nodejs = nodejs_20;
nodejs = nodejs_22;
buildNpmPackage' = buildNpmPackage.override { inherit nodejs; };
version = "1.24.0";
# update together with httptoolkit
# nixpkgs-update: no auto update
version = "1.24.2";
src = fetchFromGitHub {
owner = "httptoolkit";
repo = "httptoolkit-server";
tag = "v${version}";
hash = "sha256-bwtNJz72dgeojMETvobsFr9x1St5rCO/Mwu5DBmcMhs=";
hash = "sha256-tcUQe4YIUpQ9I5nq66K7LO84mLFo8YAdHY/c2HROSpk=";
};
overridesNodeModules = buildNpmPackage' {
@@ -30,7 +32,7 @@ let
inherit version src;
sourceRoot = "${src.name}/overrides/js";
npmDepsHash = "sha256-MtUJY9IxzkGPuoIXHAr9nNNF+NpEf2b/oAYauJPwdaw=";
npmDepsHash = "sha256-8cNGJdT8ndXa72ETttU2PjA8nfn+MTWesVVlA8GA1qQ=";
dontBuild = true;
@@ -85,8 +87,6 @@ let
# don't fetch node headers
substituteInPlace node_modules/cmake-js/lib/dist.js \
--replace-fail '!this.downloaded' 'false'
npm rebuild --verbose
'';
installPhase = ''
@@ -102,7 +102,7 @@ buildNpmPackage' {
patches = [ ./only-build-for-one-platform.patch ];
npmDepsHash = "sha256-ZumcKqm0JFu8UR/6tnSDzv9ABULmhsUnHtNsYvmR0Ao=";
npmDepsHash = "sha256-vhTe7EccEX57h7LDtNaaLaNR8xHSOlbnLtGrs7qT7pY=";
npmFlags = [ "--ignore-scripts" ];
pkgs/by-name/ht/httptoolkit/bump-node-abi.patch
-59
View File
@@ -1,59 +0,0 @@
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"
},
pkgs/by-name/ht/httptoolkit/package.nix
+8 -10
View File
@@ -6,30 +6,28 @@
makeWrapper,
makeDesktopItem,
copyDesktopItems,
electron_37,
electron_39,
httptoolkit-server,
}:
let
electron = electron_37;
electron = electron_39;
in
buildNpmPackage rec {
pname = "httptoolkit";
version = "1.22.1";
# update together with httptoolkit-server
# nixpkgs-update: no auto update
version = "1.24.4";
src = fetchFromGitHub {
owner = "httptoolkit";
repo = "httptoolkit-desktop";
tag = "v${version}";
hash = "sha256-6iiXOBVtPLdW9MWUcu2Hggm7uPHudASebRPQ34JJTMQ=";
hash = "sha256-b1u+DFhxU/ED4GgMHFaF51zNfC+0vIg6ujyA8jIy8AQ=";
};
patches = [
# generated via running: `npm update node-abi`
./bump-node-abi.patch
];
npmDepsHash = "sha256-WtnL9Gf1zGWnIjMifh0l3fwaeur+iI1l/Vwta+X6EAM=";
npmDepsHash = "sha256-FX8sClJL66zvWEaaw0lmoat7cM396RA8Rq9NgRVh0Vw=";
makeCacheWritable = true;