flake devshells renames

10 files changed, 65 insertions, 41 deletions

diff --git a/.envrc-local_ b/.envrc-local_
index 075787d..a2671b4 100644
--- a/.envrc-local_
+++ b/.envrc-local_
@@ -3,5 +3,9 @@ export SpineVER=$(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1
 export SpineSearchBIN=result/cgi-bin
 # ❯❯ cgi search form name:
 export SpineCGIform='spine_search'
+# ❯❯ search form db name:
+export SpineSQLdb='spine.search.db'
 # ❯❯ configuration cgi search form path:
 export SpineCGIbin=/var/www/cgi/cgi-bin
+# ❯❯ configuration db path:
+export SpineDBpath=/var/www/sqlite
diff --git a/.envrc-nix b/.envrc-nix
index 016cc18..a463765 100644
--- a/.envrc-nix
+++ b/.envrc-nix
@@ -25,11 +25,11 @@ echo '
   • nix develop
     ❯❯ nix develop ".#" --print-build-logs -c zsh
   • nix develop using nixpkgs
-    ❯❯ nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
-    ❯❯ nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
+    ❯❯ nix develop ".#dsh-nixpkgs-dmd" --print-build-logs -c zsh
+    ❯❯ nix develop ".#dsh-nixpkgs-ldc" --print-build-logs -c zsh
   • nix develop using package overlays: (dmd-2.111.0, ldc-1.42.0, dub-1.40.0)
-    ❯❯ nix develop ".#dsh-overlay-dmd-dub" --print-build-logs -c zsh
-    ❯❯ nix develop ".#dsh-overlay-ldc-dub" --print-build-logs -c zsh
+    ❯❯ nix develop ".#dsh-overlay-dmd" --print-build-logs -c zsh
+    ❯❯ nix develop ".#dsh-overlay-ldc" --print-build-logs -c zsh
   ❯❯ nix flake show
 
 • to build project:
@@ -47,14 +47,15 @@ echo '
 
 • to build using dub on nix (get dependencies by setting your development environment):
 
-  ❯❯ nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
+  ❯❯ nix develop ".#dsh-nixpkgs-dmd" --print-build-logs -c zsh
   ❯❯ dub run --compiler=dmd --config=dmd --combined --skip-registry=all
 
-  ❯❯ nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
+  ❯❯ nix develop ".#dsh-nixpkgs-ldc" --print-build-logs -c zsh
   ❯❯ dub run --compiler=ldmd2 --config=ldmd2 --combined --skip-registry=all
 
 • for develop environment & build options
-  ❯❯ nix flake show
+
   ❯❯ nix flake update && nix flake check && nix flake show
+  ❯❯ nix flake show
 
 '
diff --git a/README b/README
index 21a51ed..0cc2f93 100644
--- a/README
+++ b/README
@@ -153,7 +153,7 @@ mkdir -p ~/.config/nix && echo "experimental-features = flakes nix-command" >> ~
 
 - to use the D compiler ldc2:
   # on nix (get dependencies by setting your development environment):
-  nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
+  nix develop ".#dsh-nixpkgs-ldc" --print-build-logs -c zsh
 
   # assuming you have ldc2 & dub installed on your system:
   dub run --compiler=ldmd2 --config=ldmd2 --combined --skip-registry=all
@@ -162,7 +162,7 @@ mkdir -p ~/.config/nix && echo "experimental-features = flakes nix-command" >> ~
 
 - to use the D compiler dmd:
   # on nix (get dependencies by setting your development environment):
-  nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
+  nix develop ".#dsh-nixpkgs-dmd" --print-build-logs -c zsh
 
   # assuming you have dmd & dub installed on your system:
   dub run --compiler=dmd --config=dmd --combined --skip-registry=all
diff --git a/README.md b/README.md
index 6416247..e2b1301 100644
--- a/README.md
+++ b/README.md
@@ -136,7 +136,7 @@ mkdir -p ~/.config/nix && echo "experimental-features = flakes nix-command" >> ~
 
 - to use the D compiler ldc2:
   # on nix (get dependencies by setting your development environment):
-  nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
+  nix develop ".#dsh-nixpkgs-ldc" --print-build-logs -c zsh
 
   # assuming you have ldc2 & dub installed on your system:
   dub run --compiler=ldmd2 --config=ldmd2 --combined --skip-registry=all
@@ -145,7 +145,7 @@ mkdir -p ~/.config/nix && echo "experimental-features = flakes nix-command" >> ~
 
 - to use the D compiler dmd:
   # on nix (get dependencies by setting your development environment):
-  nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
+  nix develop ".#dsh-nixpkgs-dmd" --print-build-logs -c zsh
 
   # assuming you have dmd & dub installed on your system:
   dub run --compiler=dmd --config=dmd --combined --skip-registry=all
diff --git a/flake.lock b/flake.lock
index 6e27007..dd29c03 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1775793324,
-        "narHash": "sha256-omax7atcZbol+6HJ2RLpP+ZCFcPa5bZ65Hn71RufeWQ=",
+        "lastModified": 1777395829,
+        "narHash": "sha256-HposVFZcsBCevgqLR73w/BpSe8J1lMgw5kASnnxO3A4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9d29d5f667d7467f98efc31881e824fa586c927e",
+        "rev": "e75f25705c2934955ee5075e62530d74aca973c6",
         "type": "github"
       },
       "original": {
@@ -29,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775708141,
-        "narHash": "sha256-MjjhikIgXjNcsEzyZmjKXHk+DaEk5ic2h15DC6w4W50=",
+        "lastModified": 1775877366,
+        "narHash": "sha256-W33lhJ9+/KEl1xoGKw/BYHIZpuqjLpDHjlue2CVQrcM=",
         "ref": "refs/heads/main",
-        "rev": "bcb38c5014f2870ba7d6412b0b39c757ad4ae725",
-        "revCount": 29,
+        "rev": "40ccbcf2cf53b1fd1476e7ced6b70c29d491d464",
+        "revCount": 30,
         "type": "git",
         "url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake"
       },
diff --git a/nix-overlays/dtools/disabled-tests.diff b/nix-overlays/dtools/disabled-tests.diff
index a22825a..79eb1cb 100644
--- a/nix-overlays/dtools/disabled-tests.diff
+++ b/nix-overlays/dtools/disabled-tests.diff
@@ -3,7 +3,7 @@
 @@ -616,7 +616,7 @@ void runTests(string rdmdApp, string compiler, string model)
          enforce(res.status == 1, res.output);
      }
- 
+
 -    version (Posix)
 +    version (none)
      {
diff --git a/nix-overlays/dtools/fix-ldc-arm64.diff b/nix-overlays/dtools/fix-ldc-arm64.diff
index 66eaa22..1c650a6 100644
--- a/nix-overlays/dtools/fix-ldc-arm64.diff
+++ b/nix-overlays/dtools/fix-ldc-arm64.diff
@@ -82,21 +82,21 @@ Adapted from https://github.com/dlang/tools/commit/6c6a042d1b08e3ec1790bd07a7f69
 @@ -9,9 +9,8 @@ DUB=dub
  WITH_DOC = no
  DOC = ../dlang.org
- 
+
 -# Load operating system $(OS) (e.g. linux, osx, ...) and $(MODEL) (e.g. 32, 64) detection Makefile from dmd
 -$(shell [ ! -d $(DMD_DIR) ] && git clone --depth=1 https://github.com/dlang/dmd $(DMD_DIR))
 -include $(DMD_DIR)/compiler/src/osmodel.mak
 +# Load operating system $(OS) (e.g. linux, osx, ...) and $(MODEL) (e.g. 32, 64) detection Makefile
 +include osmodel.mak
- 
+
  ifeq (windows,$(OS))
      DOTEXE:=.exe
 @@ -30,7 +29,7 @@ DFLAGS = $(MODEL_FLAG) $(if $(findstring windows,$(OS)),,-fPIC) -preview=dip1000
  DFLAGS += $(WARNINGS)
- 
+
  # Default DUB flags (DUB uses a different architecture format)
 -DUBFLAGS = --arch=$(subst 32,x86,$(subst 64,x86_64,$(MODEL)))
 +DUBFLAGS = --arch=$(ARCH)
- 
+
  TOOLS = \
      $(ROOT)/catdoc$(DOTEXE) \
diff --git a/org/config_env.org b/org/config_env.org
index 332f849..7120e5b 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -86,11 +86,11 @@ echo '
   • nix develop
     ❯❯ nix develop ".#" --print-build-logs -c zsh
   • nix develop using nixpkgs
-    ❯❯ nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
-    ❯❯ nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
+    ❯❯ nix develop ".#dsh-nixpkgs-dmd" --print-build-logs -c zsh
+    ❯❯ nix develop ".#dsh-nixpkgs-ldc" --print-build-logs -c zsh
   • nix develop using package overlays: (dmd-<<dmd_version>>, ldc-<<ldc_version>>, dub-<<dub_version>>)
-    ❯❯ nix develop ".#dsh-overlay-dmd-dub" --print-build-logs -c zsh
-    ❯❯ nix develop ".#dsh-overlay-ldc-dub" --print-build-logs -c zsh
+    ❯❯ nix develop ".#dsh-overlay-dmd" --print-build-logs -c zsh
+    ❯❯ nix develop ".#dsh-overlay-ldc" --print-build-logs -c zsh
   ❯❯ nix flake show
 
 • to build project:
@@ -108,15 +108,16 @@ echo '
 
 • to build using dub on nix (get dependencies by setting your development environment):
 
-  ❯❯ nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
+  ❯❯ nix develop ".#dsh-nixpkgs-dmd" --print-build-logs -c zsh
   ❯❯ dub run --compiler=dmd --config=dmd --combined --skip-registry=all
 
-  ❯❯ nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
+  ❯❯ nix develop ".#dsh-nixpkgs-ldc" --print-build-logs -c zsh
   ❯❯ dub run --compiler=ldmd2 --config=ldmd2 --combined --skip-registry=all
 
 • for develop environment & build options
-  ❯❯ nix flake show
+
   ❯❯ nix flake update && nix flake check && nix flake show
+  ❯❯ nix flake show
 
 '
 #+END_SRC
@@ -147,8 +148,12 @@ export SpineVER=$(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1
 export SpineSearchBIN=result/cgi-bin
 # ❯❯ cgi search form name:
 export SpineCGIform='spine_search'
+# ❯❯ search form db name:
+export SpineSQLdb='spine.search.db'
 # ❯❯ configuration cgi search form path:
 export SpineCGIbin=/var/www/cgi/cgi-bin
+# ❯❯ configuration db path:
+export SpineDBpath=/var/www/sqlite
 #+END_SRC
 
 * org includes - versions GET
@@ -207,4 +212,18 @@ export SpineCGIbin=/var/www/cgi/cgi-bin
 <<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:spine_project_version()>>
 #+END_SRC
 
+#+NAME: year
+#+HEADER: :noweb yes
+#+BEGIN_SRC emacs-lisp
+<<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:year()>>
+#+END_SRC
+
+** document header including copyright & license
+
+#+NAME: doc_header_including_copyright_and_license
+#+HEADER: :noweb yes
+#+BEGIN_SRC emacs-lisp
+<<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:spine_doc_header_including_copyright_and_license()>>
+#+END_SRC
+
 * __END__
diff --git a/org/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org
index 6023565..dcf98b4 100644
--- a/org/nixpkgs_overlays_d_related.org
+++ b/org/nixpkgs_overlays_d_related.org
@@ -351,7 +351,7 @@ use flake .
           ];
           inherit shellHook;
         };
-        dsh-overlay-ldc-dub = mkShell {
+        dsh-overlay-ldc = mkShell {
           name = "overlay - ldc-<<ldc_version>> - dub-<<dub_version>> - dtools-<<dtools_version>>";
           inherit shell;
           inherit devEnv;
@@ -363,7 +363,7 @@ use flake .
           ];
           inherit shellHook;
         };
-        dsh-overlay-dmd-dub = mkShell {
+        dsh-overlay-dmd = mkShell {
           name = "overlay - dmd-<<dmd_version>> - dub-<<dub_version>> - dtools-<<dtools_version>>";
           inherit shell;
           inherit devEnv;
@@ -401,7 +401,7 @@ use flake .
         #  ];
         #  inherit shellHook;
         #};
-        dsh-nixpkgs-ldc-dub = mkShell {
+        dsh-nixpkgs-ldc = mkShell {
           name = "nixpkgs - ldc - dub";
           inherit shell;
           inherit devEnv;
@@ -413,7 +413,7 @@ use flake .
           ];
           inherit shellHook;
         };
-        dsh-nixpkgs-dmd-dub = mkShell {
+        dsh-nixpkgs-dmd = mkShell {
           name = "nixpkgs - ldc - dub";
           inherit shell;
           inherit devEnv;
@@ -1401,7 +1401,7 @@ stdenv.mkDerivation (finalAttrs: {
 @@ -616,7 +616,7 @@ void runTests(string rdmdApp, string compiler, string model)
          enforce(res.status == 1, res.output);
      }
- 
+
 -    version (Posix)
 +    version (none)
      {
@@ -1495,22 +1495,22 @@ Adapted from https://github.com/dlang/tools/commit/6c6a042d1b08e3ec1790bd07a7f69
 @@ -9,9 +9,8 @@ DUB=dub
  WITH_DOC = no
  DOC = ../dlang.org
- 
+
 -# Load operating system $(OS) (e.g. linux, osx, ...) and $(MODEL) (e.g. 32, 64) detection Makefile from dmd
 -$(shell [ ! -d $(DMD_DIR) ] && git clone --depth=1 https://github.com/dlang/dmd $(DMD_DIR))
 -include $(DMD_DIR)/compiler/src/osmodel.mak
 +# Load operating system $(OS) (e.g. linux, osx, ...) and $(MODEL) (e.g. 32, 64) detection Makefile
 +include osmodel.mak
- 
+
  ifeq (windows,$(OS))
      DOTEXE:=.exe
 @@ -30,7 +29,7 @@ DFLAGS = $(MODEL_FLAG) $(if $(findstring windows,$(OS)),,-fPIC) -preview=dip1000
  DFLAGS += $(WARNINGS)
- 
+
  # Default DUB flags (DUB uses a different architecture format)
 -DUBFLAGS = --arch=$(subst 32,x86,$(subst 64,x86_64,$(MODEL)))
 +DUBFLAGS = --arch=$(ARCH)
- 
+
  TOOLS = \
      $(ROOT)/catdoc$(DOTEXE) \
 #+END_SRC
diff --git a/org/spine_info.org b/org/spine_info.org
index d4c200e..49e5353 100644
--- a/org/spine_info.org
+++ b/org/spine_info.org
@@ -269,7 +269,7 @@ mkdir -p ~/.config/nix && echo "experimental-features = flakes nix-command" >> ~
 #+BEGIN_SRC text
 - to use the D compiler ldc2:
   # on nix (get dependencies by setting your development environment):
-  nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
+  nix develop ".#dsh-nixpkgs-ldc" --print-build-logs -c zsh
 
   # assuming you have ldc2 & dub installed on your system:
   dub run --compiler=ldmd2 --config=ldmd2 --combined --skip-registry=all
@@ -278,7 +278,7 @@ mkdir -p ~/.config/nix && echo "experimental-features = flakes nix-command" >> ~
 
 - to use the D compiler dmd:
   # on nix (get dependencies by setting your development environment):
-  nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
+  nix develop ".#dsh-nixpkgs-dmd" --print-build-logs -c zsh
 
   # assuming you have dmd & dub installed on your system:
   dub run --compiler=dmd --config=dmd --combined --skip-registry=all