aboutsummaryrefslogtreecommitdiff
path: root/src/nix/flake.cc
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2020-01-29 21:01:34 +0100
committerEelco Dolstra <edolstra@gmail.com>2020-01-29 21:04:28 +0100
commit26f895a26d37ec6049628fa835e20dfae5eb94dd (patch)
tree346863a05459c74bafcea95e0446c45c17bf581b /src/nix/flake.cc
parentf68bed7f67d9acc13ebe38e6f5aa8a641f6e557d (diff)
Clean up the lock file handling flags
Added a flag --no-update-lock-file to barf if the lock file needs any changes. This is useful for CI systems if you're building a checkout. Fixes #2947. Renamed --no-save-lock-file to --no-write-lock-file. It is now a fatal error if the lock file needs changes but --no-write-lock-file is not given.
Diffstat (limited to 'src/nix/flake.cc')
-rw-r--r--src/nix/flake.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix/flake.cc b/src/nix/flake.cc
index 2852a627d..49c0d30f0 100644
--- a/src/nix/flake.cc
+++ b/src/nix/flake.cc
@@ -38,12 +38,12 @@ public:
Flake getFlake()
{
auto evalState = getEvalState();
- return flake::getFlake(*evalState, getFlakeRef(), useRegistries);
+ return flake::getFlake(*evalState, getFlakeRef(), lockFlags.useRegistries);
}
LockedFlake lockFlake()
{
- return flake::lockFlake(*getEvalState(), getFlakeRef(), getLockFileMode(), lockFlags);
+ return flake::lockFlake(*getEvalState(), getFlakeRef(), lockFlags);
}
};