diff --git a/src/libstore-tests/dummy-store.cc b/src/libstore-tests/dummy-store.cc index f53fc03b4..3ac3c2651 100644 --- a/src/libstore-tests/dummy-store.cc +++ b/src/libstore-tests/dummy-store.cc @@ -1,6 +1,7 @@ #include #include +#include "nix/util/bytes.hh" #include "nix/util/memory-source-accessor.hh" #include "nix/store/dummy-store-impl.hh" #include "nix/store/globals.hh" @@ -105,7 +106,7 @@ INSTANTIATE_TEST_SUITE_P(DummyStoreJSON, DummyStoreJsonTest, [] { auto sc = make_ref(); sc->root = MemorySourceAccessor::File{MemorySourceAccessor::File::Regular{ .executable = false, - .contents = "asdf", + .contents = to_owned(as_bytes("asdf")), }}; return sc; }(), diff --git a/src/libstore/dummy-store.cc b/src/libstore/dummy-store.cc index 2a4c21b5f..b4b1d1f61 100644 --- a/src/libstore/dummy-store.cc +++ b/src/libstore/dummy-store.cc @@ -1,5 +1,6 @@ #include "nix/store/store-registration.hh" #include "nix/util/archive.hh" +#include "nix/util/bytes.hh" #include "nix/util/callback.hh" #include "nix/util/memory-source-accessor.hh" #include "nix/util/json-utils.hh" @@ -160,7 +161,7 @@ struct DummyStoreImpl : DummyStore .method = ContentAddressMethod::Raw::Text, .hash = hashString( HashAlgorithm::SHA256, - std::get(accessor->root->raw).contents), + to_str(std::get(accessor->root->raw).contents)), }; callback(std::move(info)); return; @@ -428,7 +429,7 @@ ref adl_serializer>::from_json(const json & json) auto vref = make_ref(v2); res->buildTrace.insert_or_visit( { - Hash::parseExplicitFormatUnprefixed(k0, HashAlgorithm::SHA256, HashFormat::Base64), + StorePath{k0}, {{k1, vref}}, }, [&](auto & kv) { kv.second.insert_or_assign(k1, vref); }); @@ -464,7 +465,7 @@ void adl_serializer>::to_json(json & json, const ref auto obj = json::object(); val->buildTrace.cvisit_all([&](const auto & kv) { auto & [k, v] = kv; - auto & obj2 = obj[k.to_string(HashFormat::Base64, false)] = json::object(); + auto & obj2 = obj[k.to_string()] = json::object(); for (auto & [k2, v2] : kv.second) obj2[k2] = *v2; });