From 4d9eacfcf753acbcfa0f513bec725e9017076270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Fri, 2 Feb 2024 00:59:36 +0100 Subject: [PATCH] Support base16 1.0 (#33) See https://github.com/emilypi/Base16/blob/master/MIGRATION-1.0.md --- nix-serve-ng.cabal | 2 +- src/Nix.hsc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nix-serve-ng.cabal b/nix-serve-ng.cabal index 2484fe7..9298f9a 100644 --- a/nix-serve-ng.cabal +++ b/nix-serve-ng.cabal @@ -39,7 +39,7 @@ executable nix-serve cxx-options: -std=c++17 build-depends: base < 5 - , base16 + , base16 >= 1.0 , base32 , bytestring , charset diff --git a/src/Nix.hsc b/src/Nix.hsc index f336617..0bd007d 100644 --- a/src/Nix.hsc +++ b/src/Nix.hsc @@ -231,7 +231,7 @@ fingerprintPath storePath PathInfo{ narHash, narSize, references } = do base32Suffix <- if | ByteString.length suffix == 64 - , Right digest <- Base16.decodeBase16 suffix -> + , Right digest <- Base16.decodeBase16Untyped suffix -> return (Base32.encodeBase32' digest) | ByteString.length suffix == 52 -> return suffix