From fd091da54a28554e2a3d1d95b573a6a497dce237 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 10 Mar 2025 12:34:15 +0100 Subject: [PATCH 1/8] httptoolkit: 1.19.4 -> 1.20.1 (cherry picked from commit 66ab03c8e7782d9083b3d67114359593f79a15ab) --- pkgs/by-name/ht/httptoolkit/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ht/httptoolkit/package.nix b/pkgs/by-name/ht/httptoolkit/package.nix index f2a7f7bc26062..ff21b202c373a 100644 --- a/pkgs/by-name/ht/httptoolkit/package.nix +++ b/pkgs/by-name/ht/httptoolkit/package.nix @@ -12,16 +12,18 @@ buildNpmPackage rec { pname = "httptoolkit"; - version = "1.19.4"; + version = "1.20.1"; src = fetchFromGitHub { owner = "httptoolkit"; repo = "httptoolkit-desktop"; tag = "v${version}"; - hash = "sha256-oDwAosyFY4ff9MP82O8q5o+mN/X6+J7hM3b7myfOq7k="; + hash = "sha256-1m4okGTNrboyj+QiMFPT7Z0/+FxZtxrqqAbuAobRgvU="; }; - npmDepsHash = "sha256-4kREJgw7OjKkOF/J1HpD3uPn+awtQIfUGWqJctwq3N0="; + npmDepsHash = "sha256-NH6Ppj6SsM0BXAgboMgp1ZPwN43ciLNBaHkz5yq8Ff8="; + + makeCacheWritable = true; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -41,7 +43,7 @@ buildNpmPackage rec { '"forceCodeSigning": true' \ '"forceCodeSigning": false' - cp -r ${electron.dist} electron-dist + cp -rL ${electron.dist} electron-dist chmod -R u+w electron-dist npm exec electron-builder -- \ From 5b99217b7a93f9e17049d27fcb737ae446c8d8de Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Tue, 22 Jul 2025 12:19:04 +0200 Subject: [PATCH 2/8] httptoolkit: pin electron_35 It does not build with newer releases of electron yet. (cherry picked from commit 39bb74e8e19ac19f16fbcf99d91418ca886cde90) --- pkgs/by-name/ht/httptoolkit/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ht/httptoolkit/package.nix b/pkgs/by-name/ht/httptoolkit/package.nix index ff21b202c373a..fd78ff33ee91c 100644 --- a/pkgs/by-name/ht/httptoolkit/package.nix +++ b/pkgs/by-name/ht/httptoolkit/package.nix @@ -6,10 +6,12 @@ makeWrapper, makeDesktopItem, copyDesktopItems, - electron, + electron_35, httptoolkit-server, }: - +let + electron = electron_35; +in buildNpmPackage rec { pname = "httptoolkit"; version = "1.20.1"; From dfe9c6cc63ed3d1572f5237708509f62df035560 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Aug 2025 22:58:56 +0000 Subject: [PATCH 3/8] httptoolkit: 1.20.1 -> 1.22.0 (cherry picked from commit 4ecbc7a0c1f85aaa610a26c043856d365e7db0c0) --- pkgs/by-name/ht/httptoolkit/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ht/httptoolkit/package.nix b/pkgs/by-name/ht/httptoolkit/package.nix index fd78ff33ee91c..e955b1962f268 100644 --- a/pkgs/by-name/ht/httptoolkit/package.nix +++ b/pkgs/by-name/ht/httptoolkit/package.nix @@ -14,16 +14,16 @@ let in buildNpmPackage rec { pname = "httptoolkit"; - version = "1.20.1"; + version = "1.22.0"; src = fetchFromGitHub { owner = "httptoolkit"; repo = "httptoolkit-desktop"; tag = "v${version}"; - hash = "sha256-1m4okGTNrboyj+QiMFPT7Z0/+FxZtxrqqAbuAobRgvU="; + hash = "sha256-8zvY/40hcZcoMojARktf5dpCsFFQk6h7P5KwukbEnjw="; }; - npmDepsHash = "sha256-NH6Ppj6SsM0BXAgboMgp1ZPwN43ciLNBaHkz5yq8Ff8="; + npmDepsHash = "sha256-yDXakndCGelLNTHD0atsb5MlWFiG8vINfNvsTTAXRTE="; makeCacheWritable = true; From f7531953064e68fdd5088378f9b9276b1f764bec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Sep 2025 18:44:42 +0000 Subject: [PATCH 4/8] httptoolkit: 1.22.0 -> 1.22.1 (cherry picked from commit 54f5d41805303f88ba511508c19bb7c18724ea85) --- pkgs/by-name/ht/httptoolkit/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ht/httptoolkit/package.nix b/pkgs/by-name/ht/httptoolkit/package.nix index e955b1962f268..36829a8176223 100644 --- a/pkgs/by-name/ht/httptoolkit/package.nix +++ b/pkgs/by-name/ht/httptoolkit/package.nix @@ -14,16 +14,16 @@ let in buildNpmPackage rec { pname = "httptoolkit"; - version = "1.22.0"; + version = "1.22.1"; src = fetchFromGitHub { owner = "httptoolkit"; repo = "httptoolkit-desktop"; tag = "v${version}"; - hash = "sha256-8zvY/40hcZcoMojARktf5dpCsFFQk6h7P5KwukbEnjw="; + hash = "sha256-6iiXOBVtPLdW9MWUcu2Hggm7uPHudASebRPQ34JJTMQ="; }; - npmDepsHash = "sha256-yDXakndCGelLNTHD0atsb5MlWFiG8vINfNvsTTAXRTE="; + npmDepsHash = "sha256-n4he0Z9XPQIZ8vZcWA7Vo36Oz5RGPGdnV2VJVu5OZRg="; makeCacheWritable = true; From b931c727c9894d38590db50434b07a401a279c62 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 17 Sep 2025 23:55:20 +0200 Subject: [PATCH 5/8] httptoolkit: use electron_37 (cherry picked from commit 8f0c9db2ee8deafbd4ddf5b25e7fc6cef272a59f) --- .../ht/httptoolkit/bump-node-abi.patch | 59 +++++++++++++++++++ pkgs/by-name/ht/httptoolkit/package.nix | 12 +++- 2 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 pkgs/by-name/ht/httptoolkit/bump-node-abi.patch 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; From 111d7550d95b3face84ff9d55786144cccc2f593 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 10 Mar 2025 12:34:06 +0100 Subject: [PATCH 6/8] httptoolkit-server: 1.19.3 -> 1.20.1 (cherry picked from commit 90dc29f32a8e429d5039c6e0af1379e01c0bf9ad) --- .../only-build-for-one-platform.patch | 20 ++++++++++++------- .../by-name/ht/httptoolkit-server/package.nix | 20 +++++++++++-------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ht/httptoolkit-server/only-build-for-one-platform.patch b/pkgs/by-name/ht/httptoolkit-server/only-build-for-one-platform.patch index 3d36c01d2ca46..eaf58f320ffb4 100644 --- a/pkgs/by-name/ht/httptoolkit-server/only-build-for-one-platform.patch +++ b/pkgs/by-name/ht/httptoolkit-server/only-build-for-one-platform.patch @@ -1,8 +1,8 @@ diff --git a/pack.ts b/pack.ts -index aba98cc..03ce86a 100644 +index 0212d09..03ce86a 100644 --- a/pack.ts +++ b/pack.ts -@@ -75,33 +75,7 @@ const packageApp = async () => { +@@ -75,39 +75,7 @@ const packageApp = async () => { delete pJson.scripts.prepack; // We don't want to rebuild - all built code will be in the packed content await fs.writeJson(path.join(OUTPUT_DIR, 'package.json'), pJson); @@ -10,20 +10,26 @@ index aba98cc..03ce86a 100644 - - // Run build-release in this folder, for each platform. For each bundle, we copy in - // only the relevant platform-specific NSS files. -- console.log('Building for Linux'); +- console.log('Building for Linux x64'); - await fs.mkdir(path.join(OUTPUT_DIR, 'nss')); - await fs.copy(path.join(__dirname, 'nss', 'linux'), path.join(OUTPUT_DIR, 'nss', 'linux')); -- await spawn(buildScript, ['linux'], { cwd: OUTPUT_DIR, stdio: 'inherit' }); +- await spawn(buildScript, ['linux', 'x64'], { cwd: OUTPUT_DIR, stdio: 'inherit' }); - -- console.log('Building for Darwin'); +- console.log('Building for Linux arm64'); +- await spawn(buildScript, ['linux', 'arm64'], { cwd: OUTPUT_DIR, stdio: 'inherit' }); +- +- console.log('Building for Darwin x64'); - await fs.remove(path.join(OUTPUT_DIR, 'nss', 'linux')); - await fs.copy(path.join(__dirname, 'nss', 'darwin'), path.join(OUTPUT_DIR, 'nss', 'darwin')); -- await spawn(buildScript, ['darwin'], { cwd: OUTPUT_DIR, stdio: 'inherit' }); +- await spawn(buildScript, ['darwin', 'x64'], { cwd: OUTPUT_DIR, stdio: 'inherit' }); +- +- console.log('Building for Darwin arm64'); +- await spawn(buildScript, ['darwin', 'arm64'], { cwd: OUTPUT_DIR, stdio: 'inherit' }); - - console.log('Building for Win32'); - await fs.remove(path.join(OUTPUT_DIR, 'nss', 'darwin')); - await fs.copy(path.join(__dirname, 'nss', 'win32'), path.join(OUTPUT_DIR, 'nss', 'win32')); -- await spawn(buildScript, ['win32'], { cwd: OUTPUT_DIR, stdio: 'inherit' }); +- await spawn(buildScript, ['win32', 'x64'], { cwd: OUTPUT_DIR, stdio: 'inherit' }); - - // Oclif builds a nodeless platform-agnostic bundle too (although in our case, nothing is - // really platform agnostic). Not necessary, probably won't work - drop it. diff --git a/pkgs/by-name/ht/httptoolkit-server/package.nix b/pkgs/by-name/ht/httptoolkit-server/package.nix index 64619776859d3..440916a58b961 100644 --- a/pkgs/by-name/ht/httptoolkit-server/package.nix +++ b/pkgs/by-name/ht/httptoolkit-server/package.nix @@ -9,19 +9,20 @@ pkg-config, openssl, libdatachannel, + plog, }: let nodejs = nodejs_20; buildNpmPackage' = buildNpmPackage.override { inherit nodejs; }; - version = "1.19.3"; + version = "1.20.1"; src = fetchFromGitHub { owner = "httptoolkit"; repo = "httptoolkit-server"; rev = "refs/tags/v${version}"; - hash = "sha256-cIxpV155A76TCOXurJhBA0dQpwn63hTpokBRXMLBEUA="; + hash = "sha256-iEAYZX7WNk6TvZ44GAOgTqXOcW5oFn4gX+kzixZZbWA="; }; overridesNodeModules = buildNpmPackage' { @@ -29,7 +30,7 @@ let inherit version src; sourceRoot = "${src.name}/overrides/js"; - npmDepsHash = "sha256-GRN6ua3FY1AE61bB7PM2wgbKPZI/zJeXa5HOOh/2N2Y="; + npmDepsHash = "sha256-Uw7XbfwLMX+zbSrzFgvB8lw3hxUyw1eRKazCITrT/28="; dontBuild = true; @@ -41,20 +42,20 @@ let nodeDatachannel = buildNpmPackage' { pname = "node-datachannel"; - version = "0.4.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "murat-dogan"; repo = "node-datachannel"; rev = "refs/tags/v${nodeDatachannel.version}"; - hash = "sha256-BlfeocqSG+pqbK0onnCf0VKbQw8Qq4qMxhAcfGlFYR8="; + hash = "sha256-xjYja+e2Z7X5cU4sEuSsJzG0gtmTPl3VrUf+ypd3zdw="; }; npmFlags = [ "--ignore-scripts" ]; makeCacheWritable = true; - npmDepsHash = "sha256-pgcOOjiuWKlpD+WJyPj/c9ZhDjYuEnybpLS/BPmzeFM="; + npmDepsHash = "sha256-Qhib9ZGulTXjoYcZIWunf3/BSd2SLXZuWEmMcstaphs="; nativeBuildInputs = [ cmake @@ -64,6 +65,7 @@ let buildInputs = [ openssl libdatachannel + plog ]; dontUseCmakeConfigure = true; @@ -73,10 +75,12 @@ let preBuild = '' # don't use static libs and don't use FetchContent + # don't try to link plog (it's headers-only) substituteInPlace CMakeLists.txt \ --replace-fail 'OPENSSL_USE_STATIC_LIBS TRUE' 'OPENSSL_USE_STATIC_LIBS FALSE' \ --replace-fail 'if(NOT libdatachannel)' 'if(false)' \ - --replace-fail 'datachannel-static' 'datachannel' + --replace-fail 'datachannel-static' 'datachannel' \ + --replace-fail 'plog::plog' "" # don't fetch node headers substituteInPlace node_modules/cmake-js/lib/dist.js \ @@ -98,7 +102,7 @@ buildNpmPackage' { patches = [ ./only-build-for-one-platform.patch ]; - npmDepsHash = "sha256-GZESwRDG1gEVhkclR+LBWwoUYaE1xS0z4EvPN7kYTrA="; + npmDepsHash = "sha256-gHXop4CTsQTSMrZ5mBHkMcmpOr2MIjVLrzjLLCfZ3As="; npmFlags = [ "--ignore-scripts" ]; From 658f7ad4c7aed3fc763ace20938cbae76c6db3db Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Fri, 8 Aug 2025 01:16:46 +0200 Subject: [PATCH 7/8] httptoolkit-server: 1.20.1 -> 1.22.0 (cherry picked from commit c45027f5d605eb08260ceb0b9f38d80afa3cf1c9) --- pkgs/by-name/ht/httptoolkit-server/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ht/httptoolkit-server/package.nix b/pkgs/by-name/ht/httptoolkit-server/package.nix index 440916a58b961..acca4d3df9aab 100644 --- a/pkgs/by-name/ht/httptoolkit-server/package.nix +++ b/pkgs/by-name/ht/httptoolkit-server/package.nix @@ -16,13 +16,13 @@ let nodejs = nodejs_20; buildNpmPackage' = buildNpmPackage.override { inherit nodejs; }; - version = "1.20.1"; + version = "1.22.0"; src = fetchFromGitHub { owner = "httptoolkit"; repo = "httptoolkit-server"; - rev = "refs/tags/v${version}"; - hash = "sha256-iEAYZX7WNk6TvZ44GAOgTqXOcW5oFn4gX+kzixZZbWA="; + tag = "v${version}"; + hash = "sha256-4kvpTqajlBWIYveedmlo2yrnbEdN/V+96/Lf54miMuw="; }; overridesNodeModules = buildNpmPackage' { @@ -30,7 +30,7 @@ let inherit version src; sourceRoot = "${src.name}/overrides/js"; - npmDepsHash = "sha256-Uw7XbfwLMX+zbSrzFgvB8lw3hxUyw1eRKazCITrT/28="; + npmDepsHash = "sha256-MtUJY9IxzkGPuoIXHAr9nNNF+NpEf2b/oAYauJPwdaw="; dontBuild = true; @@ -47,7 +47,7 @@ let src = fetchFromGitHub { owner = "murat-dogan"; repo = "node-datachannel"; - rev = "refs/tags/v${nodeDatachannel.version}"; + tag = "v${nodeDatachannel.version}"; hash = "sha256-xjYja+e2Z7X5cU4sEuSsJzG0gtmTPl3VrUf+ypd3zdw="; }; @@ -102,7 +102,7 @@ buildNpmPackage' { patches = [ ./only-build-for-one-platform.patch ]; - npmDepsHash = "sha256-gHXop4CTsQTSMrZ5mBHkMcmpOr2MIjVLrzjLLCfZ3As="; + npmDepsHash = "sha256-J6QmJsnl5UCxeSKIcekdguM+M5Z2HBYRat5nt18zPYU="; npmFlags = [ "--ignore-scripts" ]; From 70cd455fe2b8b15b55f07878cd65751a96263120 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Sep 2025 14:53:01 +0000 Subject: [PATCH 8/8] httptoolkit-server: 1.22.0 -> 1.22.1 (cherry picked from commit 020a0bc2d134d3fc1d7fd411eedfd89a49d2e255) --- pkgs/by-name/ht/httptoolkit-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ht/httptoolkit-server/package.nix b/pkgs/by-name/ht/httptoolkit-server/package.nix index acca4d3df9aab..666754572c501 100644 --- a/pkgs/by-name/ht/httptoolkit-server/package.nix +++ b/pkgs/by-name/ht/httptoolkit-server/package.nix @@ -16,13 +16,13 @@ let nodejs = nodejs_20; buildNpmPackage' = buildNpmPackage.override { inherit nodejs; }; - version = "1.22.0"; + version = "1.22.1"; src = fetchFromGitHub { owner = "httptoolkit"; repo = "httptoolkit-server"; tag = "v${version}"; - hash = "sha256-4kvpTqajlBWIYveedmlo2yrnbEdN/V+96/Lf54miMuw="; + hash = "sha256-6mvbR9WIjVrulDdFtW0XSfxPwKSaFK1fFIhbglS7Gq4="; }; overridesNodeModules = buildNpmPackage' { @@ -102,7 +102,7 @@ buildNpmPackage' { patches = [ ./only-build-for-one-platform.patch ]; - npmDepsHash = "sha256-J6QmJsnl5UCxeSKIcekdguM+M5Z2HBYRat5nt18zPYU="; + npmDepsHash = "sha256-z9LLZBt7CR3iCNsGhRboHgaaoH6MgmSrzasgwIX+iwk="; npmFlags = [ "--ignore-scripts" ];