Commit graph

248 commits

Author SHA1 Message Date
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
f2f16ce522
Merge pull request #117 from tssm/fix-pill-7-inherit-url
Update manuals' links
2019-10-17 05:35:37 -07:00
Ryan Mulligan
6e67037cb8 Merge branch 'fix-pill-7-inherit-url' 2019-10-17 05:31:14 -07:00
Jörg Thalheim
afebea863d
Improve grammar/choice of word (#119)
Improve grammar/choice of word
2019-10-17 11:08:28 +01:00
Adam Sandberg Eriksson
7e35b3a96a
Improve grammar/choice of word 2019-10-17 11:05:33 +01:00
Robin Gloster
9f08bbf8a5
Merge pull request #118 from kennyballou/nix-pill-smfix
17: Use imperative voice
2019-10-15 10:45:48 +02: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
Andreas Rammhold
89342a2528
Merge pull request #116 from shepting/patch-1
Spelling fix for learned.
2019-09-11 12:53:17 +02:00
Steven Hepting
1d1b2548a0
Spelling fix for learned. 2019-09-10 16:46:19 -07:00
Danylo Hlynskyi
40a58512c4
Merge pull request #115 from ggreif/patch-1
Update 08-generic-builders.xml
2019-08-06 22:20:49 +03:00
Gabor Greif
6b8dc41e16
Update 08-generic-builders.xml 2019-08-06 20:05:57 +02:00
Wael Nasreddine
5e8e2fb3cd
Merge pull request #113 from cdyson37/patch-1
Point to Python 3 docs
2019-07-01 10:03:01 -07: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
Robin Gloster
cbe699dfe8
Merge pull request #112 from lheckemann/pill-8-formatting-fix
08: Fix display of darwin-specific code
2019-05-01 17:45:05 +00: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
Graham Christensen
b7d08d1aea
Merge pull request #111 from mtn/next-pill-link
Fix erroneous link in pill 2
2019-04-12 12:08:44 -04:00
Michael Noronha
2b75e181cd Fix erroneous link in pill 2 2019-04-12 11:02:32 -05:00
Pascal Wittmann
ac40e28461
Merge pull request #110 from NixOS/danbst-patch-1
update broken link
2019-03-29 09:09:16 +01:00
Danylo Hlynskyi
c7398d2f61
update broken link
Fixes https://github.com/NixOS/nix-pills/issues/109
2019-03-29 08:19:11 +02: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
Wael Nasreddine
ba16e06742
Merge pull request #100 from tenx-tech/pill-6-typo
Fix Typo
2018-12-24 10:46:49 -08:00
Florian Peter
4dd6d469dc
Fix Typo 2018-12-24 08:25:17 -10:00
Jörg Thalheim
9d1aa6a7ca
Merge pull request #97 from mhwombat/master
Added clarification for NixOS users
2018-12-23 22:59:16 +01:00
Amy de Buitléir
63d6614e5c Clarify steps for NixOS users 2018-12-23 21:44:05 +00:00
Jörg Thalheim
a1b7e26a32
Merge branch 'master' into master 2018-12-12 10:49:40 +00:00
Amy de Buitléir
0bfa4ee1f8 Added clarification for NixOS users 2018-12-11 20:02:41 +00:00
Graham Christensen
d2038b5dbe
Merge pull request #96 from mhwombat/master
reworded to avoid two consecutive semi-colons
2018-12-11 14:12:15 -05:00
Amy de Buitléir
32a6f24667 reworded to avoid two consecutive semi-colons 2018-12-11 19:09:43 +00:00
Graham Christensen
edf2059dd1
Merge pull request #92 from liff/04-remove-obsolete-note
Update Attribute sets example and remove obsolete note
2018-12-11 10:00:49 -05: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
Wael Nasreddine
500b723563
Merge pull request #91 from mhwombat/master
Miscellaneous minor clarifications
2018-12-10 08:40:21 -08: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
c5c14aaa32
Merge pull request #90 from Ma27/update-docs-for-nix-2.0
Update documentation after Nix 2.0 switch
2018-12-08 16:37:36 +01: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
Graham Christensen
353336cc5a
Merge pull request #85 from exyi/master
Fixed typos in 6th and 15th pill
2018-10-20 16:29:09 -04:00
exyi
244a654359
Fixed typo 2018-10-20 18:54:12 +00:00
Graham Christensen
10b509ab15
Merge pull request #84 from exyi/patch-1
Fixed typo in 03-enter-environment.xml
2018-10-10 10:31:54 -04:00
Stanislav Lukeš
d10af5b212
Fixed typo in 03-enter-environment.xml 2018-10-10 14:29:34 +00:00
Graham Christensen
78c4e2f753
Merge pull request #83 from baracoder/patch-1
pill 18.1: Fix filename typo
2018-10-01 10:53:52 -04: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