max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-24 14:56:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Give a better error message in case of unlocked inputs

Browse source
This commit is contained in:
Eelco Dolstra 2022-06-02 16:15:57 +02:00
parent 1395210a68
commit 1c7d0b716d
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libexpr/flake/flake.cc
View file

@ -630,9 +630,9 @@ LockedFlake lockFlake(
if (lockFlags.writeLockFile) { if (lockFlags.writeLockFile) {
if (auto sourcePath = topRef.input.getSourcePath()) { if (auto sourcePath = topRef.input.getSourcePath()) {
if (!newLockFile.isLocked()) { if (auto unlockedInput = newLockFile.isUnlocked()) {
if (fetchSettings.warnDirty) if (fetchSettings.warnDirty)
warn("will not write lock file of flake '%s' because it has an unlocked input", topRef); warn("will not write lock file of flake '%s' because it has an unlocked input ('%s')", topRef, *unlockedInput);
} else { } else {
if (!lockFlags.updateLockFile) if (!lockFlags.updateLockFile)
throw Error("flake '%s' requires lock file changes but they're not allowed due to '--no-update-lock-file'", topRef); throw Error("flake '%s' requires lock file changes but they're not allowed due to '--no-update-lock-file'", topRef);

6
src/libexpr/flake/lockfile.cc
View file

@ -197,7 +197,7 @@ void LockFile::write(const Path & path) const
writeFile(path, fmt("%s\n", *this)); writeFile(path, fmt("%s\n", *this));
} }
bool LockFile::isLocked() const std::optional<FlakeRef> LockFile::isUnlocked() const
{ {
std::unordered_set<std::shared_ptr<const Node>> nodes; std::unordered_set<std::shared_ptr<const Node>> nodes;
@ -219,10 +219,10 @@ bool LockFile::isLocked() const
if (node if (node
&& !node->lockedRef.input.isLocked() && !node->lockedRef.input.isLocked()
&& !node->lockedRef.input.isRelative()) && !node->lockedRef.input.isRelative())
return false; return node->lockedRef;
} }
return true; return {};
} }
bool LockFile::operator ==(const LockFile & other) const bool LockFile::operator ==(const LockFile & other) const

4
src/libexpr/flake/lockfile.hh
View file

@ -60,7 +60,9 @@ struct LockFile
void write(const Path & path) const; void write(const Path & path) const;
bool isLocked() const; /* Check whether this lock file has any unlocked inputs. If so,
return one. */
std::optional<FlakeRef> isUnlocked() const;
bool operator ==(const LockFile & other) const; bool operator ==(const LockFile & other) const;