nrabulinski/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #6862 from erikarvstedt/fix-flake-update-doc

Browse source 
docs/flake-update: fix example
This commit is contained in:
Eelco Dolstra 2022-08-04 13:23:45 +02:00 committed by GitHub
parent 075bf6e556 4c8441be0a
commit bc5907ff94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -341,7 +341,6 @@ LockedFlake lockFlake(
debug("old lock file: %s", oldLockFile); debug("old lock file: %s", oldLockFile);
// FIXME: check whether all overrides are used.
std::map<InputPath, FlakeInput> overrides; std::map<InputPath, FlakeInput> overrides;
std::set<InputPath> overridesUsed, updatesUsed; std::set<InputPath> overridesUsed, updatesUsed;

2
src/libexpr/flake/flakeref.hh
View file

@ -28,7 +28,7 @@ typedef std::string FlakeId;
* object that fetcher generates (usually via * object that fetcher generates (usually via
* FlakeRef::fromAttrs(attrs) or parseFlakeRef(url) calls). * 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 * be lazy), but the fetcher can be invoked at any time via the
* FlakeRef to ensure the store is populated with this input. * FlakeRef to ensure the store is populated with this input.
*/ */

2
src/nix/flake-update.md
View file

@ -6,7 +6,7 @@ R""(
lock file: lock file:
```console ```console
# nix flake update # nix flake update --commit-lock-file
* Updated 'nix': 'github:NixOS/nix/9fab14adbc3810d5cc1f88672fde1eee4358405c' -> 'github:NixOS/nix/8927cba62f5afb33b01016d5c4f7f8b7d0adde3c' * Updated 'nix': 'github:NixOS/nix/9fab14adbc3810d5cc1f88672fde1eee4358405c' -> 'github:NixOS/nix/8927cba62f5afb33b01016d5c4f7f8b7d0adde3c'
* Updated 'nixpkgs': 'github:NixOS/nixpkgs/3d2d8f281a27d466fa54b469b5993f7dde198375' -> 'github:NixOS/nixpkgs/a3a3dda3bacf61e8a39258a0ed9c924eeca8e293' * Updated 'nixpkgs': 'github:NixOS/nixpkgs/3d2d8f281a27d466fa54b469b5993f7dde198375' -> 'github:NixOS/nixpkgs/a3a3dda3bacf61e8a39258a0ed9c924eeca8e293'
… …