Commit graph

248 commits

Author SHA1 Message Date
Ulya Trofimovich
abb593509e Make command output coherent with its text description.
Command 'nix-store -q --referrers `which hello`' should list two
environments as described in the text: "Two environments were listed..."
Add a second environment and a manifest to the command output (hashes
were taken from the command output when trying to replay pill 3 steps on
a local system).
2021-10-20 15:56:25 +01:00
Michele Guerini Rocco
f1acd7ed9f
Merge pull request #170 from gameboo/master
missing word in 09
2021-02-21 13:55:42 +01:00
gameboo
cd4a5bbd1f Fixed typo in 09 2021-02-21 02:18:16 +00:00
lewo
c4ba2bf21b
Merge pull request #168 from Zebreus/master
Fixed minor typos in 04
2021-01-23 16:41:18 +01:00
Zebreus
389c8e117b Fixed typo in 04 2021-01-23 15:52:31 +01:00
Zebreus
6daf30c240 Fixed typo in 04 2021-01-23 15:52:21 +01:00
Michele Guerini Rocco
095d4767b6
Merge pull request #167 from ulysses4ever/patch-1
06: typo
2021-01-04 07:36:50 +01:00
Artem Pelenitsyn
bfcefa2a3b
06: typo 2021-01-03 22:24:09 -05:00
Michele Guerini Rocco
1d0b345924
Merge pull request #164 from bobrik/ivan/nix-repl-typo
Typo fix: nix-repl -> nix repl
2020-12-11 21:33:32 +01:00
Ivan Babrou
a080fa1e33 Typo fix: nix-repl -> nix repl 2020-12-11 09:56:49 -08:00
Michele Guerini Rocco
d9da7b5869
Merge pull request #165 from bobrik/ivan/xlib-to-xorg
Update pill 17 with xlib -> xorg
2020-12-11 09:11:14 +01:00
Ivan Babrou
0c16c18599 Update pill 17 with xlib -> xorg 2020-12-10 20:46:51 -08:00
Sylvain Bellemare
6aeb856c56 Re-word "modified setup.sh" in pill 10
Since `setup.sh` is a new addition, it makes more sense to not use the
word "modified", as it did not exist before :).
2020-12-08 11:44:35 -08:00
Jelle Besseling
694f178852 Reorder words so sentence makes more sense 2020-12-08 10:08:44 -08:00
Nikita Eshkeev
bf8fea53f3 Update 11-garbage-collector.xml
Fix a typo
2020-12-05 16:44:04 -08:00
Sylvain Bellemare
9f477d2d1e Add missing beginning of sentence
See
https://lethalman.blogspot.com/2014/08/nix-pill-12-inputs-design-pattern.html
for original post on which the correction is based.
2020-10-08 18:34:26 -07:00
Michele Guerini Rocco
50f4f42807
Merge pull request #158 from sbellem/link-to-operators
Update link for the `//` operator
2020-10-08 02:43:25 +02:00
Sylvain Bellemare
af2be25454
Update link for the // operator
The previous link leads to the top of the guide whereas the updated link
leads to Section *15.3 Operators* where one can quickly find the row in
the table that presents the `//` operator.
2020-10-07 23:33:59 +01:00
Sylvain Bellemare
5d1e0e1af4 Change install arg from man to man-db
The install command `nix-env -i man` does not work as `man` is the
*attribute name* meanwhile the command expects the derivation name which
is `man-db`. If using the attribute name then the command should use the
`{--attr | -A}` option and pass the attribute path, e.g.:
`nix-env -iA nixpkgs.man`.
2020-10-07 13:57:20 -07:00
Doron Behar
aa975b1bbc
Merge pull request #156 from sbellem/fix-typo
Add missing "about" word
2020-10-07 17:34:55 +03:00
Sylvain Bellemare
fe5dfacb7a
Add missing "about" word 2020-10-07 15:21:41 +01:00
Michele Guerini Rocco
769daa2322
Merge pull request #154 from agam/master
Follow redirects when installing via `curl`
2020-09-10 10:33:32 +02:00
Agam Brahma
f7032c2d41
Follow redirects when installing via curl 2020-09-10 01:14:18 -07:00
John Ericson
6c14a175d2
Merge pull request #151 from goertzenator/patch-1
remove stdenv references
2020-08-20 20:03:40 -04:00
John Ericson
16ac846685
Make clear what is conventional vs mandatory for Darwin
We indeed don't want to use jargon like "stdenv" too soon, but we also don't want to imply Nix is less flexible than it is.
2020-08-20 19:58:44 -04:00
Daniel Goertzen
924f05fa2e
remove stdenv references
`stdenv` has not yet been mentioned in this tutorial and the target audience (people new to nix) will not know what it is.  It shouldn't be mentioned until it is properly described (as it is in pill 19).
2020-08-20 16:22:29 -05:00
Benjamin Hipple
a26be5a2b9
Merge pull request #150 from gameboo/minor-rephrase
Minor rephrase in 12.4
2020-07-25 13:53:19 -04:00
gameboo
d746e6e318 Rephrase adding to buildInputs explanation in 12.4 2020-07-25 17:10:47 +01:00
Michele Guerini Rocco
f280712c42
Merge pull request #147 from NixOS/improve-strip
Paraphrase utility of strip
2020-06-05 09:57:33 +02:00
Dani
f6883c972a Paraphrase utility of strip 2020-06-05 09:16:25 +02:00
Michele Guerini Rocco
2160c8645d
Merge pull request #144 from dmedinag/patch-3
Minor typo fix
2020-06-01 08:21:13 +02:00
Dani
7e24bff416
Minor typo fix 2020-05-16 23:21:43 +02:00
Dani
b31f930e5f Add missing word 2020-05-11 16:20:05 -07:00
lewo
f71ff74018
Merge pull request #141 from dmedinag/patch-2
Correct punctuation error
2020-05-09 12:11:12 +02:00
Dani
445fce5199
Correct punctuation error 2020-05-09 12:01:44 +02:00
Michele Guerini Rocco
fb79a8c230
Merge pull request #140 from dmedinag/patch-1
Fix grammar mistake
2020-05-09 10:12:22 +02:00
Dani
b69de7e8bd
Fix grammar mistake 2020-05-09 10:05:23 +02:00
Markus Wamser
b3454597da change ensureDir to mkdir -p in example
ensureDir was dropped with the merge of https://github.com/NixOS/nixpkgs/pull/33637
2020-05-01 18:03:35 -07:00
Michele Guerini Rocco
ab70c4d058
Merge pull request #132 from yimmt/patch-1
Change sentence wording in 04-basics-of-language
2020-03-22 10:19:58 +01:00
yimmt
ca18316768
Change sentence wording in 04-basics-of-language
I think the for is unnecessary and can be confusing (at least for me).
2020-03-21 22:01:48 -04:00
Wael Nasreddine
c3a2df2160
Merge pull request #129 from sarcasticadmin/sa/reading-corrections-1
Grammar suggestions for pills 6-12
2020-03-09 22:51:18 -07:00
Wael Nasreddine
cb4781d9f4
Merge branch 'master' into sa/reading-corrections-1 2020-03-09 22:49:55 -07:00
Robert James Hernandez
1b8b37db05 Grammatical changes for pill 12 2020-03-09 20:56:12 -07:00
Robert James Hernandez
3ba87bf5f8 Grammatical changes for pill 11 2020-03-09 20:56:12 -07:00
Robert James Hernandez
27ee505edb Grammatical changes for pill 10 2020-03-09 20:56:12 -07:00
Robert James Hernandez
d4d4a9106c Grammatical changes for pill 09 2020-03-09 20:43:49 -07:00
Robert James Hernandez
f49d9f4848 Grammatical changes for pill 08 2020-03-09 20:43:42 -07:00
Robert James Hernandez
0991afab7d Grammatical changes for pill 06 2020-03-09 20:42:52 -07:00
lewo
b1c0f7c896
Merge pull request #127 from 112358a/fix-pill6-typo
Fix typo in pill 6
2020-03-01 17:09:18 +01:00
user
38cee2cfcd Fix typo in pill 6 2020-03-01 17:35:17 +02:00