From 72a3c73d8539f3be03e960a6ef4d5d6be958b16b Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jul 2024 23:04:12 +0300 Subject: [PATCH 1/4] ios-webkit-debug-proxy: move to `pkgs/by-name` --- .../ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch | 0 .../io/ios-webkit-debug-proxy/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{development/mobile => by-name/io}/ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch (100%) rename pkgs/{development/mobile/ios-webkit-debug-proxy/default.nix => by-name/io/ios-webkit-debug-proxy/package.nix} (100%) diff --git a/pkgs/development/mobile/ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch b/pkgs/by-name/io/ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch similarity index 100% rename from pkgs/development/mobile/ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch rename to pkgs/by-name/io/ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch diff --git a/pkgs/development/mobile/ios-webkit-debug-proxy/default.nix b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix similarity index 100% rename from pkgs/development/mobile/ios-webkit-debug-proxy/default.nix rename to pkgs/by-name/io/ios-webkit-debug-proxy/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f90e707a504..7e98bf1d1b06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3995,8 +3995,6 @@ with pkgs; xc = callPackage ../development/tools/xc { }; - ios-webkit-debug-proxy = callPackage ../development/mobile/ios-webkit-debug-proxy { }; - xcodeenv = callPackage ../development/mobile/xcodeenv { }; xcodes = swiftPackages.callPackage ../development/tools/xcodes { From 1dd31a7861b25fdfa63f6ee0590a612fa2447a92 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jul 2024 22:57:39 +0300 Subject: [PATCH 2/4] ios-webkit-debug-proxy: reformat --- .../io/ios-webkit-debug-proxy/package.nix | 62 ++++++++++++------- 1 file changed, 41 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix index 3b32a1bb9a31..0f40c24c9171 100644 --- a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix +++ b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix @@ -1,25 +1,33 @@ -{ stdenv -, autoconf -, automake -, fetchFromGitHub -, fetchpatch -, lib -, libimobiledevice -, libusb1 -, libplist -, libtool -, openssl -, pkg-config +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + + autoconf, + automake, + libtool, + pkg-config, + + libimobiledevice, + libplist, + libusb1, + openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ios-webkit-debug-proxy"; version = "1.9.0"; + outputs = [ + "out" + "dev" + ]; + src = fetchFromGitHub { owner = "google"; - repo = pname; - rev = "v${version}"; + repo = "ios-webkit-debug-proxy"; + rev = "v${finalAttrs.version}"; hash = "sha256-cZ/p/aWET/BXKDrD+qgR+rfTISd+4jPNQFuV8klSLUo="; }; @@ -38,10 +46,19 @@ stdenv.mkDerivation rec { ./0001-Don-t-compile-examples.patch ]; - outputs = [ "out" "dev" ]; + nativeBuildInputs = [ + autoconf + automake + libtool + pkg-config + ]; - nativeBuildInputs = [ autoconf automake libtool pkg-config ]; - buildInputs = [ libimobiledevice libusb1 libplist openssl ]; + buildInputs = [ + libimobiledevice + libplist + libusb1 + openssl + ]; preConfigure = '' NOCONFIGURE=1 ./autogen.sh @@ -51,7 +68,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "DevTools proxy (Chrome Remote Debugging Protocol) for iOS devices (Safari Remote Web Inspector)"; - mainProgram = "ios_webkit_debug_proxy"; longDescription = '' The ios_webkit_debug_proxy (aka iwdp) proxies requests from usbmuxd daemon over a websocket connection, allowing developers to send commands @@ -59,6 +75,10 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/google/ios-webkit-debug-proxy"; license = licenses.bsd3; - maintainers = [ maintainers.abustany ]; + mainProgram = "ios_webkit_debug_proxy"; + maintainers = with maintainers; [ + abustany + paveloom + ]; }; -} +}) From 8de2a2656feeb67b47e6174031b75416487434f5 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jul 2024 22:59:48 +0300 Subject: [PATCH 3/4] ios-webkit-debug-proxy: add the `updateScript` and the version test --- pkgs/by-name/io/ios-webkit-debug-proxy/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix index 0f40c24c9171..626da3700246 100644 --- a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix +++ b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix @@ -13,6 +13,10 @@ libplist, libusb1, openssl, + + ios-webkit-debug-proxy, + nix-update-script, + testers, }: stdenv.mkDerivation (finalAttrs: { @@ -66,6 +70,11 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = ios-webkit-debug-proxy; }; + }; + meta = with lib; { description = "DevTools proxy (Chrome Remote Debugging Protocol) for iOS devices (Safari Remote Web Inspector)"; longDescription = '' From 671396fe510ebf03110c6fb81bc0359402bf7b70 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jul 2024 23:11:17 +0300 Subject: [PATCH 4/4] ios-webkit-debug-proxy: 1.9.0 -> 1.9.1 --- pkgs/by-name/io/ios-webkit-debug-proxy/package.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix index 626da3700246..13ecbb058c06 100644 --- a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix +++ b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ios-webkit-debug-proxy"; - version = "1.9.0"; + version = "1.9.1"; outputs = [ "out" @@ -32,20 +32,10 @@ stdenv.mkDerivation (finalAttrs: { owner = "google"; repo = "ios-webkit-debug-proxy"; rev = "v${finalAttrs.version}"; - hash = "sha256-cZ/p/aWET/BXKDrD+qgR+rfTISd+4jPNQFuV8klSLUo="; + hash = "sha256-94gYTv5v4YNwbiUJ/9PIHU+Bnvf5uN12+oMFWKj+J1Y="; }; patches = [ - # OpenSSL 3.0 compatibility - (fetchpatch { - url = "https://github.com/google/ios-webkit-debug-proxy/commit/5ba30a2a67f39d25025cadf37c0eafb2e2d2d0a8.patch"; - hash = "sha256-2b9BjG9wkqO+ZfoBYYJvD2Db5Kr0F/MxKMTRsI0ea3s="; - }) - (fetchpatch { - name = "libplist-2.3.0-compatibility.patch"; - url = "https://github.com/google/ios-webkit-debug-proxy/commit/94e4625ea648ece730d33d13224881ab06ad0fce.patch"; - hash = "sha256-2deFAKIcNPDd1loOSe8pWZWs9idIE5Q2+pLkoVQrTLg="; - }) # Examples compilation breaks with --disable-static, see https://github.com/google/ios-webkit-debug-proxy/issues/399 ./0001-Don-t-compile-examples.patch ];