aboutsummaryrefslogtreecommitdiffhomepage
path: root/org
diff options
context:
space:
mode:
authorRalph Amissah <ralph.amissah@gmail.com>2024-05-17 22:48:20 -0400
committerRalph Amissah <ralph.amissah@gmail.com>2024-05-17 23:42:07 -0400
commit594122acc6ee5766c21098591a7998c76ff80bf2 (patch)
tree5c68cd30667fc6e8642576709795aac533bfff7b /org
parentnix dlang overlay ldc-1.38.0 (diff)
nix flake and envrc-nix minor
Diffstat (limited to 'org')
-rw-r--r--org/config_env.org42
-rw-r--r--org/config_nix.org16
2 files changed, 26 insertions, 32 deletions
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