aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-x.envrc-nix3
-rw-r--r--flake.lock22
-rw-r--r--flake.nix42
-rw-r--r--org/config_env.org3
-rw-r--r--org/config_nix.org42
5 files changed, 97 insertions, 15 deletions
diff --git a/.envrc-nix b/.envrc-nix
index dfd44a8..770db1c 100755
--- a/.envrc-nix
+++ b/.envrc-nix
@@ -37,6 +37,9 @@ echo '
• nix develop using package overlays: (dmd-2.111.0, ldc-1.41.0, dub-1.39.0, dtools-2.110.0)
❯❯ nix develop ".#dsh-overlay-dmd" --print-build-logs -c zsh
❯❯ nix develop ".#dsh-overlay-ldc" --print-build-logs -c zsh
+ • for more nix develop build spine & generate markup
+ ❯❯ nix develop ".#dsh-build-spine-generate-samples-env-defaults" --print-build-logs -c zsh
+ ❯❯ nix develop ".#dsh-build-spine-generate-samples-test" --print-build-logs -c zsh
• for more nix develop specialized shells
❯❯ nix flake show
diff --git a/flake.lock b/flake.lock
index 9014853..335b44f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
]
},
"locked": {
- "lastModified": 1749310555,
- "narHash": "sha256-QRkhrRy6wLBBjSlVTQgjoCsiL5HUJa/nPAOGoNmAkzw=",
+ "lastModified": 1754707636,
+ "narHash": "sha256-np3xPi0/PPEe4OWPPrTNV+eu8QIgSp83NaKMukE0hJE=",
"ref": "refs/heads/main",
- "rev": "03160d6114c3fb835b079f20797dac6b88ab5cbc",
- "revCount": 22,
+ "rev": "d393ad85676436fef1e37e712405d6d10593977d",
+ "revCount": 23,
"type": "git",
"url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake"
},
@@ -22,11 +22,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1749401433,
- "narHash": "sha256-HXIQzULIG/MEUW2Q/Ss47oE3QrjxvpUX7gUl4Xp6lnc=",
+ "lastModified": 1761880412,
+ "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "08fcb0dcb59df0344652b38ea6326a2d8271baff",
+ "rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386",
"type": "github"
},
"original": {
@@ -50,11 +50,11 @@
]
},
"locked": {
- "lastModified": 1749307805,
- "narHash": "sha256-N0TlfLqjXapQEuvrGeUq0NEvbXAXlCQgk8P5v2K/aBc=",
+ "lastModified": 1761924324,
+ "narHash": "sha256-mcMQQ+MC5L/d0fEbQ2jQB1eNE/oayWsIgOBEXhEC/Fg=",
"ref": "refs/heads/main",
- "rev": "311d82d0f73e60e537f7c2f2f535586945ce0e06",
- "revCount": 681,
+ "rev": "422a865a4f9359e11c10202035ffc3bf119e4bb0",
+ "revCount": 702,
"type": "git",
"url": "git://git.sisudoc.org/software/sisudoc-spine"
},
diff --git a/flake.nix b/flake.nix
index a927b24..ab38273 100644
--- a/flake.nix
+++ b/flake.nix
@@ -81,8 +81,6 @@
libxml2
html-tidy
xmlstarlet
- epubcheck
- ebook_tools
libxml2
html-tidy
xmlstarlet
@@ -159,6 +157,46 @@
];
inherit shellHook;
};
+ dsh-build-spine-generate-samples-env-defaults = mkShell {
+ name = "spine-0.18.0 dev shell test build spine and generate samples env defaults";
+ inherit shell;
+ inherit devEnv;
+ packages = [
+ nix
+ sqlite
+ #chromium
+ #calibre #(suite includes: ebook-viewer)
+ ];
+ shellHook = ''
+ export DFLAGS="-O2 -boundscheck=on"
+ ## set local values in .envrc-local (or here if you must)
+ nix build ".#spine-overlay-ldc" --print-build-logs
+ #$SpineBIN -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=$SpineOUT $SpinePOD/*
+ $SpineBIN --very-verbose --sqlite-db-recreate --sqlite-db-filename=$SpineSQLdb --sqlite-db-path=./_tmp-db
+ $SpineBIN --very-verbose --source --pod --epub --html --html-link-curate --html-link-markup --sqlite-update --sqlite-db-filename=$SpineSQLdb --sqlite-db-path=./_tmp-db --curate --output=$SpineOUT $SpinePOD/*
+ echo "./result/bin/spine -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=$SpineOUT $SpinePOD/*"
+ '';
+ };
+ dsh-build-spine-generate-samples-test = mkShell {
+ name = "spine-0.18.0 dev shell test build spine and generate samples test";
+ inherit shell;
+ inherit devEnv;
+ packages = [
+ nix
+ sqlite
+ #chromium
+ #calibre #(suite includes: ebook-viewer)
+ ];
+ shellHook = ''
+ export DFLAGS="-O2 -boundscheck=on"
+ ## set local values in .envrc-local (or here if you must)
+ nix build ".#spine-overlay-ldc" --print-build-logs
+ #./result/bin/spine -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=./OUTPUT_TEST_sisudocSpine ./markup/pod-samples/pod/*
+ ./result/bin/spine --very-verbose --sqlite-db-recreate --sqlite-db-filename=spine.search.db --sqlite-db-path=./_tmp-db
+ ./result/bin/spine --very-verbose --source --pod --epub --html --html-link-curate --html-link-markup --sqlite-update --sqlite-db-filename=spine.search.db --sqlite-db-path=./_tmp-db --curate --output=./OUTPUT_TEST_sisudocSpine ./markup/pod-samples/pod/*
+ echo "./result/bin/spine -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=./OUTPUT_TEST_sisudocSpine ./markup/pod-samples/pod/*"
+ '';
+ };
default = import ./shell.nix {inherit pkgs;};
});
};
diff --git a/org/config_env.org b/org/config_env.org
index 4f21142..d1c0f3c 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -96,6 +96,9 @@ echo '
• nix develop using package overlays: (dmd-<<dmd_version>>, ldc-<<ldc_version>>, dub-<<dub_version>>, dtools-<<dtools_version>>)
❯❯ nix develop ".#dsh-overlay-dmd" --print-build-logs -c zsh
❯❯ nix develop ".#dsh-overlay-ldc" --print-build-logs -c zsh
+ • for more nix develop build spine & generate markup
+ ❯❯ nix develop ".#dsh-build-spine-generate-samples-env-defaults" --print-build-logs -c zsh
+ ❯❯ nix develop ".#dsh-build-spine-generate-samples-test" --print-build-logs -c zsh
• for more nix develop specialized shells
❯❯ nix flake show
diff --git a/org/config_nix.org b/org/config_nix.org
index a6d4360..47074e4 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -106,8 +106,6 @@
libxml2
html-tidy
xmlstarlet
- epubcheck
- ebook_tools
libxml2
html-tidy
xmlstarlet
@@ -184,6 +182,46 @@
];
inherit shellHook;
};
+ dsh-build-spine-generate-samples-env-defaults = mkShell {
+ name = "spine-<<spine_version>> dev shell test build spine and generate samples env defaults";
+ inherit shell;
+ inherit devEnv;
+ packages = [
+ nix
+ sqlite
+ #chromium
+ #calibre #(suite includes: ebook-viewer)
+ ];
+ shellHook = ''
+ export DFLAGS="-O2 -boundscheck=on"
+ ## set local values in .envrc-local (or here if you must)
+ nix build ".#spine-overlay-ldc" --print-build-logs
+ #$SpineBIN -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=$SpineOUT $SpinePOD/*
+ $SpineBIN --very-verbose --sqlite-db-recreate --sqlite-db-filename=$SpineSQLdb --sqlite-db-path=./_tmp-db
+ $SpineBIN --very-verbose --source --pod --epub --html --html-link-curate --html-link-markup --sqlite-update --sqlite-db-filename=$SpineSQLdb --sqlite-db-path=./_tmp-db --curate --output=$SpineOUT $SpinePOD/*
+ echo "./result/bin/spine -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=$SpineOUT $SpinePOD/*"
+ '';
+ };
+ dsh-build-spine-generate-samples-test = mkShell {
+ name = "spine-<<spine_version>> dev shell test build spine and generate samples test";
+ inherit shell;
+ inherit devEnv;
+ packages = [
+ nix
+ sqlite
+ #chromium
+ #calibre #(suite includes: ebook-viewer)
+ ];
+ shellHook = ''
+ export DFLAGS="-O2 -boundscheck=on"
+ ## set local values in .envrc-local (or here if you must)
+ nix build ".#spine-overlay-ldc" --print-build-logs
+ #./result/bin/spine -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=./OUTPUT_TEST_sisudocSpine ./markup/pod-samples/pod/*
+ ./result/bin/spine --very-verbose --sqlite-db-recreate --sqlite-db-filename=spine.search.db --sqlite-db-path=./_tmp-db
+ ./result/bin/spine --very-verbose --source --pod --epub --html --html-link-curate --html-link-markup --sqlite-update --sqlite-db-filename=spine.search.db --sqlite-db-path=./_tmp-db --curate --output=./OUTPUT_TEST_sisudocSpine ./markup/pod-samples/pod/*
+ echo "./result/bin/spine -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=./OUTPUT_TEST_sisudocSpine ./markup/pod-samples/pod/*"
+ '';
+ };
default = import ./shell.nix {inherit pkgs;};
});
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-01 19:22:08 +0000