Release 3.3.1

[pinch] / pinch.py

diff --git a/pinch.py b/pinch.py
index 40ebf1b6248c121b1775cb2b36df3580e91334c9..989e08fd4f6769078290f749650fb7a6811ad397 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -326,27 +326,18 @@ _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 + [
-        'to-base16',
-        '--type',
+        'hash',
+        'convert',
+        '--hash-algo',
         'sha256',
+        '--to',
+        'base16',
         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_COMMAND + [
-        'to-base32',
-        '--type',
-        'sha256',
-        digest16],
-        stdout=subprocess.PIPE)
-    v.result(process.returncode == 0)
-    return Digest32(process.stdout.decode().strip())
-
-
 def fetch_with_nix_prefetch_url(
         v: Verification,
         url: str,