From 34855dce8082683fab63da3da70323f0fe48d439 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 9 Jul 2025 17:07:40 -0700 Subject: [PATCH] Modern nix always needs --experimental-features --- pinch.py | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pinch.py b/pinch.py index bdd7a6e..40ebf1b 100644 --- a/pinch.py +++ b/pinch.py @@ -320,22 +320,12 @@ def digest_file(filename: str) -> Digest16: return Digest16(hasher.hexdigest()) -@functools.lru_cache -def _experimental_flag_needed(v: Verification) -> bool: - v.status('Checking Nix version') - process = subprocess.run(['nix', '--help'], stdout=subprocess.PIPE) - v.result(process.returncode == 0) - return b'--experimental-features' in process.stdout - - -def _nix_command(v: Verification) -> List[str]: - return ['nix', '--experimental-features', - 'nix-command'] if _experimental_flag_needed(v) else ['nix'] +_NIX_COMMAND = ['nix', '--experimental-features', 'nix-command'] def to_Digest16(v: Verification, digest32: Digest32) -> Digest16: v.status('Converting digest to base16') - process = subprocess.run(_nix_command(v) + [ + process = subprocess.run(_NIX_COMMAND + [ 'to-base16', '--type', 'sha256', @@ -347,7 +337,7 @@ def to_Digest16(v: Verification, digest32: Digest32) -> Digest16: def to_Digest32(v: Verification, digest16: Digest16) -> Digest32: v.status('Converting digest to base32') - process = subprocess.run(_nix_command(v) + [ + process = subprocess.run(_NIX_COMMAND + [ 'to-base32', '--type', 'sha256', -- 2.50.1