diff --git a/index.html b/index.html index e8c9b7f..002c6b5 100644 --- a/index.html +++ b/index.html @@ -213,7 +213,9 @@ -
  • 10.5. An (old-style) Nix shell with access to a flake
  • +
  • 10.5. Build/runtime environments
  • +
  • 10.6. Special situations
  • +
  • 10.7. An (old-style) Nix shell with access to a flake
  • @@ -4847,7 +4849,8 @@ Hello from your nix package!
    If the nix derivation requires nixpkgs
    -

    We need to write the derivation ourselves, using default.nix as a model. +

    In this case, we need to write the derivation ourselves. +We can use default.nix as a model. Line 15 should be replaced with:

    @@ -4871,7 +4874,35 @@ Line 15 should be replaced with:

    -

    10.5. An (old-style) Nix shell with access to a flake

    +

    10.5. Build/runtime environments

    +
    +

    Unresolved directive in recipes/build/main.adoc - include::nixpkg/main-generated.adoc[leveloffset=+1]

    +
    +
    +

    Unresolved directive in recipes/build/main.adoc - include::flake/main-generated.adoc[leveloffset=+1]

    +
    +
    +

    Unresolved directive in recipes/build/main.adoc - include::haskell-pkg/main-generated.adoc[leveloffset=+1]

    +
    +
    +

    Unresolved directive in recipes/build/main.adoc - include::haskell-flake/main-generated.adoc[leveloffset=+1]

    +
    +
    +

    Unresolved directive in recipes/build/main.adoc - include::env-var/main-generated.adoc[leveloffset=+1]

    +
    +
    +

    Unresolved directive in recipes/build/main.adoc - include::nix-non-flake/main-generated.adoc[leveloffset=+1]

    +
    +
    +

    Unresolved directive in recipes/build/main.adoc - include::non-flake/main-generated.adoc[leveloffset=+1]

    +
    +
    +
    +

    10.6. Special situations

    + +
    +
    +

    10.7. An (old-style) Nix shell with access to a flake

    If you are maintaining legacy code, you may need to provide access to a flake in a nix-shell. @@ -4929,7 +4960,7 @@ Hello from your flake!

    diff --git a/source/recipes/devshell/nix-non-flake/main.adoc0 b/source/recipes/devshell/nix-non-flake/main.adoc0 index 35c144b..0a2e182 100644 --- a/source/recipes/devshell/nix-non-flake/main.adoc0 +++ b/source/recipes/devshell/nix-non-flake/main.adoc0 @@ -1,3 +1,4 @@ +[#devshell-nix-non-flake] = Access a non-flake package (not in nixpkgs) //// diff --git a/source/recipes/main.adoc b/source/recipes/main.adoc index 35dbecc..7f72f9c 100644 --- a/source/recipes/main.adoc +++ b/source/recipes/main.adoc @@ -20,4 +20,8 @@ include::shebang/main.adoc[leveloffset=+1] include::devshell/main.adoc[leveloffset=+1] +include::build/main.adoc[leveloffset=+1] + +== Special situations + include::nix-shell/main-generated.adoc[leveloffset=+1]