lix-project/lix
19
42
Fork 18
Code Issues 295 Code Review (Gerrit) Projects 1 Releases Wiki Activity

Merge branch 'ca-derivation-data-types' of github.com:obsidiansystems/nix into misc-ca

Browse source
This commit is contained in:
Carlo Nucera 2020-07-20 14:14:39 -04:00
parent 5ae747b434 362ae93851
commit 007bf6d17a
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libfetchers/git.cc
View file

@ -121,7 +121,7 @@ struct GitInputScheme : InputScheme
args.push_back(*ref); args.push_back(*ref);
} }
if (input.getRev()) throw Error("cloning a specific revision is not implemented"); if (input.getRev()) throw UnimplementedError("cloning a specific revision is not implemented");
args.push_back(destDir); args.push_back(destDir);

2
src/libstore/build.cc
View file

@ -1197,7 +1197,7 @@ void DerivationGoal::haveDerivation()
if (parsedDrv->contentAddressed()) { if (parsedDrv->contentAddressed()) {
settings.requireExperimentalFeature("ca-derivations"); settings.requireExperimentalFeature("ca-derivations");
throw Error("ca-derivations isn't implemented yet"); throw UnimplementedError("ca-derivations isn't implemented yet");
} }

2
src/libstore/derivations.hh
View file

@ -45,7 +45,7 @@ struct DerivationOutput
/* DEPRECATED: Remove after CA drvs are fully implemented */ /* DEPRECATED: Remove after CA drvs are fully implemented */
StorePath path(const Store & store, std::string_view drvName) const { StorePath path(const Store & store, std::string_view drvName) const {
auto p = pathOpt(store, drvName); auto p = pathOpt(store, drvName);
if (!p) throw Error("floating content-addressed derivations are not yet implemented"); if (!p) throw UnimplementedError("floating content-addressed derivations are not yet implemented");
return *p; return *p;
} }
}; };

1
src/libutil/error.hh
View file

@ -192,6 +192,7 @@ public:
MakeError(Error, BaseError); MakeError(Error, BaseError);
MakeError(UsageError, Error); MakeError(UsageError, Error);
MakeError(UnimplementedError, Error);
class SysError : public Error class SysError : public Error
{ {