X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/d06918bc9c80208be1f75162021bfe308b9a0161..10adf165ad567b19f3a389d33788afa91b42425a:/pinch.py?ds=sidebyside

diff --git a/pinch.py b/pinch.py
index 5eb7601..c26070b 100644
--- a/pinch.py
+++ b/pinch.py
@@ -302,18 +302,40 @@ def digest_file(filename: str) -> Digest16:
     return Digest16(hasher.hexdigest())
 
 
+_experimental_flag_needed = None
+
+
+def _nix_command(v: Verification) -> List[str]:
+    global _experimental_flag_needed
+    if _experimental_flag_needed is None:
+        v.status('Checking Nix version')
+        process = subprocess.run(['nix', '--help'], stdout=subprocess.PIPE)
+        v.result(process.returncode == 0)
+        _experimental_flag_needed = b'--experimental-features' in process.stdout
+    return ['nix', '--experimental-features',
+            'nix-command'] if _experimental_flag_needed else ['nix']
+
+
 def to_Digest16(v: Verification, digest32: Digest32) -> Digest16:
     v.status('Converting digest to base16')
-    process = subprocess.run(
-        ['nix', 'to-base16', '--type', 'sha256', digest32], stdout=subprocess.PIPE)
+    process = subprocess.run(_nix_command(v) + [
+        'to-base16',
+        '--type',
+        'sha256',
+        digest32],
+        stdout=subprocess.PIPE)
     v.result(process.returncode == 0)
     return Digest16(process.stdout.decode().strip())
 
 
 def to_Digest32(v: Verification, digest16: Digest16) -> Digest32:
     v.status('Converting digest to base32')
-    process = subprocess.run(
-        ['nix', 'to-base32', '--type', 'sha256', digest16], stdout=subprocess.PIPE)
+    process = subprocess.run(_nix_command(v) + [
+        'to-base32',
+        '--type',
+        'sha256',
+        digest16],
+        stdout=subprocess.PIPE)
     v.result(process.returncode == 0)
     return Digest32(process.stdout.decode().strip())