fix formatting and links

source/guides/faq.md

@@ -45,11 +45,11 @@ See <https://github.com/nix-community/home-manager>
 
 ### What's the recommended process for building custom packages?
 
-Please read [](packaging-existing-software).
+Please read [](packaging-tutorial).
 
 ### How to use a clone of the Nixpkgs repository to update or write new packages?
 
-Please read [](packaging-existing-software) and the [Nixpkgs contributing guide](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
+Please read [](packaging-tutorial) and the [Nixpkgs contributing guide](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
 
 ## NixOS
 
@@ -69,7 +69,7 @@ There are a few ways to resolve this mismatch in environment expectations:
   - Build from source.
 
     Many open-source programs are highly flexible at compile time in terms of where their files go.
-    For an introduction to this, see [](../tutorials/packaging-existing-software).
+    For an introduction to this, see [](packaging-tutorial).
   - Modify the program's [ELF header](https://en.wikipedia.org/wiki/Executable_and_Linkable_Format) to include paths to libraries using [`autoPatchelfHook`](https://nixos.org/manual/nixpkgs/stable/#setup-hook-autopatchelfhook).
 
     Do this if building from source isn't feasible.

source/guides/recipes/python-environment.md

@@ -105,7 +105,7 @@ Others can now use the same shell environment as long as they have [Nix installe
 
 ## Next steps
 
-- [](packaging-existing-software)
+- [](packaging-tutorial)
 - [](file-sets-tutorial)
 - [](automatic-direnv)
 - [](./dependency-management.md)

source/guides/recipes/sharing-dependencies.md

@@ -1,7 +1,7 @@
 (sharing-dependencies)=
 # Dependencies in the development shell
 
-When [packaging software in `default.nix`](packaging-existing-software), you'll want a [development environment in `shell.nix`](declarative-reproducible-envs) to enter it conveniently with `nix-shell` or [automatically with `direnv`](./direnv).
+When [packaging software in `default.nix`](packaging-tutorial), you'll want a [development environment in `shell.nix`](declarative-reproducible-envs) to enter it conveniently with `nix-shell` or [automatically with `direnv`](./direnv).
 
 How to share the package's dependencies in `default.nix` with the development environment in `shell.nix`?
 
@@ -109,4 +109,4 @@ $ nix-shell --pure
 - [](pinning-nixpkgs)
 - [](./direnv)
 - [](python-dev-environment)
-- [](packaging-existing-software)
+- [](packaging-tutorial)

source/tutorials/callpackage.md

@@ -33,7 +33,7 @@ This tutorial shows how to use it and why it's beneficial.
 ### What do you need?
 
 - Familiarity with the [Nix language](reading-nix-language)
-- First experience with [packaging existing software](packaging-existing-software)
+- First experience with [packaging existing software](packaging-tutorial)
 
 ### How long does it take?
 

source/tutorials/module-system/module-system.md

@@ -67,11 +67,11 @@ Start by changing the first line in `default.nix`:
 
 ```{code-block} diff
 :caption: default.nix
-- { ... }:
-+ { lib, ... }:
-{
+-{ ... }:
++{ lib, ... }:
+ {
 
-}
+ }
 ```
 
 Now the module is a function which takes *at least* one argument, called `lib`, and may accept other arguments (expressed by the ellipsis `...`).
@@ -97,7 +97,7 @@ Change `default.nix` to include the following declaration:
 ```{code-block} diff
 :caption: default.nix
  { lib, ... }: {
-
++
 + options = {
 +   scripts.output = lib.mkOption {
 +     type = lib.types.lines;
@@ -204,12 +204,12 @@ Update `default.nix` by changing the value of `scripts.output` to the following
 
 ```{code-block} diff
 :caption: default.nix
-   config = {
--    scripts.output = 42;
-+    scripts.output = ''
-+      ./map size=640x640 scale=2 | feh -
-+    '';
-   };
+  config = {
+-   scripts.output = 42;
++   scripts.output = ''
++     ./map size=640x640 scale=2 | feh -
++   '';
+  };
 ```
 
 ## Interlude: reproducible scripts

source/tutorials/packaging-existing-software.md

@@ -5,7 +5,7 @@ myst:
     "keywords": "Nix, packaging"
 ---
 
-(packaging-existing-software)=
+(packaging-tutorial)=
 # Packaging existing software with Nix
 
 One of Nix's primary use-cases is in addressing common difficulties encountered with packaging software, such as specifying and obtaining dependencies.
@@ -141,7 +141,7 @@ in
 This allows you to run `nix-build -A hello` to realize the derivation in `hello.nix`, similar to the current convention used in Nixpkgs.
 
 :::{note}
-[`callPackage`] automatically passes attributes from `pkgs` to the given function, if they match attributes required by that function's argument attrset.
+`callPackage` automatically passes attributes from `pkgs` to the given function, if they match attributes required by that function's argument attribute set.
 
 In this case, `callPackage` will supply `lib`, `stdenv`, and `fetchzip` to the function defined in `hello.nix`.
 :::
@@ -643,6 +643,7 @@ Adjust your `installPhase` to call the appropriate hooks:
 # ...
 
 ```
+
 ## A successful build
 
 Running the `nix-build` command once more will finally do what you want, repeatably.
@@ -658,15 +659,13 @@ default.nix hello.nix icat.nix result
 ## References
 
 - [Nixpkgs Manual - Standard Environment](https://nixos.org/manual/nixpkgs/unstable/#part-stdenv)
-- [Nix Pills - `callPackage` Design Pattern][`callPackage`]
-
-[`callPackage`]: https://nixos.org/guides/nix-pills/callpackage-design-pattern.html
 
 ## Next steps
 
 - [Add your own new packages to Nixpkgs](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md)
   - [](../contributing/how-to-contribute.md)
   - [](../contributing/how-to-get-help.md)
+- [](callpackage-tutorial)
 - [](sharing-dependencies)
 - [](automatic-direnv)
 - [](python-dev-environment)