From 4218a1dc47ad05cebba4a33b389632e6716f6b0f Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sun, 24 Aug 2025 19:55:16 +0800 Subject: [PATCH] chameleon-cli: 2.0.0-unstable-2025-08-04 -> 2.0.0-unstable-2025-08-19 Also remove patch that already merged upstream --- pkgs/by-name/ch/chameleon-cli/package.nix | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ch/chameleon-cli/package.nix b/pkgs/by-name/ch/chameleon-cli/package.nix index fec07c514110..5fa514d7db20 100644 --- a/pkgs/by-name/ch/chameleon-cli/package.nix +++ b/pkgs/by-name/ch/chameleon-cli/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, makeWrapper, xz, @@ -22,29 +21,18 @@ in stdenv.mkDerivation (finalAttrs: { pname = "chameleon-cli"; - version = "2.0.0-unstable-2025-08-04"; + version = "2.0.0-unstable-2025-08-19"; src = fetchFromGitHub { owner = "RfidResearchGroup"; repo = "ChameleonUltra"; - rev = "098e0a914b206900f7ea7ae7265486c4349ab644"; + rev = "09870c3fc5094fee779b821feaae31397d4f040c"; sparseCheckout = [ "software" ]; - hash = "sha256-WKxP4jLHkTqBO+nwxhr8DRb3TzDIMlwjA4v+6txQbDo="; + hash = "sha256-ePY602AT9+LBRcVLWR7I46rV+6JK0HYcb9iy/UQwmwU="; }; sourceRoot = "${finalAttrs.src.name}/software"; - patches = [ - # Use execute_tool to simplify running hardnested tool, - # also fix when the dir conatains hardnested is read only - # https://github.com/RfidResearchGroup/ChameleonUltra/pull/266 - (fetchpatch { - url = "https://github.com/RfidResearchGroup/ChameleonUltra/commit/39270fd09ee61ef0659bf3b79ffa4d2b27f3ba63.patch"; - hash = "sha256-OlHQ2cL+NFdTsSPFI9geg3dabATRjyKxGp5gGG+eDl8="; - stripLen = 1; - }) - ]; - postPatch = '' substituteInPlace src/CMakeLists.txt \ --replace-fail "liblzma" "lzma" \