From eabae3d7c7d7c8f648715826e5533f3fb4f523de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amy=20de=20Buitl=C3=A9ir?= <amy@nualeargais.ie>
Date: Thu, 4 Sep 2025 20:21:18 +0100
Subject: [PATCH] temp

---
 .../shell => devshell/haskell-pkg}/Main.hs    |  0
 .../recipes/devshell/haskell-pkg/main.adoc0   | 38 ++++++++++++
 .../tempwork/flake.nix                        |  6 +-
 .../devshell/nixpkg/tempwork/flake.lock       | 60 -------------------
 .../recipes/haskell-nixpkg/shell/main.adoc0   | 25 --------
 source/recipes/main.adoc                      | 26 ++------
 .../shell => nix-shell}/shell.nix             |  0
 source/recipes/nixpkgs-pkg/main.adoc          | 10 ----
 source/recipes/nixpkgs-pkg/shebang/main.adoc0 | 25 --------
 source/recipes/nixpkgs-pkg/shell/main.adoc0   | 24 --------
 source/recipes/remote-git-flake/main.adoc     | 10 ----
 .../recipes/remote-git-flake/shell/main.adoc0 | 17 ------
 source/recipes/remote-git/shell/main.adoc0    | 16 -----
 source/recipes/remote-git/shell/shell.nix     | 10 ----
 14 files changed, 48 insertions(+), 219 deletions(-)
 rename source/recipes/{haskell-nixpkg/shell => devshell/haskell-pkg}/Main.hs (100%)
 create mode 100644 source/recipes/devshell/haskell-pkg/main.adoc0
 rename source/recipes/devshell/{nixpkg => haskell-pkg}/tempwork/flake.nix (57%)
 delete mode 100644 source/recipes/devshell/nixpkg/tempwork/flake.lock
 delete mode 100644 source/recipes/haskell-nixpkg/shell/main.adoc0
 rename source/recipes/{remote-git-flake/shell => nix-shell}/shell.nix (100%)
 delete mode 100644 source/recipes/nixpkgs-pkg/main.adoc
 delete mode 100644 source/recipes/nixpkgs-pkg/shebang/main.adoc0
 delete mode 100644 source/recipes/nixpkgs-pkg/shell/main.adoc0
 delete mode 100644 source/recipes/remote-git-flake/main.adoc
 delete mode 100644 source/recipes/remote-git-flake/shell/main.adoc0
 delete mode 100644 source/recipes/remote-git/shell/main.adoc0
 delete mode 100644 source/recipes/remote-git/shell/shell.nix

diff --git a/source/recipes/haskell-nixpkg/shell/Main.hs b/source/recipes/devshell/haskell-pkg/Main.hs
similarity index 100%
rename from source/recipes/haskell-nixpkg/shell/Main.hs
rename to source/recipes/devshell/haskell-pkg/Main.hs
diff --git a/source/recipes/devshell/haskell-pkg/main.adoc0 b/source/recipes/devshell/haskell-pkg/main.adoc0
new file mode 100644
index 0000000..523920a
--- /dev/null
+++ b/source/recipes/devshell/haskell-pkg/main.adoc0
@@ -0,0 +1,38 @@
+= A Haskell library package in the nixpkgs repo (without a `.cabal` file)
+
+////
+$ mkdir tempwork
+$ cd tempwork
+$ cp ../flake.nix Main.hs .
+$ git add flake.nix
+$ nix develop
+$ git add flake.lock
+$ git commit -a -m temp
+////
+
+Occasionally you might want to run a short Haskell program that depends on a Haskell library,
+but you don't want to bother writing a cabal file.
+
+Example: Access the `containers` package from the `haskellPackages` set in the nixpkgs repo.
+
+[source,nix,linenums]
+.flake.nix
+....
+include::flake.nix[]
+....
+
+Here's a short Haskell program that uses it.
+
+[source,haskell,linenums]
+.Main.hs
+....
+include::Main.hs[]
+....
+
+Here's a demonstration using the program.
+
+....
+$# ../../../../../start-shell nix develop <<EOL
+$ runghc Main.hs
+$# EOL
+....
diff --git a/source/recipes/devshell/nixpkg/tempwork/flake.nix b/source/recipes/devshell/haskell-pkg/tempwork/flake.nix
similarity index 57%
rename from source/recipes/devshell/nixpkg/tempwork/flake.nix
rename to source/recipes/devshell/haskell-pkg/tempwork/flake.nix
index 83db46c..a53a18a 100644
--- a/source/recipes/devshell/nixpkg/tempwork/flake.nix
+++ b/source/recipes/devshell/haskell-pkg/tempwork/flake.nix
@@ -2,17 +2,19 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs";
     flake-utils.url = "github:numtide/flake-utils";
+    hello-flake.url = "git+https://codeberg.org/mhwombat/hello-flake";
   };
 
-  outputs = { self, nixpkgs, flake-utils }:
+  outputs = { self, nixpkgs, flake-utils, hello-flake }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs { inherit system; };
+        customGhc = haskellPackages.ghcWithPackages (p: with p; [ containers ]);
       in
       {
         devShells = rec {
           default = pkgs.mkShell {
-            packages = [ pkgs.cowsay ];
+	          buildInputs = [ customGhc ];
           };
         };
       }
diff --git a/source/recipes/devshell/nixpkg/tempwork/flake.lock b/source/recipes/devshell/nixpkg/tempwork/flake.lock
deleted file mode 100644
index 12c3bd6..0000000
--- a/source/recipes/devshell/nixpkg/tempwork/flake.lock
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1757007868,
-        "narHash": "sha256-zekS8JUSNEiphLnjWJBFoaX4Kb8GxiiD6FvoKZI+8b0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "36420cc41abb467f89082432cfe139f5fdbdcea3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/source/recipes/haskell-nixpkg/shell/main.adoc0 b/source/recipes/haskell-nixpkg/shell/main.adoc0
deleted file mode 100644
index f3a42b7..0000000
--- a/source/recipes/haskell-nixpkg/shell/main.adoc0
+++ /dev/null
@@ -1,25 +0,0 @@
-= In `shell.nix`
-
-
-[source,nix,linenums]
-.shell.nix
-....
-include::shell.nix[]
-....
-
-Here's a short Haskell program that uses it.
-
-[source,haskell,linenums]
-.Main.hs
-....
-include::Main.hs[]
-....
-
-Here's a demonstration using the program.
-
-....
-$# echo '$ nix-shell'
-$# nix-shell --run bash <<EOL
-$ runghc Main.hs
-$# EOL
-....
diff --git a/source/recipes/main.adoc b/source/recipes/main.adoc
index 8bedd45..40b7767 100644
--- a/source/recipes/main.adoc
+++ b/source/recipes/main.adoc
@@ -4,25 +4,13 @@ This chapter provides examples of how to use Nix in a variety of scenarios.
 Multiple types of recipes are provided are provided for some scenarios;
 comparing the different recipes will help you better understand Nix.
 
-- An _"ad hoc" shell_
-is useful when you want to quickly create an environment
+- _"Ad hoc" shells_
+are useful when you want to quickly create an environment
 for a one-off task.
 
-- A _traditional nix shell_
-is useful when you want to define an environment that you will
-use more than once.
-
 - _Nix flakes_
-are the recommended approach for development projects.
-
-- You can use `nix-shell` to run scripts in arbitrary languages, providing
-the necessary dependencies. This is particularly convenient for
-standalone scripts because you don't need to create a repo and write a
-separate `flake.nix`.
-The script should start with two _"shebang"_ (`#!`) commands. The first
-should invoke `nix-shell`. The second should declares the script
-interpreter and any dependencies.
-
+are the recommended approach for development projects,
+including defining environments that you will use more than once.
 
 include::run/main-generated.adoc[leveloffset=+1]
 
@@ -30,14 +18,12 @@ include::ad-hoc/main-generated.adoc[leveloffset=+1]
 
 include::shebang/main-generated.adoc[leveloffset=+1]
 
-include::devshell/main-generated.adoc[leveloffset=+1]
+include::devshell/main.adoc[leveloffset=+1]
 
-include::nixpkgs-pkg/main.adoc[leveloffset=+1]
+include::nix-shell/main-generated.adoc[leveloffset=+1]
 
 include::remote-git/main.adoc[leveloffset=+1]
 
-include::remote-git-flake/main.adoc[leveloffset=+1]
-
 include::haskell-nixpkg/main.adoc[leveloffset=+1]
 
 include::haskell-local/main.adoc[leveloffset=+1]
diff --git a/source/recipes/remote-git-flake/shell/shell.nix b/source/recipes/nix-shell/shell.nix
similarity index 100%
rename from source/recipes/remote-git-flake/shell/shell.nix
rename to source/recipes/nix-shell/shell.nix
diff --git a/source/recipes/nixpkgs-pkg/main.adoc b/source/recipes/nixpkgs-pkg/main.adoc
deleted file mode 100644
index 5f6c7cc..0000000
--- a/source/recipes/nixpkgs-pkg/main.adoc
+++ /dev/null
@@ -1,10 +0,0 @@
-= Access to a top-level package from the Nixpkgs/NixOS repo
-
-Ex: Access two packages from nixpkgs:
-hello and cowsay.
-
-include::cli/main-generated.adoc[leveloffset=+1]
-
-include::shell/main-generated.adoc[leveloffset=+1]
-
-include::shebang/main-generated.adoc[leveloffset=+1]
diff --git a/source/recipes/nixpkgs-pkg/shebang/main.adoc0 b/source/recipes/nixpkgs-pkg/shebang/main.adoc0
deleted file mode 100644
index a68ff00..0000000
--- a/source/recipes/nixpkgs-pkg/shebang/main.adoc0
+++ /dev/null
@@ -1,25 +0,0 @@
-= In a Bash script (flake style)
-
-[source,bash,linenums]
-.Script
-....
-include::my-flake-script.sh[]
-....
-
-.Output
-....
-$# ./my-flake-script.sh
-....
-
-= In a Bash script (non-flake style)
-
-[source,bash,linenums]
-.Script
-....
-include::my-script.sh[]
-....
-
-.Output
-....
-$# ./my-script.sh
-....
diff --git a/source/recipes/nixpkgs-pkg/shell/main.adoc0 b/source/recipes/nixpkgs-pkg/shell/main.adoc0
deleted file mode 100644
index e5c9788..0000000
--- a/source/recipes/nixpkgs-pkg/shell/main.adoc0
+++ /dev/null
@@ -1,24 +0,0 @@
-= In `flake.nix`
-
-See the example in <<_introducing_a_dependency>>
-where defined a development shell in <<hello-flake-dependency,flake.nix>>
-with a dependency on `cowsay` ,
-and tested the shell.
-
-= In `shell.nix`
-
-[source,nix,linenums]
-.shell.nix
-....
-include::shell.nix[]
-....
-
-Here's a demonstration using the shell.
-
-....
-$# echo '$ nix-shell'
-$# nix-shell --run bash <<EOL
-$ hello
-$ cowsay "moo"
-$# EOL
-....
diff --git a/source/recipes/remote-git-flake/main.adoc b/source/recipes/remote-git-flake/main.adoc
deleted file mode 100644
index ad353fb..0000000
--- a/source/recipes/remote-git-flake/main.adoc
+++ /dev/null
@@ -1,10 +0,0 @@
-= Access to a flake defined in a remote git repo
-
-Ex: Access a flake called `hello-flake`,
-which is defined in a remote git repo on codeberg.
-To use a package from GitHub, GitLab, or any other public platform,
-modify the URL.
-
-include::cli/main-generated.adoc[leveloffset=+1]
-
-include::shell/main-generated.adoc[leveloffset=+1]
diff --git a/source/recipes/remote-git-flake/shell/main.adoc0 b/source/recipes/remote-git-flake/shell/main.adoc0
deleted file mode 100644
index a29d866..0000000
--- a/source/recipes/remote-git-flake/shell/main.adoc0
+++ /dev/null
@@ -1,17 +0,0 @@
-= In `shell.nix`
-
-[source,nix,linenums]
-.shell.nix
-....
-include::shell.nix[]
-....
-
-Here's a demonstration using the shell.
-
-....
-$# echo '$ nix-shell'
-$# nix-shell --run bash <<EOL
-$ hello-flake
-$# EOL
-....
-
diff --git a/source/recipes/remote-git/shell/main.adoc0 b/source/recipes/remote-git/shell/main.adoc0
deleted file mode 100644
index 41c8091..0000000
--- a/source/recipes/remote-git/shell/main.adoc0
+++ /dev/null
@@ -1,16 +0,0 @@
-= In `shell.nix`
-
-[source,nix,linenums]
-.shell.nix
-....
-include::shell.nix[]
-....
-
-Here's a demonstration using the shell.
-
-....
-$# echo '$ nix-shell'
-$# nix-shell --run bash <<EOL
-$ hello-nix
-$# EOL
-....
diff --git a/source/recipes/remote-git/shell/shell.nix b/source/recipes/remote-git/shell/shell.nix
deleted file mode 100644
index f79e6d2..0000000
--- a/source/recipes/remote-git/shell/shell.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-with (import <nixpkgs> {});
-let
-  hello-nix = import (builtins.fetchGit {
-                                           url = "https://codeberg.org/mhwombat/hello-nix";
-                                           rev = "aa2c87f8b89578b069b09fdb2be30a0c9d8a77d8";
-                                         });
-in
-mkShell {
-  buildInputs = [ hello-nix ];
-}