From 272af01b8e8206f4c6e8000dad185bffc79f0112 Mon Sep 17 00:00:00 2001 From: Quentin Kaiser Date: Tue, 27 Jan 2026 14:45:44 +0100 Subject: [PATCH] sasquatch: 4.5.1-5 -> 4.5.1-6 C23 prototypes patch has been upstreamed and is no longer needed. See https://github.com/onekey-sec/sasquatch/pull/32 --- .../sa/sasquatch/gcc15-fix-prototypes.patch | 22 ------------------- pkgs/by-name/sa/sasquatch/package.nix | 11 +++------- 2 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 pkgs/by-name/sa/sasquatch/gcc15-fix-prototypes.patch diff --git a/pkgs/by-name/sa/sasquatch/gcc15-fix-prototypes.patch b/pkgs/by-name/sa/sasquatch/gcc15-fix-prototypes.patch deleted file mode 100644 index 062bb357fce5..000000000000 --- a/pkgs/by-name/sa/sasquatch/gcc15-fix-prototypes.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c -index ed5096b32d..adb6a91c7e 100644 ---- a/squashfs-tools/unsquashfs.c -+++ b/squashfs-tools/unsquashfs.c -@@ -146,7 +146,7 @@ - - #define MAX_LINE 16384 - --void sigwinch_handler() -+void sigwinch_handler(int _signal) - { - struct winsize winsize; - -@@ -160,7 +160,7 @@ - } - - --void sigalrm_handler() -+void sigalrm_handler(int _signal) - { - rotate = (rotate + 1) % 4; - } diff --git a/pkgs/by-name/sa/sasquatch/package.nix b/pkgs/by-name/sa/sasquatch/package.nix index fac1e79e72e3..070c400e96b9 100644 --- a/pkgs/by-name/sa/sasquatch/package.nix +++ b/pkgs/by-name/sa/sasquatch/package.nix @@ -14,21 +14,16 @@ let drv = stdenv.mkDerivation (finalAttrs: { pname = "sasquatch"; - version = "4.5.1-5"; + version = "4.5.1-6"; src = fetchFromGitHub { owner = "onekey-sec"; repo = "sasquatch"; rev = "sasquatch-v${finalAttrs.version}"; - hash = "sha256-4Mltt0yFt4oh9hsrHL8/ch5n7nZYiXIJ1UgLktPvlKQ="; + hash = "sha256-qwbrpm7df35fHLbCJvGkmYY7cb6twt9dGBK+yXlQviU="; }; - patches = [ - # Fix build for GCC 15/C23 by adding parameters to unsquashfs signal - # handlers instead of relying on an empty parameter list. - ./gcc15-fix-prototypes.patch - ] - ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch; + patches = lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch; strictDeps = true; nativeBuildInputs = [ which ];