wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-30 07:33:16 +02:00
Code Activity

Formatting

Browse source
This commit is contained in:
Eelco Dolstra 2022-12-07 14:12:29 +01:00
parent 730f6bf616
commit 57397a37ae
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libcmd/common-eval-args.cc
View file

@ -92,10 +92,11 @@ MixEvalArgs::MixEvalArgs()
``` ```
nixpkgs=flake:github:NixOS/nixpkgs/nixos-22.05 nixpkgs=flake:github:NixOS/nixpkgs/nixos-22.05
```
makes `<nixpkgs>` refer to a particular branch of the makes `<nixpkgs>` refer to a particular branch of the
`NixOS/nixpkgs` repository on GitHub. `NixOS/nixpkgs` repository on GitHub.
```)", )",
.category = category, .category = category,
.labels = {"path"}, .labels = {"path"},
.handler = {[&](std::string s) { searchPath.push_back(s); }} .handler = {[&](std::string s) { searchPath.push_back(s); }}

2
src/nix/registry.cc
View file

@ -188,7 +188,7 @@ struct CmdRegistryPin : RegistryCommand, EvalCommand
auto ref = parseFlakeRef(url); auto ref = parseFlakeRef(url);
auto lockedRef = parseFlakeRef(locked); auto lockedRef = parseFlakeRef(locked);
registry->remove(ref.input); registry->remove(ref.input);
auto resolved = lockedRef.resolve(store).input.getAccessor(store).second; auto resolved = lockedRef.resolve(store).input.getAccessor(store).second;
if (!resolved.isLocked()) if (!resolved.isLocked())
warn("flake '%s' is not locked", resolved.to_string()); warn("flake '%s' is not locked", resolved.to_string());
fetchers::Attrs extraAttrs; fetchers::Attrs extraAttrs;