lix-project/lix-website
3
1
Fork 14
Code Issues 3 Pull requests 5 Packages Projects Releases Wiki Activity

add-to-config, about: fix typos #10

Merged
raito merged 2 commits from danderson/lix-website:dave/typos into main 2024-06-09 13:08:46 +00:00
Conversation 0 Commits 2 Files changed 2 +3 -3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
content/about.md
View file

@ -58,7 +58,7 @@ provide a collection of necessary improvements over CppNix:
- **A language with room to grow.** - **A language with room to grow.**
Unlike upstream Nix, Lix intends to be an evolving language -- a robust language versioning Unlike upstream Nix, Lix intends to be an evolving language -- a robust language versioning
system will allow the language to grow and evolve without sacrificing backwards-compatibility or correctness. system will allow the language to grow and evolve without sacrificing backwards-compatibility or correctness.
And room to grow means room for **usability and ergonomics improvements** -- both in the langauge and in And room to grow means room for **usability and ergonomics improvements** -- both in the language and in
tooling. tooling.

4
content/add-to-config.md
View file

@ -83,7 +83,7 @@ Add the following to any NixOS module in your configuration (e.g. `configuration
```nix ```nix
{ {
nix.settings.extra-substituters = [ nix.settings.substituters = [
raito marked this conversation as resolved Outdated
danderson commented 2024-05-06 07:12:17 +00:00
Outdated
Review
Copy link

I was confused: https://nixos.org/manual/nix/stable/command-ref/conf-file#file-format shows that both extra-substituters and substituters work, extra-... means "append to list instead of replacing"

The NixOS module for Nix configuration only defines the non-extra variant, and the normal list merge semantics end up behaving like extra-substituters (with the addition that the nixos module automatically adds cache.nixos.org to the list as well).

So, I think my change does the right thing in the context of the nixos module, by using nixlang's list combination logic rather than deferring to nix.conf load time... But I'm also happy to drop this commit out of the PR if you prefer.

I was confused: https://nixos.org/manual/nix/stable/command-ref/conf-file#file-format shows that both `extra-substituters` and `substituters` work, `extra-...` means "append to list instead of replacing" The NixOS module for Nix configuration only defines the non-extra variant, and the normal list merge semantics end up behaving like extra-substituters (with the addition that the nixos module automatically adds cache.nixos.org to the list as well). So, I _think_ my change does the right thing in the context of the nixos module, by using nixlang's list combination logic rather than deferring to nix.conf load time... But I'm also happy to drop this commit out of the PR if you prefer.
raito commented 2024-06-09 13:07:56 +00:00
Outdated
Review
Copy link

Seems good to me.

Seems good to me.
"https://cache.lix.systems" "https://cache.lix.systems"
]; ];
@ -152,7 +152,7 @@ Add the following to any NixOS module in your configuration (e.g. `configuration
```nix ```nix
{ {
nix.settings.extra-substituters = [ nix.settings.substituters = [
"https://cache.lix.systems" "https://cache.lix.systems"
]; ];