diff --git a/index.html b/index.html
index e0ac3cc..dc5849b 100644
--- a/index.html
+++ b/index.html
@@ -2338,7 +2338,7 @@ access to language-specific packages, there are Nix functions to assist
with that. These functions are very language-specific, and not always
well-documented. We will see examples for some languages later in the
tutorial. In general, I recommend that you do a web search for
-“nix language”, and try to find resources that were written or updated
+"nix language-name", and try to find resources that were written or updated
recently.
@@ -4782,7 +4782,7 @@ Hello from your flake!
diff --git a/source/book.adoc b/source/book.adoc
index 2762e48..66be26f 100644
--- a/source/book.adoc
+++ b/source/book.adoc
@@ -26,7 +26,7 @@ https://codeberg.org/mhwombat/nix-book/raw/branch/pages/wombats-book-of-nix.pdf[
I would like to thank the patient people on the
https://discourse.nixos.org/[NixOS Discourse Forum]
who answered my many questions,
-especially `cdepillabout` and `FedericoSchonborn`.
+especially `cdepillabout`, `FedericoSchonborn`, `tejing` and `smkuehnhold`.
include::intro/main.adoc[leveloffset=+1]
diff --git a/source/recipes/devshell/main.adoc b/source/recipes/devshell/main.adoc
index 33db181..0f66e22 100644
--- a/source/recipes/devshell/main.adoc
+++ b/source/recipes/devshell/main.adoc
@@ -1,4 +1,4 @@
-= Development shells
+= Development environments
include::nixpkg/main-generated.adoc[leveloffset=+1]
@@ -10,4 +10,6 @@ include::haskell-flake/main-generated.adoc[leveloffset=+1]
include::env-var/main-generated.adoc[leveloffset=+1]
-// TODO non-flake/main-generated.adoc
+include::nix-non-flake/main-generated.adoc[leveloffset=+1]
+
+include::non-flake/main-generated.adoc[leveloffset=+1]
diff --git a/source/recipes/devshell/non-flake/flake.nix b/source/recipes/devshell/nix-non-flake/flake.nix
similarity index 73%
rename from source/recipes/devshell/non-flake/flake.nix
rename to source/recipes/devshell/nix-non-flake/flake.nix
index 560bc6e..b4b97a6 100644
--- a/source/recipes/devshell/non-flake/flake.nix
+++ b/source/recipes/devshell/nix-non-flake/flake.nix
@@ -11,15 +11,15 @@
outputs = { self, nixpkgs, flake-utils, hello-nix }:
flake-utils.lib.eachDefaultSystem (system:
let
- pkgs = import nixpkgs { inherit system; };
+ pkgs = import nixpkgs {
+ inherit system;
+ };
+ helloNix = import hello-nix { inherit pkgs; };
in
{
devShells = rec {
default = pkgs.mkShell {
- shellHook =
- ''
- PATH=${hello-nix}:$PATH
- '';
+ packages = [ helloNix ];
};
};
}
diff --git a/source/recipes/devshell/nix-non-flake/main.adoc0 b/source/recipes/devshell/nix-non-flake/main.adoc0
new file mode 100644
index 0000000..b468d49
--- /dev/null
+++ b/source/recipes/devshell/nix-non-flake/main.adoc0
@@ -0,0 +1,62 @@
+= Access a non-flake package (not in nixpkgs)
+
+////
+$ mkdir tempwork
+$ cd tempwork
+$ cp ../flake.nix flake.nix
+$ git add flake.nix
+$ nix develop
+$ git add flake.lock
+$ git commit -a -m temp
+////
+
+In this example, we will use a nix package (not a flake) defined in a remote git repo.
+However, you can use any of the flake reference styles defined in <<#flakeref>>.
+
+First, we need to check if the nix derivation depends on `nixpkgs`.
+
+== If the nix derivation does not require nixpkgs.
+
+[source,nix,linenums,highlight='5..8,17']
+.flake.nix
+....
+$# cat flake.nix
+....
+
+Lines ??? fetches the git repo for `hello-nix`.
+However, it is not a flake, so we have to build it;
+this is done in line ???.
+
+Here's a demonstration using the shell.
+
+....
+$ hello-nix # this will fail
+$# ../../../../../start-shell nix develop <