From 3d00d4115380fa1ccd372071846ac3c10e7f62d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amy=20de=20Buitl=C3=A9ir?= Date: Tue, 28 Nov 2023 16:13:05 +0000 Subject: [PATCH] restructure recipes --- Makefile | 3 +- index.html | 589 +- source/book.adoc | 6 +- .../env-var/shell}/main.adoc0 | 9 +- .../env-var/shell}/shell.nix | 0 .../haskell-local-deps/shell/main.adoc0 | 9 + .../haskell-local-deps/shell}/shell.nix | 0 source/recipes/haskell-local/shell/main.adoc0 | 9 + .../haskell-local/shell}/shell.nix | 0 source/recipes/haskell-nixpkg/main.adoc | 11 + .../haskell-nixpkg/shebang}/my-script.sh | 0 .../haskell-nixpkg/shell}/Main.hs | 0 .../recipes/haskell-nixpkg/shell/main.adoc0 | 25 + .../haskell-nixpkg/shell}/shell.nix | 0 .../nixpkgs-pkg/shebang}/main.adoc0 | 2 +- .../nixpkgs-pkg/shebang}/my-script.sh | 3 +- .../nixpkgs-pkg/shell}/main.adoc0 | 4 +- .../nixpkgs-pkg/shell}/shell.nix | 0 .../recipes/python-nixpkg/shebang/main.adoc0 | 12 + .../python-nixpkg/shebang}/my-script.sh | 0 .../remote-git-flake/shell}/main.adoc0 | 2 +- .../recipes/remote-git-flake/shell/shell.nix | 11 + source/recipes/remote-git/shell/main.adoc0 | 16 + .../remote-git/shell}/shell.nix | 4 +- .../shebangs/haskell-with-nix-pkg/main.adoc0 | 13 - source/shebangs/main.adoc | 16 - .../shebangs/python-with-nix-pkg/main.adoc0 | 13 - source/shell-recipes/main.adoc | 21 - .../shell-haskell-local-deps/main.adoc0 | 11 - .../shell-haskell-local/main.adoc0 | 10 - .../shell-haskell-no-cabal/main.adoc0 | 28 - .../shell-with-env-var/main.adoc0 | 16 - .../shell-with-flake-rev/shell.nix | 9 - .../shell-recipes/shell-with-flake/shell.nix | 11 - .../shell-with-nixpkgs/main.adoc0 | 22 - wombats-book-of-nix.pdf | 24653 +++++++++------- 36 files changed, 13618 insertions(+), 11920 deletions(-) rename source/{shell-recipes/shell-with-git-nix-pkg => recipes/env-var/shell}/main.adoc0 (71%) rename source/{shell-recipes/shell-with-env-var => recipes/env-var/shell}/shell.nix (100%) create mode 100644 source/recipes/haskell-local-deps/shell/main.adoc0 rename source/{shell-recipes/shell-haskell-local-deps => recipes/haskell-local-deps/shell}/shell.nix (100%) create mode 100644 source/recipes/haskell-local/shell/main.adoc0 rename source/{shell-recipes/shell-haskell-local => recipes/haskell-local/shell}/shell.nix (100%) create mode 100644 source/recipes/haskell-nixpkg/main.adoc rename source/{shebangs/haskell-with-nix-pkg => recipes/haskell-nixpkg/shebang}/my-script.sh (100%) rename source/{shell-recipes/shell-haskell-no-cabal => recipes/haskell-nixpkg/shell}/Main.hs (100%) create mode 100644 source/recipes/haskell-nixpkg/shell/main.adoc0 rename source/{shell-recipes/shell-haskell-no-cabal => recipes/haskell-nixpkg/shell}/shell.nix (100%) rename source/{shebangs/bash-with-nix-pkg => recipes/nixpkgs-pkg/shebang}/main.adoc0 (63%) rename source/{shebangs/bash-with-nix-pkg => recipes/nixpkgs-pkg/shebang}/my-script.sh (53%) rename source/{shell-recipes/shell-with-flake-rev => recipes/nixpkgs-pkg/shell}/main.adoc0 (77%) rename source/{shell-recipes/shell-with-nixpkgs => recipes/nixpkgs-pkg/shell}/shell.nix (100%) create mode 100644 source/recipes/python-nixpkg/shebang/main.adoc0 rename source/{shebangs/python-with-nix-pkg => recipes/python-nixpkg/shebang}/my-script.sh (100%) rename source/{shell-recipes/shell-with-flake => recipes/remote-git-flake/shell}/main.adoc0 (86%) create mode 100644 source/recipes/remote-git-flake/shell/shell.nix create mode 100644 source/recipes/remote-git/shell/main.adoc0 rename source/{shell-recipes/shell-with-git-nix-pkg => recipes/remote-git/shell}/shell.nix (79%) delete mode 100644 source/shebangs/haskell-with-nix-pkg/main.adoc0 delete mode 100644 source/shebangs/main.adoc delete mode 100644 source/shebangs/python-with-nix-pkg/main.adoc0 delete mode 100644 source/shell-recipes/main.adoc delete mode 100644 source/shell-recipes/shell-haskell-local-deps/main.adoc0 delete mode 100644 source/shell-recipes/shell-haskell-local/main.adoc0 delete mode 100644 source/shell-recipes/shell-haskell-no-cabal/main.adoc0 delete mode 100644 source/shell-recipes/shell-with-env-var/main.adoc0 delete mode 100644 source/shell-recipes/shell-with-flake-rev/shell.nix delete mode 100644 source/shell-recipes/shell-with-flake/shell.nix delete mode 100644 source/shell-recipes/shell-with-nixpkgs/main.adoc0 diff --git a/Makefile b/Makefile index 3b715c4..e4e638c 100644 --- a/Makefile +++ b/Makefile @@ -6,12 +6,13 @@ STATIC_ADOC_FILES != find source -name '*.adoc' GENERATED_ADOC_FILES != find source -name '*.adoc0' | sed 's/\.adoc0/-generated.adoc/' ADOC_FILES = $(STATIC_ADOC_FILES) $(GENERATED_ADOC_FILES) DATE != date +%F +TIME != date +"%T %Z" MAIN_ADOC_FILE = source/book.adoc HTML_FILE = index.html PDF_FILE = wombats-book-of-nix.pdf -ADOC_ATTR_DATE = -a build_date=$(DATE) +ADOC_ATTR_DATE = -a docdate="$(DATE)" -a doctime="$(TIME)" ADOC_ATTR_AUTHORS = -a authors="Amy de Buitléir" ADOC_ATTRIBUTES = $(ADOC_ATTR_DATE) $(ADOC_ATTR_AUTHORS) ADOC_HTML_ATTRIBUTES = -a stylesheet=../themes/html.css -a imagesdir=images diff --git a/index.html b/index.html index 1abb2dd..bd50812 100644 --- a/index.html +++ b/index.html @@ -94,7 +94,7 @@ pre.pygments .tok-il { color: #666666 } /* Literal.Number.Integer.Long */