From: Scott Worley <scottworley@scottworley.com>
Date: Thu, 10 Jul 2025 00:07:40 +0000 (-0700)
Subject: Modern nix always needs --experimental-features
X-Git-Tag: v3.2.0~1
X-Git-Url: http://git.scottworley.com/pinch/commitdiff_plain/34855dce8082683fab63da3da70323f0fe48d439?hp=2a6cedfe22d12056af5240b983262e98cd5f131d

Modern nix always needs --experimental-features
---

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',