nix flake and envrc-nix minor

6 files changed, 52 insertions, 38 deletions

diff --git a/.envrc-nix b/.envrc-nix
index 38d9091..5100500 100644
--- a/.envrc-nix
+++ b/.envrc-nix
@@ -35,7 +35,7 @@ echo '
   ❯❯ nix build --print-build-logs
   ❯❯ nix build ".#" --print-build-logs
 
-- to build project (for build dependencies select appropriate dev env & build):
+- to build project:
   ❯❯ nix build ".#spine-nixpkgs-dmd" --print-build-logs
   ❯❯ nix build ".#spine-overlay-dmd" --print-build-logs
   ❯❯ nix build ".#spine-nixpkgs-ldc" --print-build-logs
@@ -49,8 +49,19 @@ echo '
   ❯❯ nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
   ❯❯ dub --verbose --compiler=ldmd2 --config=ldmd2
 
-  - for develop environment & build options
+- for develop environment & build options
 
   ❯❯ nix flake update && nix flake check && nix flake show
   ❯❯ nix flake show
+
+- if on nix: build the sisudoc-spine using nix build commands above and
+  run the result against the sample files here in the sisudoc-spine-samples dir
+  (assuming the appropriate paths have been set in your .envrc-local)
+
+  ❯❯ ${SpineBIN} -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
+  ❯❯ ${SpineBIN} -v --source --pod --latex --latex-init --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
 '
+echo "-
+  ❯❯ ${SpineBIN} -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
+  ❯❯ ${SpineBIN} -v --source --pod --latex --latex-init --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
+"
diff --git a/flake.lock b/flake.lock
index c26d95c..0b8746c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1715037484,
-        "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=",
+        "lastModified": 1715897893,
+        "narHash": "sha256-OrvqfRNUTKNg25z7+mCLV2PAnAjvdj/Z7HeS1g5OB7E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ad7efee13e0d216bf29992311536fce1d3eefbef",
+        "rev": "ea77cefecb0ab07e61d6bde3e24c7ae6820b96d5",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 93752a5..9755571 100644
--- a/flake.nix
+++ b/flake.nix
@@ -205,6 +205,8 @@
       pkgs-nix = nixpkgsFor.${system};
       shellHook = ''
         export Date=`date "+%Y%m%d"`
+        ## set local values in .envrc-local (or here if you must)
+        echo "  ❯❯ ./result/bin/spine -v --source --pod --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=./OUTPUT_TEST_sisudocSpine ../sisu-spine-samples/markup/pod/*";
       '';
     in
       with pkgs-nix; {
@@ -307,6 +309,13 @@
             dub
             gnumake
             sqlite
+            # ❯❯ text-mode web browsers
+            elinks
+            links2
+            lynx
+            w3m
+            # ❯❯ light graphical
+            #dillo
           ];
           inherit shellHook;
         };
@@ -319,7 +328,6 @@
             #dmd
             dub
             gnumake
-            sqlite
             source-sans-pro
             source-serif-pro
             source-code-pro
diff --git a/org/config_env.org b/org/config_env.org
index 112830b..c534640 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -91,7 +91,7 @@ echo '
   ❯❯ nix build --print-build-logs
   ❯❯ nix build ".#" --print-build-logs
 
-- to build project (for build dependencies select appropriate dev env & build):
+- to build project:
   ❯❯ nix build ".#spine-nixpkgs-dmd" --print-build-logs
   ❯❯ nix build ".#spine-overlay-dmd" --print-build-logs
   ❯❯ nix build ".#spine-nixpkgs-ldc" --print-build-logs
@@ -105,11 +105,22 @@ echo '
   ❯❯ nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
   ❯❯ dub --verbose --compiler=ldmd2 --config=ldmd2
 
-  - for develop environment & build options
+- for develop environment & build options
 
   ❯❯ nix flake update && nix flake check && nix flake show
   ❯❯ nix flake show
+
+- if on nix: build the sisudoc-spine using nix build commands above and
+  run the result against the sample files here in the sisudoc-spine-samples dir
+  (assuming the appropriate paths have been set in your .envrc-local)
+
+  ❯❯ ${SpineBIN} -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
+  ❯❯ ${SpineBIN} -v --source --pod --latex --latex-init --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
 '
+echo "-
+  ❯❯ ${SpineBIN} -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
+  ❯❯ ${SpineBIN} -v --source --pod --latex --latex-init --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
+"
 #+END_SRC
 
 *** 3.0.4
@@ -211,30 +222,3 @@ export SpineCGIbin=/var/www/cgi/cgi-bin
 export SpineDBpath=/var/www/sqlite
 #export SpineDBpath=/srv/www/spine/sqlite
 #+END_SRC
-
-#+HEADER: :tangle-NO ../.envrc-local
-#+HEADER: :noweb yes
-#+BEGIN_SRC sh
-if [[ ! -d ./.git ]]; then
-  git init
-  git add .
-fi
-echo '
-  .envrc-local echo ❯❯
-
-  ❯❯ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell" -c $SHELL
-
-  ❯❯ nix develop
-  ❯❯ nix develop -c $SHELL
-  ❯❯ nix develop ".#dsh-overlay-ldc" --print-build-logs
-
-  ❯❯ nix build
-  ❯❯ nix build ".#default" --print-build-logs
-'
-#+END_SRC
-
-#+BEGIN_SRC sh
-#export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos
-#export NIX_PATH=/srv/nix/nixpkgs
-#export NIX_PATH=nixpkgs=/srv/nix/nixpkgs
-#+END_SRC
diff --git a/org/config_nix.org b/org/config_nix.org
index bb33493..0e553b7 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -1,6 +1,6 @@
 -*- mode: org -*-
 #+TITLE:       configuration nix
-#+DESCRIPTION: makefile for spine
+#+DESCRIPTION: configuration nix
 #+FILETAGS:    :spine:build:tools:
 #+AUTHOR:      Ralph Amissah
 #+EMAIL:       [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
@@ -228,6 +228,8 @@
       pkgs-nix = nixpkgsFor.${system};
       shellHook = ''
         export Date=`date "+%Y%m%d"`
+        ## set local values in .envrc-local (or here if you must)
+        echo "  ❯❯ ./result/bin/spine -v --source --pod --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=./OUTPUT_TEST_sisudocSpine ../sisu-spine-samples/markup/pod/*";
       '';
     in
       with pkgs-nix; {
@@ -330,6 +332,13 @@
             dub
             gnumake
             sqlite
+            # ❯❯ text-mode web browsers
+            elinks
+            links2
+            lynx
+            w3m
+            # ❯❯ light graphical
+            #dillo
           ];
           inherit shellHook;
         };
@@ -342,7 +351,6 @@
             #dmd
             dub
             gnumake
-            sqlite
             source-sans-pro
             source-serif-pro
             source-code-pro
@@ -437,6 +445,7 @@ with pkgs-nix;
       # epr
       # sigil
       # calibre #(suite includes: ebook-viewer)
+      # koreader
       # foliate
       # ❯❯❯ i18n translation related
       # perl538Packages.Po4a
@@ -456,6 +465,7 @@ with pkgs-nix;
 pkgs.callPackage ./devenv.nix {}
 #+END_SRC
 
+* devEnv
 ** devenv.nix :default:devenv:
 
 #+HEADER: :tangle ../devenv.nix
@@ -666,7 +676,7 @@ github:NixOS/nixpkgs/nixpkgs-unstable
 
 #+NAME: nixpkgs_url
 #+HEADER: :noweb yes
-#+BEGIN_SRC sh
+#+BEGIN_SRC org
 <<nixpkgs_url_github>>
 #+END_SRC
 
diff --git a/shell.nix b/shell.nix
index f017806..c9415d4 100755
--- a/shell.nix
+++ b/shell.nix
@@ -47,6 +47,7 @@ with pkgs-nix;
       # epr
       # sigil
       # calibre #(suite includes: ebook-viewer)
+      # koreader
       # foliate
       # ❯❯❯ i18n translation related
       # perl538Packages.Po4a