diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-12-04 00:31:09 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-12-04 00:31:09 +0100 |
| commit | c3c23a52ee1c5844343bc5ed075791ec7fec6413 (patch) | |
| tree | baf65223d87d2a5a5030f88208ceebab790624da /src/libstore/store-api.hh | |
| parent | e721f99817bb7154d8098c902e25f84521a90b7f (diff) | |
| parent | c1d18050b4cfed9eba68d4d21b397c6cce035e37 (diff) | |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'src/libstore/store-api.hh')
| -rw-r--r-- | src/libstore/store-api.hh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh index 814ec8d29..e2e720fc4 100644 --- a/src/libstore/store-api.hh +++ b/src/libstore/store-api.hh @@ -20,13 +20,13 @@ namespace nix { -MakeError(SubstError, Error) -MakeError(BuildError, Error) /* denotes a permanent build failure */ -MakeError(InvalidPath, Error) -MakeError(Unsupported, Error) -MakeError(SubstituteGone, Error) -MakeError(SubstituterDisabled, Error) -MakeError(NotInStore, Error) +MakeError(SubstError, Error); +MakeError(BuildError, Error); // denotes a permanent build failure +MakeError(InvalidPath, Error); +MakeError(Unsupported, Error); +MakeError(SubstituteGone, Error); +MakeError(SubstituterDisabled, Error); +MakeError(NotInStore, Error); struct BasicDerivation; @@ -570,7 +570,7 @@ public: unsigned long long & downloadSize, unsigned long long & narSize); /* Sort a set of paths topologically under the references - relation. If p refers to q, then p preceeds q in this list. */ + relation. If p refers to q, then p precedes q in this list. */ Paths topoSortPaths(const PathSet & paths); /* Export multiple paths in the format expected by ‘nix-store |