1
0
Fork 0
mirror of https://github.com/NixOS/nix-pills synced 2024-09-19 04:00:13 -04:00
Commit graph

209 commits

Author SHA1 Message Date
Sylvain Bellemare fe5dfacb7a
Add missing "about" word 2020-10-07 15:21:41 +01:00
Agam Brahma f7032c2d41
Follow redirects when installing via curl 2020-09-10 01:14:18 -07: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
gameboo d746e6e318 Rephrase adding to buildInputs explanation in 12.4 2020-07-25 17:10:47 +01:00
Dani f6883c972a Paraphrase utility of strip 2020-06-05 09:16:25 +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
Dani 445fce5199
Correct punctuation error 2020-05-09 12:01:44 +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
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 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
user 38cee2cfcd Fix typo in pill 6 2020-03-01 17:35:17 +02:00
DavHau c88790f5c3 fix typo in pill 12 2019-11-10 01:22:11 -05:00
DavHau 91e4931536 fix typo 2019-11-10 01:22:11 -05:00
Ryan Mulligan 6e67037cb8 Merge branch 'fix-pill-7-inherit-url' 2019-10-17 05:31:14 -07:00
Adam Sandberg Eriksson 7e35b3a96a
Improve grammar/choice of word 2019-10-17 11:05:33 +01:00
Kenny Ballou f546d7e865
17: Use imperative voice
Tell the reader to recall, not that the author recalls...

Signed-off-by: Kenny Ballou <kballou@devnulllabs.io>
2019-10-10 15:44:10 -06:00
Tae Sandoval 0fd8c234bd Update manuals' links 2019-10-08 22:20:12 +02:00
Steven Hepting 1d1b2548a0
Spelling fix for learned. 2019-09-10 16:46:19 -07:00
Gabor Greif 6b8dc41e16
Update 08-generic-builders.xml 2019-08-06 20:05:57 +02:00
cdyson37 aaacc6a8a7
Point to Python 3 docs
It's the modern thing, and the docs look nicer too.
2019-07-01 15:49:08 +01:00
Linus Heckemann 23fd7800dd 08: Fix display of darwin-specific code
Previously, the screen being outside the para would prevent it from
being displayed.
2019-05-01 10:32:51 +02:00
Michael Noronha 2b75e181cd Fix erroneous link in pill 2 2019-04-12 11:02:32 -05:00
Danylo Hlynskyi c7398d2f61
update broken link
Fixes https://github.com/NixOS/nix-pills/issues/109
2019-03-29 08:19:11 +02:00
Dan Burton ce931b9697
Fix some code samples referring to binutils 2019-02-23 17:17:43 -05:00
Florian Peter e01d2127c2 Fix reference to outdated coreutils version (#99) 2018-12-30 13:33:04 -08:00
Florian Peter 6ca3ca16d5 Fix typo in Pill 13 (#102) 2018-12-30 13:29:18 -08:00
Elben Shira 76b04230b3 Fix darwin hello.nix. (#103)
Specify binutils key, not binutils_unwrapped.
2018-12-30 13:26:37 -08:00
Florian Peter 97c66d99e1 Fix typo in Pill 12 #12 2018-12-28 14:26:35 -08:00
Amy de Buitléir eff2de0555 Can now divide using /<space> (#98)
closes #63 and #87
2018-12-24 16:39:42 -08:00
Florian Peter 4dd6d469dc
Fix Typo 2018-12-24 08:25:17 -10:00
Amy de Buitléir 63d6614e5c Clarify steps for NixOS users 2018-12-23 21:44:05 +00:00
Amy de Buitléir 0bfa4ee1f8 Added clarification for NixOS users 2018-12-11 20:02:41 +00:00
Amy de Buitléir 32a6f24667 reworded to avoid two consecutive semi-colons 2018-12-11 19:09:43 +00:00
Olli Helenius 0da536fa39 Update Attribute sets example and remove obsolete note
The attribute name is quoted correctly by the REPL
in nix 2.1.3.
2018-12-10 20:51:14 +02:00
Amy de Buitléir c3ef7065b9 Explained the declare command, as it may be unfamiliar. 2018-12-10 01:03:20 +00:00
Amy de Buitléir f0cf557c58 Explain how to exit the Nix repl 2018-12-10 00:47:42 +00:00
Amy de Buitléir dac4f17468 Indicate that there is additional output not shown 2018-12-10 00:46:39 +00:00
Amy de Buitléir 3401e116b2 Added link to cheatsheet 2018-12-10 00:45:28 +00:00
Amy de Buitléir 81f2324f49
Update 03-enter-environment.xml
Added reference to cheatsheet.
2018-12-10 00:24:00 +00:00
Maximilian Bosch bcea6b35ed
Update documentation after Nix 2.0 switch
In #89 it has been reported that the third step can't be done as
`nix-repl` doesn't evaluate anymore on 18.09 and unstable as in both
cases an evaluation error will be thrown.

First of all this may confuse new users who want to learn Nix, but don't
know the ecosystem sufficiently to understand why the install failed.

As recent NixOS versions (unstable and 18.09) use Nix 2.0 by default and
unstable doesn't evaluate with Nix 1.x anymore it should be a safe thing
to do now.

This patch covers two aspects:

* Using Nix 2.0: I replayed the installation steps with `nix-env` to
  ensure that the steps and explanations provided in the first three
  chapters are still valid.

* Replacing `nix-repl` references: most of the cases it was sufficient
  to replace `nix-repl` with the newly introduced command `nix repl`.
  In chapter three `nix-repl` was used to demonstrate the installation
  of a package with `nix-env`. I decided to use `nix-index` as demo
  package as I figured this tool to be extremely helpful to locate
  packages by output files.

  The explanation that Nix is not only a tool for package/derivation
  management, but a functional language as well was moved to chapter
  four where the basics of the language were actually covered.

This change is just a first step towards an updated series, in the
future we may want to use even more Nix 2.0 features (such as
`nix-build` vs. `nix build` with `nix log`).

Fixes #89
Possibly supersedes #71
2018-12-08 00:10:40 +01:00
exyi 244a654359
Fixed typo 2018-10-20 18:54:12 +00:00
Stanislav Lukeš d10af5b212
Fixed typo in 03-enter-environment.xml 2018-10-10 14:29:34 +00:00
baracoder 227f46a636
pill 18.1: Fix filename typo
There seams to be a typo in the path of the included file: https://nixos.org/nixos/nix-pills/nix-store-paths.html#idm140737315515840

`derivation-simple-contents.xml -> derivation-simple-content.xml`
2018-10-01 16:51:12 +02:00
Alex Leferry 2 d3f6c61e1e
Fix typo 2018-09-19 21:37:25 +02:00
Andreas Rammhold 44ce4cb6d3
Merge branch 'master' into binutils 2018-08-23 00:28:37 +02:00
Anthony Cowley 4f372ebaf3 Nix on darwin note: use a <note> element
This takes advantage of existing styling support.
2018-08-20 21:46:52 -04:00
Anthony Cowley 5626a121ec Add a note on adapting content for darwin 2018-08-20 20:56:01 -04:00
Jörg Thalheim 33d151066f fix binutils input in hello-builder
fixes #76
2018-08-20 10:20:47 +01:00
Rolf Schröder 3fecf6007e Pill 07: Make the input file name explicit. 2018-06-18 09:10:31 +02:00
Jason Samsa 64653e731d
may -> must as attribute is required to avoid ambiguity 2018-04-27 11:28:57 -05:00
Nicolas Dudebout b706fc958b pill 20: make it buildable
+ refer to the old nixpkgs commit in a note but use the current nixpkgs for the
  actual examples
+ add which to the PATH
+ add `unpackPhase = "true";` to satisfy stdenv requirements
+ explain how _PATH and PATH are related
2018-04-12 07:38:14 -04:00
Nicolas Dudebout 5a07abc2b9 pill 20: fix a few typos
+ add a few missing words
+ pick the lowercase spelling for `stdenv` and use it consistenly
+ reword a sentence that I had a hard time understanding
+ fix the path of the second nix expression to be included
2018-04-12 07:02:11 -04:00
John Ericson e5534d4641 Redefine mul to disambiguate
It's not immediately obvious which previous `mul` definition applies,
and is a copy-paste hazard. Staring the block with a `mul = ...` is also
consistent with the other code blocks.

Fixes #46
2018-04-11 18:18:31 -04:00
Jakob Brünker 959526f5f8 change pill 04 to reflect that floating point number now exist 2018-04-11 17:54:54 -04:00
Nicolas Dudebout 4bdce7aa10 fix import issues in pill 20 2018-04-08 23:02:55 -04:00
Nicolas Dudebout a3c3d6d889 fix rename mistake in 02de506 2018-04-08 22:56:34 -04:00
Nicolas Dudebout 3bfd7caf67 fix last pp-aterm instance
The "pp-aterm" was missed while porting this pill from blogpost.com.
2018-04-08 20:48:44 -04:00
Nicolas Dudebout 4360bbcf3a fix mispelling of graphviz 2018-04-07 21:18:30 -04:00
Nicolas Dudebout 02de50625b replace indent with nix show-derivation 2018-04-06 23:30:28 -04:00
Jörg Thalheim 8a968c8590 replace non-longer present pp-aterm with indent
fixes #53
2018-03-31 17:00:18 +01:00
Jörg Thalheim 482a10b215
Merge branch 'master' into master 2018-03-09 17:06:37 +00:00
John Ericson 4c513daccd Pill 20: Init according 19's teaser 2018-02-23 19:04:13 -05:00
John Ericson aca2170ce0 Pill 19: Clean up working a 2018-02-23 19:04:13 -05:00
Myron Wu 75e7611b16 Minor typos 2018-02-18 14:55:33 -08:00
Graham Christensen 2730aa3909
Merge pull request #44 from jackjennings/patch-1
Add missing space in recursive attributes example
2018-01-28 08:05:52 -05:00
Jack Jennings eca0972884
Fix typo in "Basics of Language" chapter 2018-01-27 22:18:38 -08:00
Jack Jennings 85087680f6
Add missing space in recursive attributes example 2018-01-27 22:11:28 -08:00
Graham Christensen 436ce8445d
Merge branch 'master' into imp/pills-2 2017-12-30 18:35:03 -05:00
Graham Christensen 680975e605
Merge branch 'master' into fix-pill-8-gnu-hello-missing-ar 2017-12-29 06:52:50 -05:00
Graham Christensen bf274e79d6
Merge pull request #39 from willprice/master
Pill 12: Add missing graphviz sources link
2017-12-29 06:51:48 -05:00
Graham Christensen f8ac73bc3b
Merge pull request #38 from balajirrao/patch-1
Update 02-install-on-your-running.xml
2017-12-29 06:49:58 -05:00
Will Price ac90b5cce8
Fix missing ar in build environment 2017-12-28 14:24:41 +00:00
Will Price 167c68ebd2
Add missing graphviz sources link 2017-12-28 10:48:01 +00:00
Balaji Rao 8a6a5367c2
Update 02-install-on-your-running.xml
add missing quote
2017-12-21 05:40:54 +01:00
Zander Bolgar 28a3c1d93a Update GNU Hello version to 2.10 in rest of pills 2017-12-19 04:47:21 -05:00
Zander Bolgar 116ea8fae5 Update GNU Hello version to 2.10 2017-12-19 04:26:58 -05:00
Kirill Zaborsky 8aa0f1de3c
Missed space 2017-11-25 22:13:56 +03:00
Michael Peyton Jones b4016e85b0 Pills 2-4: edit for style and clarity 2017-11-18 16:22:14 +00:00
Michael Peyton Jones 4d0c1d27a5 Nix pill 1: address feedback 2017-11-18 13:42:15 +00:00
Graham Christensen 81bd79d369
1.2: Remove the papers link for now, closes #19 2017-11-15 22:07:16 -05:00
Graham Christensen 215ed09bae
9.3: Fix the strip link, closes #28 2017-11-15 22:06:02 -05:00
Graham Christensen 61771a75a8
Add a note about reopening terminals after installation 2017-11-15 22:00:58 -05:00
Graham Christensen d5ce3573f0
pill 2.3: Instruct to install sqlite before inspecting the nix DB, closes #20 2017-11-15 21:58:36 -05:00
Graham Christensen 7473fc087c
Clarify #3.3, closes #22 2017-11-15 21:54:06 -05:00
Graham Christensen c338957a7c
pill #6: replace pp-aterm with indentt... poorly 2017-11-15 21:51:22 -05:00
Graham Christensen ed03f74ebc
Merge pull request #25 from michaelpj/pill-1-style
Pill 1: edit for style and clarity
2017-11-15 21:28:41 -05:00
gfixler ac79e6dc06 Move script name up and out of actual script 2017-11-10 15:32:57 -08:00
gfixler a1e51b45e7 Close unclosed braces in pill 7 2017-11-10 02:22:24 -08:00
Michael Peyton Jones 2f47fcd413 Pill 1: edit for style and clarity 2017-11-07 21:25:51 +00:00
Graham Christensen 951a302595
Merge pull request #18 from frontsideair/pill5-test-2
Split test.nix contents from repl screen output
2017-11-04 02:29:42 -04:00
Graham Christensen 10454d2b17
Merge pull request #17 from frontsideair/patch-2
Fix typo
2017-11-04 02:28:31 -04:00