From 5d32dfaf94d2e2afd9dc2cd4551d36d1023af5ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amy=20de=20Buitl=C3=A9ir?=
Date: Fri, 16 Jun 2023 16:06:37 +0100
Subject: [PATCH] clarification
---
index.html | 6 +-
source/intro/main.adoc | 6 +-
wombats-book-of-nix.pdf | 632 +++++++++++++++++++++-------------------
3 files changed, 335 insertions(+), 309 deletions(-)
diff --git a/index.html b/index.html
index 494269e..b95ae02 100644
--- a/index.html
+++ b/index.html
@@ -213,7 +213,7 @@ and use flakes; and this seems to be the general consensus.
1.3. Prerequisites
To follow along with the examples in this book, you will need access to a computer
-or (virtual machine) with Nix installed and flakes enabled.
+or (virtual machine) with Nix (or NixOS) installed and
flakes enabled.
I recommend the installer from
@@ -225,8 +225,8 @@ automatically enables flakes.
nixos.org.
-
To enable flakes on an existing installation, see the instructions in
-the NixOS wiki.
+
To enable flakes on an existing Nix or NixOS installation,
+see the instructions in the NixOS wiki.
diff --git a/source/intro/main.adoc b/source/intro/main.adoc
index 43d3e9d..fd2d8d5 100644
--- a/source/intro/main.adoc
+++ b/source/intro/main.adoc
@@ -40,7 +40,7 @@ and use flakes; and this seems to be the general consensus.
== Prerequisites
To follow along with the examples in this book, you will need access to a computer
-or (virtual machine) with Nix installed and _flakes enabled_.
+or (virtual machine) with Nix (or NixOS) installed and _flakes enabled_.
I recommend the installer from
https://zero-to-nix.com/start/install[zero-to-nix.com]. This installer
@@ -49,8 +49,8 @@ automatically enables flakes.
More documentation (and another installer) available at
https://nixos.org/[nixos.org].
-To enable flakes on an existing installation, see the instructions in
-the https://nixos.wiki/wiki/Flakes[NixOS wiki].
+To _enable flakes on an existing Nix or NixOS installation_,
+see the instructions in the https://nixos.wiki/wiki/Flakes[NixOS wiki].
[IMPORTANT]
====
diff --git a/wombats-book-of-nix.pdf b/wombats-book-of-nix.pdf
index be27197..52a015d 100644
--- a/wombats-book-of-nix.pdf
+++ b/wombats-book-of-nix.pdf
@@ -1703,7 +1703,7 @@ endobj
>>
endobj
18 0 obj
-<< /Length 12034
+<< /Length 12308
>>
stream
q
@@ -2136,7 +2136,7 @@ ET
BT
48.24 225.806 Td
/F1.0 10.5 Tf
-<6d616368696e65292077697468204e697820696e7374616c6c656420616e6420> Tj
+<6d616368696e65292077697468204e697820286f72204e69784f532920696e7374616c6c656420616e6420> Tj
ET
0.0 0.0 0.0 SCN
@@ -2145,7 +2145,7 @@ ET
0.2 0.2 0.2 SCN
BT
-211.1475 225.806 Td
+265.779 225.806 Td
/F3.0 10.5 Tf
[<666c616b> 20.01953 <657320656e61626c6564>] TJ
ET
@@ -2156,7 +2156,7 @@ ET
0.2 0.2 0.2 SCN
BT
-280.15329 225.806 Td
+334.78479 225.806 Td
/F1.0 10.5 Tf
<2e> Tj
ET
@@ -2235,7 +2235,29 @@ ET
BT
48.24 142.466 Td
/F1.0 10.5 Tf
-[<54> 29.78516 <6f20656e61626c6520666c616b> 20.01953 <6573206f6e20616e206578697374696e6720696e7374616c6c6174696f6e2c207365652074686520696e737472756374696f6e7320696e2074686520>] TJ
+[<54> 29.78516 <6f20>] TJ
+ET
+
+0.0 0.0 0.0 SCN
+0.0 0.0 0.0 scn
+0.2 0.2 0.2 scn
+0.2 0.2 0.2 SCN
+
+BT
+63.13126 142.466 Td
+/F3.0 10.5 Tf
+[<656e61626c6520666c616b> 20.01953 <6573206f6e20616e206578697374696e67204e6978206f72204e69784f5320696e7374616c6c6174696f6e>] TJ
+ET
+
+0.0 0.0 0.0 SCN
+0.0 0.0 0.0 scn
+0.2 0.2 0.2 scn
+0.2 0.2 0.2 SCN
+
+BT
+322.31305 142.466 Td
+/F1.0 10.5 Tf
+<2c207365652074686520696e737472756374696f6e7320696e2074686520> Tj
ET
0.0 0.0 0.0 SCN
@@ -2244,7 +2266,7 @@ ET
0.25882 0.5451 0.79216 SCN
BT
-398.02855 142.466 Td
+459.22255 142.466 Td
/F1.0 10.5 Tf
<4e69784f532077696b69> Tj
ET
@@ -2255,7 +2277,7 @@ ET
0.2 0.2 0.2 SCN
BT
-453.54205 142.466 Td
+514.73605 142.466 Td
/F1.0 10.5 Tf
<2e> Tj
ET
@@ -2462,7 +2484,7 @@ endobj
endobj
23 0 obj
<< /Type /Font
-/BaseFont /85879f+NotoSerif-Italic
+/BaseFont /51b496+NotoSerif-Italic
/Subtype /TrueType
/FontDescriptor 257 0 R
/FirstChar 32
@@ -2517,7 +2539,7 @@ endobj
/URI (https://nixos.wiki/wiki/Flakes)
>>
/Subtype /Link
-/Rect [398.02855 139.4 453.54205 153.68]
+/Rect [459.22255 139.4 514.73605 153.68]
/Type /Annot
>>
endobj
@@ -32273,39 +32295,43 @@ endobj
[259 381 600 600 600 600 600 600 399 399 600 600 293 310 293 288 559 559 559 559 559 559 559 559 559 559 600 600 600 600 600 549 600 752 671 667 767 600 621 769 818 400 600 600 600 952 788 787 638 600 600 585 652 600 600 1066 600 600 600 600 600 600 600 600 600 599 648 526 648 570 407 560 666 352 600 636 352 985 666 612 645 647 522 487 404 666 605 855 645 579 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600]
endobj
256 0 obj
-<< /Length1 9624
-/Length 6027
+<< /Length1 9760
+/Length 6119
/Filter [/FlateDecode]
>>
stream
-x9XWLȄRy&@ H IPhRuZw;XWѽu[znڮm국dPP~s9#bFDzsnO#{g~o]Q:W/dh}78!چBm{~PvX;е}G 5830w9=@߀Ooe"{=̩9X>/`pmsn/,Bj^^ӫJ@(5"}"z|G.4LD>f@h"N8*Q/X"j g~A2=Чk_%3b
WU}}g@؆!JsL0@)
xB/PP2^ V0(y٘ATH'd hy R4ИfGa!g#N>[<!,
Fn8or&JUDLq*&>!1iTmӾ[UjlYM
֘*ҒEϛ[8`ܜiӹT]J&N39*rRB.ch
-,#Wγ@ó";8n,
s^JegF_1pnmHmJҔ;)v"OS~X
+926vpGGF0jбmZr{l%g+jyuROU=vo ŵ4|4@@8 :q|H) h,D-VUqL!,j$E-(HS8C9c' Y|uf86 @]ʑqxV.C\1}|.5\|.M\"-5}VQ0'T@]6GҮu@u6/mp6g)4̳N'j䩊f[ml͕ OqL1M%GE6JK l% \y"-n%\R-/bmXƸ~&kt$>O*#TQ=&MNPSQյWvӬVDVMi 1"2