diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2022-08-04 13:23:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-04 13:23:45 +0200 |
| commit | bc5907ff9432269802c8638e7cd146672a129695 (patch) | |
| tree | e0a77fba532df3a8c6688dd958e18a6c7886c7bb | |
| parent | 075bf6e5565aff9fba0ea02f3333c82adf4dccee (diff) | |
| parent | 4c8441be0a59cead901acdfc3285d835c400c615 (diff) | |
Merge pull request #6862 from erikarvstedt/fix-flake-update-doc
docs/flake-update: fix example
| -rw-r--r-- | src/libexpr/flake/flake.cc | 1 | ||||
| -rw-r--r-- | src/libexpr/flake/flakeref.hh | 2 | ||||
| -rw-r--r-- | src/nix/flake-update.md | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/libexpr/flake/flake.cc b/src/libexpr/flake/flake.cc index cc9be1336..105e76bc6 100644 --- a/src/libexpr/flake/flake.cc +++ b/src/libexpr/flake/flake.cc @@ -341,7 +341,6 @@ LockedFlake lockFlake( debug("old lock file: %s", oldLockFile); - // FIXME: check whether all overrides are used. std::map<InputPath, FlakeInput> overrides; std::set<InputPath> overridesUsed, updatesUsed; diff --git a/src/libexpr/flake/flakeref.hh b/src/libexpr/flake/flakeref.hh index a9182f4bf..fe4f67193 100644 --- a/src/libexpr/flake/flakeref.hh +++ b/src/libexpr/flake/flakeref.hh @@ -28,7 +28,7 @@ typedef std::string FlakeId; * object that fetcher generates (usually via * FlakeRef::fromAttrs(attrs) or parseFlakeRef(url) calls). * - * The actual fetch not have been performed yet (i.e. a FlakeRef may + * The actual fetch may not have been performed yet (i.e. a FlakeRef may * be lazy), but the fetcher can be invoked at any time via the * FlakeRef to ensure the store is populated with this input. */ diff --git a/src/nix/flake-update.md b/src/nix/flake-update.md index 03b50e38e..2ee8a707d 100644 --- a/src/nix/flake-update.md +++ b/src/nix/flake-update.md @@ -6,7 +6,7 @@ R""( lock file: ```console - # nix flake update + # nix flake update --commit-lock-file * Updated 'nix': 'github:NixOS/nix/9fab14adbc3810d5cc1f88672fde1eee4358405c' -> 'github:NixOS/nix/8927cba62f5afb33b01016d5c4f7f8b7d0adde3c' * Updated 'nixpkgs': 'github:NixOS/nixpkgs/3d2d8f281a27d466fa54b469b5993f7dde198375' -> 'github:NixOS/nixpkgs/a3a3dda3bacf61e8a39258a0ed9c924eeca8e293' … |