Merge branch 'master' of github.com:NixOS/nix into derivation-primop-floating-output

2 files changed, 4 insertions, 4 deletions

diff --git a/src/libstore/content-address.cc b/src/libstore/content-address.cc
index 38acaa4bf..0885c3d0e 100644
--- a/src/libstore/content-address.cc
+++ b/src/libstore/content-address.cc
@@ -44,14 +44,14 @@ ContentAddress parseContentAddress(std::string_view rawCa) {
     {
         auto optPrefix = splitPrefixTo(rest, ':');
         if (!optPrefix)
-            throw UsageError("not a content address because it is not in the form \"<prefix>:<rest>\": %s", rawCa);
+            throw UsageError("not a content address because it is not in the form '<prefix>:<rest>': %s", rawCa);
         prefix = *optPrefix;
     }
 
     auto parseHashType_ = [&](){
         auto hashTypeRaw = splitPrefixTo(rest, ':');
         if (!hashTypeRaw)
-            throw UsageError("content address hash must be in form \"<algo>:<hash>\", but found: %s", rawCa);
+            throw UsageError("content address hash must be in form '<algo>:<hash>', but found: %s", rawCa);
         HashType hashType = parseHashType(*hashTypeRaw);
         return std::move(hashType);
     };
@@ -77,7 +77,7 @@ ContentAddress parseContentAddress(std::string_view rawCa) {
             .hash = Hash::parseNonSRIUnprefixed(rest, std::move(hashType)),
         };
     } else
-        throw UsageError("content address prefix \"%s\" is unrecognized. Recogonized prefixes are \"text\" or \"fixed\"", prefix);
+        throw UsageError("content address prefix '%s' is unrecognized. Recogonized prefixes are 'text' or 'fixed'", prefix);
 };
 
 std::optional<ContentAddress> parseContentAddressOpt(std::string_view rawCaOpt) {
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index de7ddb84b..3c66a4dfd 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -578,7 +578,7 @@ void LocalStore::checkDerivationOutputs(const StorePath & drvPath, const Derivat
                 envHasRightPath(path, i.first);
             },
             [&](DerivationOutputCAFloating _) {
-                throw UnimplementedError("Floating CA output derivations are not yet implemented");
+                throw UnimplementedError("floating CA output derivations are not yet implemented");
             },
         }, i.second.output);
     }