diff options
| author | Griffin Smith <grfn@gws.fyi> | 2020-08-04T02·13-0400 |
|---|---|---|
| committer | glittershark <grfn@gws.fyi> | 2020-08-04T22·49+0000 |
| commit | e634e2757721c420bf52e485019c13bc0b0e0f91 (patch) | |
| tree | 1dfad214833d0e3d7fb84daab1e799e3477b1f38 /third_party/nix/src/libutil | |
| parent | 94387dbc25e350b56f3ba1c63145ff2ed4c3f43b (diff) | |
fix(tvix): Partially revert "eliminate exposed global variable" r/1581
This reverts part of commit 976a36c2e482f416acd79a624e6d96cce2564b5b, which was causing scanForReferences to hang indefinitely. I'm not sure what the original intent of the commit was since there's not really much of a commit message on it, but with this I am able to fully realise derivations. Change-Id: I620e892e2fe2244f066512286b086b3dd8f8f6c0 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1635 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: kanepyork <rikingcoding@gmail.com>
Diffstat (limited to 'third_party/nix/src/libutil')
| -rw-r--r-- | third_party/nix/src/libutil/hash.cc | 3 | ||||
| -rw-r--r-- | third_party/nix/src/libutil/hash.hh | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/third_party/nix/src/libutil/hash.cc b/third_party/nix/src/libutil/hash.cc index ac151201fd34..97cc137b11a7 100644 --- a/third_party/nix/src/libutil/hash.cc +++ b/third_party/nix/src/libutil/hash.cc @@ -104,9 +104,6 @@ bool Hash::IsValidBase16(absl::string_view s) { return true; } -// omitted: E O U T -constexpr char base32Chars[] = "0123456789abcdfghijklmnpqrsvwxyz"; - constexpr signed char kUnBase32[] = { -1, -1, -1, -1, -1, -1, -1, -1, /* unprintables */ -1, -1, -1, -1, -1, -1, -1, -1, /* unprintables */ diff --git a/third_party/nix/src/libutil/hash.hh b/third_party/nix/src/libutil/hash.hh index 56845e715491..bc32f9146373 100644 --- a/third_party/nix/src/libutil/hash.hh +++ b/third_party/nix/src/libutil/hash.hh @@ -21,6 +21,9 @@ const int sha1HashSize = 20; const int sha256HashSize = 32; const int sha512HashSize = 64; +// omitted: E O U T +constexpr char base32Chars[] = "0123456789abcdfghijklmnpqrsvwxyz"; + enum Base : int { Base64, Base32, Base16, SRI }; struct Hash { |