spine sync, 0.18.0HEADmain

5 files changed, 41 insertions, 25 deletions

diff --git a/derivation.nix b/derivation.nix
index b82c426..9bbb7f4 100644
--- a/derivation.nix
+++ b/derivation.nix
@@ -92,7 +92,7 @@ with (
 );
   mkDubDerivation rec {
     pname = "spine";
-    version = "0.17.0";
+    version = "0.18.0";
     #zipfile = "spine-0.12.0-tag-0.11.2.r107.gf89a107.tar.gz";
     src = fetchTarball {
       url = "file:///home/ralph/grotto/repo/git.repo/projects/doc-reform/code/software/tarball/spine-0.12.0-tag-0.11.2.r107.gf89a107.tar.gz";
diff --git a/flake.lock b/flake.lock
index 1cdb497..eb21f6a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739138025,
-        "narHash": "sha256-M4ilIfGxzbBZuURokv24aqJTbdjPA9K+DtKUzrJaES4=",
+        "lastModified": 1741310760,
+        "narHash": "sha256-aizILFrPgq/W53Jw8i0a1h1GZAAKtlYOrG/A5r46gVM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b2243f41e860ac85c0b446eadc6930359b294e79",
+        "rev": "de0fe301211c267807afd11b12613f5511ff7433",
         "type": "github"
       },
       "original": {
@@ -30,11 +30,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734289685,
-        "narHash": "sha256-nfnmDNn0OWIAPKAi7Lo9bCk6AhS7knUOp68AYwLhVAM=",
+        "lastModified": 1741379209,
+        "narHash": "sha256-5BuRCnrAOzYnKoQ5n16DO4lXLG5/19TEZekS/oepF1Q=",
         "ref": "refs/heads/main",
-        "rev": "664c8a2c6450aca19b9c84c1a5c4b42d5d5a1f9f",
-        "revCount": 16,
+        "rev": "a6315ffe8a46382e79640dd9127bff447dc13768",
+        "revCount": 17,
         "type": "git",
         "url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake"
       },
@@ -50,11 +50,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739372608,
-        "narHash": "sha256-49nV+nXedQqmbL8QKK/XPgSuCQtT5zQKiDeLBCVqINI=",
+        "lastModified": 1741380437,
+        "narHash": "sha256-lzpjtQuVQqR2VynHzRsAktsESKolgCwyCssirLfM1pE=",
         "ref": "refs/heads/main",
-        "rev": "93b50184f9cb0c682197d6fbe31c68bff3a5cd05",
-        "revCount": 667,
+        "rev": "cdb96df1a54c13cf55e0c073455107053fdc9a45",
+        "revCount": 675,
         "type": "git",
         "url": "git://git.sisudoc.org/software/sisudoc-spine"
       },
diff --git a/flake.nix b/flake.nix
index c26bdef..0679df9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,12 +1,16 @@
 {
   description = "spine (sisu like parser & document generator) made available to process markup samples";
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-  #inputs.flake-utils.url = "github:numtide/flake-utils";
   inputs.spine = {
     url = "git://git.sisudoc.org/software/sisudoc-spine";
     inputs.nixpkgs.follows = "nixpkgs";
     flake = true;
   };
+  #inputs.spine-search-cgi = { # issue, to make usable needs local configuration on build, so, not practical to implement like so
+  #  url = "git://git.sisudoc.org/software/sisudoc-spine-search-cgi";
+  #  inputs.nixpkgs.follows = "nixpkgs";
+  #  flake = true;
+  #};
   inputs.sisudoc-d-overlay = {
     url = "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake";
     inputs.nixpkgs.follows = "nixpkgs";
@@ -15,12 +19,12 @@
   outputs = {
     self,
     nixpkgs,
-    #flake-utils,
     spine,
+    #spine-search-cgi,
     sisudoc-d-overlay,
     ...
   }@inputs: let
-    version = "0.17.0";
+    version = "0.18.0";
     shell = ./shell.nix;
     devEnv = ./nixDevEnv.sh;
     supportedSystems = ["x86_64-linux"]; # [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
@@ -35,6 +39,10 @@
       spine-nixpkgs-ldc = spine.packages.${system}.spine-nixpkgs-ldc;
       spine-overlay-dmd = spine.packages.${system}.spine-overlay-dmd;
       spine-overlay-ldc = spine.packages.${system}.spine-overlay-ldc;
+      #spine-search-cgi-nixpkgs-dmd = spine-search-cgi.packages.${system}.spine-search-nixpkgs-dmd; # issue, to make usable needs local configuration on build
+      #spine-search-cgi-nixpkgs-ldc = spine-search-cgi.packages.${system}.spine-search-nixpkgs-ldc; # issue, to make usable needs local configuration on build
+      #spine-search-cgi-overlay-dmd = spine-search-cgi.packages.${system}.spine-search-overlay-dmd; # issue, to make usable needs local configuration on build
+      #spine-search-cgi-overlay-ldc = spine-search-cgi.packages.${system}.spine-search-overlay-ldc; # issue, to make usable needs local configuration on build
       #vendorSha256 = "sha256-0Q00000000000000000000000000000000000000000=";
     });
     apps = forAllSystems (system: {
@@ -71,7 +79,7 @@
         dsh-overlay-ldc = sisudoc-d-overlay.devShells.${system}.dsh-overlay-ldc-dub;
         dsh-nixpkgs-ldc = sisudoc-d-overlay.devShells.${system}.dsh-nixpkgs-ldc-dub;
         dsh-epub = mkShell {
-          name = "spine-0.17.0 dev shell for epub output";
+          name = "spine-0.18.0 dev shell for epub output";
           inherit shell;
           inherit devEnv;
           packages = [
@@ -99,7 +107,7 @@
           inherit shellHook;
         };
         dsh-html = mkShell {
-          name = "spine-0.17.0 dev shell for html output";
+          name = "spine-0.18.0 dev shell for html output";
           inherit shell;
           inherit devEnv;
           packages = [
@@ -119,7 +127,7 @@
           inherit shellHook;
         };
         dsh-latex-pdf = mkShell {
-          name = "spine-0.17.0 dev shell for latex & pdf output";
+          name = "spine-0.18.0 dev shell for latex & pdf output";
           inherit shell;
           inherit devEnv;
           packages = [
@@ -135,7 +143,7 @@
           inherit shellHook;
         };
         dsh-sqlite = mkShell {
-          name = "spine-0.17.0 dev shell for sqlite3 output";
+          name = "spine-0.18.0 dev shell for sqlite3 output";
           inherit shell;
           inherit devEnv;
           packages = [
@@ -148,7 +156,7 @@
           inherit shellHook;
         };
         dsh-i18n = mkShell {
-          name = "spine-0.17.0 dev shell for internationalization, po4a";
+          name = "spine-0.18.0 dev shell for internationalization, po4a";
           inherit shell;
           inherit devEnv;
           packages = [
diff --git a/org/config_nix.org b/org/config_nix.org
index 651d310..d830202 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -26,12 +26,16 @@
 {
   description = "spine (sisu like parser & document generator) made available to process markup samples";
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-  #inputs.flake-utils.url = "github:numtide/flake-utils";
   inputs.spine = {
     url = "<<sisudoc_spine_nix_src>>";
     inputs.nixpkgs.follows = "nixpkgs";
     flake = true;
   };
+  #inputs.spine-search-cgi = { # issue, to make usable needs local configuration on build, so, not practical to implement like so
+  #  url = "git://git.sisudoc.org/software/sisudoc-spine-search-cgi";
+  #  inputs.nixpkgs.follows = "nixpkgs";
+  #  flake = true;
+  #};
   inputs.sisudoc-d-overlay = {
     url = "<<sisudoc_dlang_nix_overlay_src>>";
     inputs.nixpkgs.follows = "nixpkgs";
@@ -40,8 +44,8 @@
   outputs = {
     self,
     nixpkgs,
-    #flake-utils,
     spine,
+    #spine-search-cgi,
     sisudoc-d-overlay,
     ...
   }@inputs: let
@@ -60,6 +64,10 @@
       spine-nixpkgs-ldc = spine.packages.${system}.spine-nixpkgs-ldc;
       spine-overlay-dmd = spine.packages.${system}.spine-overlay-dmd;
       spine-overlay-ldc = spine.packages.${system}.spine-overlay-ldc;
+      #spine-search-cgi-nixpkgs-dmd = spine-search-cgi.packages.${system}.spine-search-nixpkgs-dmd; # issue, to make usable needs local configuration on build
+      #spine-search-cgi-nixpkgs-ldc = spine-search-cgi.packages.${system}.spine-search-nixpkgs-ldc; # issue, to make usable needs local configuration on build
+      #spine-search-cgi-overlay-dmd = spine-search-cgi.packages.${system}.spine-search-overlay-dmd; # issue, to make usable needs local configuration on build
+      #spine-search-cgi-overlay-ldc = spine-search-cgi.packages.${system}.spine-search-overlay-ldc; # issue, to make usable needs local configuration on build
       #vendorSha256 = "sha256-0Q00000000000000000000000000000000000000000=";
     });
     apps = forAllSystems (system: {
diff --git a/org/sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org b/org/sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org
index 28ead23..b536386 100644
--- a/org/sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org
+++ b/org/sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org
@@ -4,7 +4,7 @@
 #+FILETAGS:    :spine:abstraction:
 #+AUTHOR:      Ralph Amissah
 #+EMAIL:       [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
-#+COPYRIGHT:   Copyright (C) 2015 - 2024 Ralph Amissah
+#+COPYRIGHT:   Copyright (C) 2015 - 2025 Ralph Amissah
 #+LANGUAGE:    en
 #+STARTUP:     content hideblocks hidestars noindent entitiespretty
 #+PROPERTY:    header-args  :noweb yes
@@ -29,7 +29,7 @@
   - Author: Ralph Amissah
     [ralph.amissah@gmail.com]
 
-  - Copyright: (C) 2015 - 2024 Ralph Amissah, All Rights Reserved.
+  - Copyright: (C) 2015 - 2025 Ralph Amissah, All Rights Reserved.
 
   - License: AGPL 3 or later:
 
@@ -98,7 +98,7 @@
 
 #+NAME: spine_project_version_part_minor
 #+BEGIN_SRC org
-17
+18
 #+END_SRC
 
 *** patch