NixOS · Sep 5, 2020
Showing with 14 additions and 12 deletions.

+11 −11 Makefile

+1 −1 copy-nix-dev-tutorials.sh

+2 −0 flake.nix
diff --git a/Makefile b/Makefile
@@ -34,6 +34,15 @@ HTML = \
   teams/security.html
 
 
+NIX_DEV_MANUAL_IN ?= /no-such-path
+NIX_DEV_MANUAL_OUT = guides
+
+all: $(NIX_DEV_MANUAL_OUT)
+
+$(NIX_DEV_MANUAL_OUT): $(NIX_DEV_MANUAL_IN) layout.tt
+	bash copy-nix-dev-tutorials.sh $(NIX_DEV_MANUAL_OUT)
+
+
 ### Prettify the Nix Pills
 
 NIX_PILLS_MANUAL_IN ?= /no-such-path
@@ -120,7 +129,7 @@ favicon.ico: favicon.png
 %-small.png: %.png
 	convert -resize 200 $< $@
 
-%.html: %.tt layout.tt common.tt nix-dev
+%.html: %.tt layout.tt common.tt $(NIX_DEV_MANUAL_OUT)
 	tpage \
 	  --pre_chomp --post_chomp \
 	  --define root=$(ROOT) \
@@ -133,7 +142,7 @@ favicon.ico: favicon.png
 	xmllint --nonet --noout $@.tmp
 	mv $@.tmp $@
 
-%: %.in common.tt
+%: %.in common.tt $(NIX_DEV_MANUAL_OUT)
 	echo $$PATH
 	tpage \
 	  --define latestNixVersion=$(NIX_STABLE_VERSION) \
@@ -189,12 +198,3 @@ all: \
 demos/%.cast: demos/%.scenario demos/create.py 
 	echo "Generating $@ ..."
 	python demos/create.py $< > $@
-
-
-all: nix-dev
-
-NIX_DEV_MANUAL_IN ?= /no-such-path
-NIX_DEV_MANUAL_OUT = guides
-
-nix-dev: $(NIX_DEV_MANUAL_IN)
-	bash copy-nix-dev-tutorials.sh $(NIX_DEV_MANUAL_OUT)
diff --git a/copy-nix-dev-tutorials.sh b/copy-nix-dev-tutorials.sh
@@ -21,7 +21,7 @@ for page in "${pages[@]}"; do
   filename="$(basename ${page%.*})"
   source="$NIX_DEV_MANUAL_IN/$page"
   target="$outDir/$filename.tt"
-  echo "[% WRAPPER layout.tt %]" > $target
+  echo '[% WRAPPER layout.tt title="" %]' > $target
   cat "$source" \
     | sed 's|<a class=\"headerlink\".*<\/a>||g' \
     | sed 's|<a class="reference internal" href="../glossary.html#term-attribute-name"><span class="xref std std-term">attribute name</span></a>|attribute name|g' \

diff --git a/flake.nix b/flake.nix
@@ -106,6 +106,8 @@
               "NIXOS_AMIS=${nixosAmis}"
               "NIX_PILLS_MANUAL_IN=${nixPills}/share/doc/nix-pills"
               "NIX_DEV_MANUAL_IN=${nix-dev.defaultPackage.x86_64-linux}/html"
+
+              "-j 1"
             ];
 
           doCheck = true;