X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/34855dce8082683fab63da3da70323f0fe48d439..6b7d6a8a278a8f1d1430ef15f4fbe74fb45e3fa7:/pinch.py diff --git a/pinch.py b/pinch.py index 40ebf1b..989e08f 100644 --- 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,