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

Merge pull request #10785 from mjoerg/fix-typos

Browse source 
fix typos
This commit is contained in:
John Ericson 2024-05-27 10:24:53 -04:00 committed by GitHub
commit 263905da4b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/manual/src/language/operators.md
View file

@ -141,7 +141,7 @@ The result is a string.
Update [attribute set] *attrset1* with names and values from *attrset2*. Update [attribute set] *attrset1* with names and values from *attrset2*.
The returned attribute set will have of all the attributes in *attrset1* and *attrset2*. The returned attribute set will have all of the attributes in *attrset1* and *attrset2*.
If an attribute name is present in both, the attribute value from the latter is taken. If an attribute name is present in both, the attribute value from the latter is taken.
[Update]: #update [Update]: #update

4
src/nix/flake-metadata.md
View file

@ -2,10 +2,10 @@ R""(
# Examples # Examples
* Show what `nixpkgs` resolves to: * Show what `dwarffs` resolves to:
```console ```console
# nix flake metadata nixpkgs # nix flake metadata dwarffs
Resolved URL: github:edolstra/dwarffs Resolved URL: github:edolstra/dwarffs
Locked URL: github:edolstra/dwarffs/f691e2c991e75edb22836f1dbe632c40324215c5 Locked URL: github:edolstra/dwarffs/f691e2c991e75edb22836f1dbe632c40324215c5
Description: A filesystem that fetches DWARF debug info from the Internet on demand Description: A filesystem that fetches DWARF debug info from the Internet on demand

2
src/nix/hash.cc
View file

@ -181,7 +181,7 @@ struct CmdToBase : Command
void run() override void run() override
{ {
warn("The old format conversion sub commands of `nix hash` where deprecated in favor of `nix hash convert`."); warn("The old format conversion sub commands of `nix hash` were deprecated in favor of `nix hash convert`.");
for (auto s : args) for (auto s : args)
logger->cout(Hash::parseAny(s, hashAlgo).to_string(hashFormat, hashFormat == HashFormat::SRI)); logger->cout(Hash::parseAny(s, hashAlgo).to_string(hashFormat, hashFormat == HashFormat::SRI));
} }