1
0
Fork 0
mirror of https://github.com/NixOS/nix.dev.git synced 2024-10-18 14:32:43 -04:00
Commit graph

599 commits

Author SHA1 Message Date
Alexander Groleau 14b2fc7848
Merge pull request #756 from fricklerhandwerk/merge-shell-tutorials
merge the two shell.nix tutorials into one
2023-10-09 13:17:12 -05:00
fricklerhandwerk ea104900d0 merge the two shell.nix tutorials into one
rephrase slightly for brevity and clarity.

re-use the examples from the ad-hoc environment tutorial both for
simplicity as well as to give it some continuity.

Co-authored-by: Alexander Groleau <alex@proof.construction>
2023-10-09 20:13:19 +02:00
Alexander Groleau 325915aa41
Merge pull request #752 from fricklerhandwerk/merge-pinning-docs
add introduction to cross compilation tutorial
2023-10-09 08:50:09 -07:00
fricklerhandwerk 9961ac5d54 add introduction to cross compilation tutorial
remove references to "towards reproducibility" as that's not very
focused, and at that point readers will likely be familiar with the
concept such that they only need the reference, if anything
2023-10-09 17:46:24 +02:00
fricklerhandwerk 869d6bd0b4 move Nix language tutorial to top level
this fits the global outline we developed, and also makes the tutorial
more immediately visible - working with the Nix language is a core skill
we want to teach after all
2023-10-09 17:26:06 +02:00
Alexander Groleau 6cd0c3de72
Merge pull request #748 from fricklerhandwerk/add-links
clean up detailed explanation on building VMs
2023-10-09 08:08:14 -07:00
Alexander Groleau 84bbc7c230
Merge pull request #725 from olafklingt/server-client-test
simple server client test
2023-10-09 08:07:37 -07:00
asymmetric eaded9b070
Merge pull request #746 from fricklerhandwerk/move-warning
highlight password security warning in NixOS example
2023-10-09 11:27:57 +02:00
fricklerhandwerk 769cff9030 clarify detailed explanation 2023-10-07 04:21:19 +02:00
fricklerhandwerk a2a706f29d don't repeat the example contents in the instruction 2023-10-07 04:12:44 +02:00
fricklerhandwerk cd1abe532b use self-descriptive link text, imperative for instructions 2023-10-07 04:12:44 +02:00
fricklerhandwerk a1b582f33a modules are not a convention 2023-10-07 04:12:44 +02:00
fricklerhandwerk 82e7185436 remove superfluos capitalisation 2023-10-07 04:12:44 +02:00
fricklerhandwerk 4bcf52fe1b reword learning goal to use more keywords 2023-10-07 04:12:43 +02:00
fricklerhandwerk d59250908d remove compatibility blurb
readers don't even need to think about it, as it's encoded in the pinned
source. at best this would be a note to maintainers, but we should know
that as well.
2023-10-07 04:11:46 +02:00
fricklerhandwerk 776d19f8e8 dedent list 2023-10-07 04:11:44 +02:00
fricklerhandwerk d876a318bc more concise instructions 2023-10-07 00:37:42 +02:00
fricklerhandwerk 4b814d5d37 more precise heading 2023-10-07 00:37:27 +02:00
fricklerhandwerk e6ae1afaed highlight password security warning in NixOS example 2023-10-06 23:23:50 +02:00
Valentin Gagarin a279bfbd6a
avoid gerund 2023-10-06 23:21:20 +02:00
Valentin Gagarin 35ae4de7ca
more mundane grammar 2023-10-06 23:20:19 +02:00
fricklerhandwerk 07ea1eb6b2 rework the multi-machine example
- use the same Nixpkgs release to avoid massive downloads
- continue using `pkgs.nixosTest`; the new thing is completely undocumented
- use a shorthand module; `lib` is not used
- use an empty nginx config; commented-out code is confusing
- move explanation of the test script to the end; use imperative
- add instructions to run it
2023-10-06 22:51:08 +02:00
fricklerhandwerk e5f8ca0a9d reword introduction to multi-machine example 2023-10-06 22:51:07 +02:00
fricklerhandwerk 2a8bc7dd63 more concise heading 2023-10-06 22:50:46 +02:00
fricklerhandwerk 256bcd47ea remove superfluos empty line 2023-10-06 22:50:46 +02:00
fricklerhandwerk f15b5a4df3 build up example as numbered list
while section headings are good for linking, this is not very important
here. the heading distract from the sequential structure, which the list
exposes more clearly.
2023-10-06 22:50:46 +02:00
fricklerhandwerk 5fd6576a8d fix wording 2023-10-06 22:50:46 +02:00
fricklerhandwerk 0e63b762b9 clarify wording around module options 2023-10-06 22:50:46 +02:00
fricklerhandwerk 0067b57ebc remove superfluos indentation 2023-10-06 22:50:46 +02:00
fricklerhandwerk 14adbcfb87 use self-descriptive link text 2023-10-06 22:50:46 +02:00
fricklerhandwerk c7dfcb7968 link to main Nix installation instructions 2023-10-06 22:50:46 +02:00
fricklerhandwerk 1ad3a3e2f8 more specific title 2023-10-06 22:50:46 +02:00
olaf 13ca4846b2 fix wording 2023-10-06 22:50:46 +02:00
olaf 56426054ed unrelated fixes 2023-10-06 22:50:46 +02:00
olaf 4509761055 simple server client test 2023-10-06 22:50:45 +02:00
Valentin Gagarin 8ef096641d
Merge pull request #741 from fricklerhandwerk/move-installation
move installation instructions to top level
2023-10-06 13:36:34 +02:00
Valentin Gagarin a8723671ee
Merge pull request #745 from NixOS/editorconfig
Add EditorConfig file and fix errors
2023-10-06 12:09:23 +02:00
Valentin Gagarin d7556d18b1
Merge pull request #728 from g-re-g/patch-1
change "build task" to "derivation" in tutorial

"build task" invokes associations with pre-existing knowledge. As long as they are clearly explained, it is easier for beginners to pick up a new word than it is to add a new definition to an existing word that subtly differs from the other definitions it has. To that extent, "derivation" is probably a great word for Nix as, at least in this domain, it is very Nix specific and so, with clear definition, it should be easy to convey the idea to other folks that we are talking about something Nix specific.
2023-10-06 12:02:22 +02:00
Lorenzo Manacorda 1dcc111a4d *: fix editorconfig errors 2023-10-06 10:59:27 +02:00
fricklerhandwerk c0ef0b5988 move installation instructions to top level
it's not a tutorial and should be immediately accessible
2023-10-06 09:46:54 +02:00
a c sreedhar reddy f2fe0aa56b
Remove write space in shebang line (#736) 2023-10-03 10:12:05 +02:00
Yann Hamdaoui 62db5ba51d
Remove superfluous variation of a snippet (#732)
The cross compilation documentation is showing, at some point, two
variations on how to get a cross-compiled package out of Nixpkgs. Those
two versions are strictly equivalent (the only difference is what part
of the full attribute set paths is put in the variable named `pkgs`) and
don't really improve understanding - arguably, rather hurts it.
2023-09-20 21:51:32 +02:00
g-re-g f381e24357
Better terminology for string interpolation of derivations
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-09-14 13:00:00 -04:00
g-re-g 11f943e3b3
Remove description of derivation using "build task"
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-09-14 12:59:25 -04:00
Valentin Gagarin 68839d3d60
Merge pull request #621 from CyberShadow/patch-1
tutorials/first-steps/nix-language: Fix the nixpkgs example
2023-09-14 15:24:30 +02:00
g-re-g f60d8a8671
change "build task" to "derivation" in tutorial 2023-09-13 14:15:26 -04:00
Valentin Gagarin 2bcb9da7c3
fix cross-link 2023-09-11 15:19:24 +02:00
Valentin Gagarin 668d318fe3
add technical detail
hopefully not too much
2023-09-11 15:17:16 +02:00
Valentin Gagarin 2955e01632
update note on macOS 2023-09-11 15:15:14 +02:00
Valentin Gagarin 2dfe03711d
add keyword 2023-09-11 15:14:15 +02:00