From 0fd8c234bd216da6fba2ed3088c18073a4605e67 Mon Sep 17 00:00:00 2001 From: Tae Sandoval Date: Mon, 30 Sep 2019 19:28:49 +0200 Subject: [PATCH] Update manuals' links --- pills/03-enter-environment.xml | 2 +- pills/04-basics-of-language.xml | 4 ++-- pills/07-working-derivation.xml | 2 +- pills/08-generic-builders.xml | 2 +- pills/09-automatic-runtime.xml | 2 +- pills/15-nix-search-paths.xml | 2 +- pills/18-nix-store-paths.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pills/03-enter-environment.xml b/pills/03-enter-environment.xml index 3d8e9f8..ddfa1a2 100644 --- a/pills/03-enter-environment.xml +++ b/pills/03-enter-environment.xml @@ -366,7 +366,7 @@ We learned how to query the user environment and to manipulate it by installing and uninstalling software. Upgrading software is also straightforward, as you can read in - the manual + the manual (nix-env -u will upgrade all packages in the environment). diff --git a/pills/04-basics-of-language.xml b/pills/04-basics-of-language.xml index be49942..d4e43d8 100644 --- a/pills/04-basics-of-language.xml +++ b/pills/04-basics-of-language.xml @@ -51,7 +51,7 @@ Nix 2.0 contains a command named nix repl which is a simple command line tool for playing with the Nix language. In fact, Nix is a - pure, lazy, functional language, + pure, lazy, functional language, not only a set of tools to manage derivations. The nix repl syntax is slightly different to Nix syntax when it comes to assigning variables, but it shouldn't be confusing so long as you bear it in mind. I prefer to start with nix repl @@ -235,7 +235,7 @@ To do so, use - recursive attribute sets: + recursive attribute sets: diff --git a/pills/07-working-derivation.xml b/pills/07-working-derivation.xml index 37c9acf..ec344c1 100644 --- a/pills/07-working-derivation.xml +++ b/pills/07-working-derivation.xml @@ -303,7 +303,7 @@ Then we meet the - inherit keyword. + inherit keyword. inherit foo; is equivalent to foo = foo;. Similarly, inherit foo bar; is equivalent to foo = foo; bar = bar;. diff --git a/pills/08-generic-builders.xml b/pills/08-generic-builders.xml index 470f4d7..910a49f 100644 --- a/pills/08-generic-builders.xml +++ b/pills/08-generic-builders.xml @@ -212,7 +212,7 @@ The - // operator + // operator is an operator between two sets. The result is the union of the two sets. In case of conflicts between attribute names, the value on the right set is preferred. diff --git a/pills/09-automatic-runtime.xml b/pills/09-automatic-runtime.xml index f3b84dc..28cd197 100644 --- a/pills/09-automatic-runtime.xml +++ b/pills/09-automatic-runtime.xml @@ -257,7 +257,7 @@ This makes packages self-contained, because we're sure (apart data and configuration) that copying the runtime closure on another machine is sufficient to run the program. That's why Nix has - one-click install, + one-click install, or reliable deployment in the cloud. All with one tool. diff --git a/pills/15-nix-search-paths.xml b/pills/15-nix-search-paths.xml index 271ce85..fcad821 100644 --- a/pills/15-nix-search-paths.xml +++ b/pills/15-nix-search-paths.xml @@ -62,7 +62,7 @@ You can list that directory and realize it's simply a checkout of the nixpkgs repository at a specific commit (hint: .version-suffix). - The NIX_PATH variable is exported by nix.sh, and that's the reason why I always asked you to source nix.sh at the beginning of my posts. + The NIX_PATH variable is exported by nix.sh, and that's the reason why I always asked you to source nix.sh at the beginning of my posts. You may wonder: then I can also specify a different nixpkgs path to, e.g., a git checkout of nixpkgs? Yes, you can and I encourage doing that. We'll talk about this in the next pill. diff --git a/pills/18-nix-store-paths.xml b/pills/18-nix-store-paths.xml index 480a829..4645e32 100644 --- a/pills/18-nix-store-paths.xml +++ b/pills/18-nix-store-paths.xml @@ -96,7 +96,7 @@ Finally, the other most used kind of path is when we know beforehand an integrity hash of a file. This is usual for tarballs. - A derivation can take three special attributes: outputHashMode, outputHash and outputHashAlgo which are well documented in the nix manual. + A derivation can take three special attributes: outputHashMode, outputHash and outputHashAlgo which are well documented in the nix manual. The builder must create the out path and make sure its hash is the same as the one declared with outputHash.