diff --git a/pkgs/by-name/ch/chameleon-cli/package.nix b/pkgs/by-name/ch/chameleon-cli/package.nix index 4b2264e7475a..1c69248c8b98 100644 --- a/pkgs/by-name/ch/chameleon-cli/package.nix +++ b/pkgs/by-name/ch/chameleon-cli/package.nix @@ -4,8 +4,10 @@ fetchFromGitHub, cmake, makeWrapper, + openssl, xz, python3, + nix-update-script, }: let @@ -21,18 +23,16 @@ in stdenv.mkDerivation (finalAttrs: { pname = "chameleon-cli"; - version = "2.1.0-unstable-2025-10-13"; + version = "2.1.0-unstable-2026-02-06"; src = fetchFromGitHub { owner = "RfidResearchGroup"; repo = "ChameleonUltra"; - rev = "97dfe5b9a41a6ea5535c6842afbe420098c4844b"; - sparseCheckout = [ "software" ]; - hash = "sha256-zFExh0vhzNcf02izgO4P4cWq3LoQpEHb4ZW7hsHZqNA="; + rev = "2c7c3eeb4df8eee7451aff7c5ddae5d10cd0c34d"; + rootDir = "software"; + hash = "sha256-5QlJGmUjJKWc7e53zMXNoNXTBhwpepThKn9xMKpF16s="; }; - sourceRoot = "${finalAttrs.src.name}/software"; - postPatch = '' substituteInPlace src/CMakeLists.txt \ --replace-fail "liblzma" "lzma" \ @@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + openssl xz ]; @@ -67,7 +68,12 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version=branch" + "--version-regex=v(.*)" + ]; + }; meta = { description = "Command line interface for Chameleon Ultra"; diff --git a/pkgs/by-name/ch/chameleon-cli/update.sh b/pkgs/by-name/ch/chameleon-cli/update.sh deleted file mode 100755 index 2875b72ffacd..000000000000 --- a/pkgs/by-name/ch/chameleon-cli/update.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils nix-update - -# This update script exists, because nix-update is unable to ignore `dev` -# tags that exist on the upstream repo. -# -# Once https://github.com/Mic92/nix-update/issues/322 is resolved it can be -# removed. - -set -exuo pipefail - -cd "$(git rev-parse --show-toplevel)" - -nix-update --version=branch chameleon-cli - -tag=$(git ls-remote --tags --refs --sort='-version:refname' https://github.com/RfidResearchGroup/ChameleonUltra.git 'v*' | head -n 1 | cut --delimiter=/ --field=3-) -tag="${tag#v}" -sed -i -e 's|version = "[^-]*-unstable-|version = "'"${tag}"'-unstable-|' pkgs/by-name/ch/chameleon-cli/package.nix