nix package/config updates, ruby on nix currentHEADupstream

- current is at ruby 3.3.6
- next is at ruby 3.4.1

1 files changed, 67 insertions, 101 deletions

diff --git a/org/config_env.org b/org/config_env.org
index 1609a97d..671b0a1c 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -4,7 +4,7 @@
 #+FILETAGS:    :sisu:build:tools:
 #+AUTHOR:      Ralph Amissah
 #+EMAIL:       [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
-#+COPYRIGHT:   Copyright (C) 2015 - 2023 Ralph Amissah
+#+COPYRIGHT:   Copyright (C) 2015 - 2025 Ralph Amissah
 #+LANGUAGE:    en
 #+STARTUP:     content hideblocks hidestars noindent entitiespretty
 #+PROPERTY:    header-args  :exports code
@@ -23,21 +23,22 @@
 ** nixDevEnv envrc :envrc:
 
 #+HEADER: :tangle ../nixDevEnv.sh
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
 if [ -f .envrc ]; then
   source_env_if_exists .envrc || source .envrc
 fi
 #+END_SRC
 
-** envrc :envrc:
-*** .envrc
+* envrc :envrc:
 
 - https://github.com/nix-community/nix-direnv
   - source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "sha256-0000000000000000000000000000000000000000000="
 
+** .envrc
+
 #+NAME: envrc
 #+HEADER: :tangle ../.envrc
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
 if [ -f .envrc-git-init ]; then
   source_env_if_exists .envrc-git-init || source .envrc-git-init
 fi
@@ -49,7 +50,7 @@ if [ -f .envrc-nix ]; then
 fi
 #+END_SRC
 
-*** .envrc-nix
+** .envrc-nix
 
 - https://github.com/nix-community/nix-direnv
   - source_url
@@ -57,7 +58,7 @@ fi
     - ${NixDirEnvVersion}
 
 #+HEADER: :tangle ../.envrc-nix
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
 NIX_ENFORCE_PURITY=1
 # - https://github.com/nix-community/nix-direnv
 NixDirEnvVersion="<<direnv-version>>"
@@ -75,58 +76,82 @@ watch_file .envrc-nix
 PATH_add result/bin
 use flake .
 echo "
-- consider running:
+• consider running:
   ❯❯ nix flake show
   ❯❯ nix flake update && nix flake check && nix flake show
 
-- for a dev shell:
+• for a dev shell (development environment):
+
   ❯❯ nix develop
   ❯❯ nix develop ".#" --print-build-logs -c zsh
   ❯❯ nix develop ".#dsh-latex-pdf" --print-build-logs -c zsh
 
-- to build project:
+• to build project:
+
   ❯❯ nix build ".#" --print-build-logs
   - (see nix other/additional build options):
     ❯❯ nix flake show
 "
 #+END_SRC
 
-*** 3.0.0
+*** 3.0.6
 
 #+NAME: direnv-version
-#+BEGIN_SRC sh
-3.0.0
+#+BEGIN_SRC shell
+3.0.6
 #+END_SRC
 
 #+NAME: direnv-sha
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
+sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM=
+#+END_SRC
+
+*** 3.0.4
+
+#+BEGIN_SRC shell
+3.0.4
+#+END_SRC
+
+#+BEGIN_SRC shell
+sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4=
+#+END_SRC
+
+*** 3.0.0
+
+#+BEGIN_SRC shell
+3.0.0
+#+END_SRC
+
+#+BEGIN_SRC shell
 sha256-21TMnI2xWX7HkSTjFFri2UaohXVj854mgvWapWrxRXg=
 #+END_SRC
 
 *** 2.4.0
 
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
 2.4.0
 #+END_SRC
 
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
 sha256-XQzUAvL6pysIJnRJyR7uVpmUSZfc7LSgWQwq/4mBr1U=
 #+END_SRC
 
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
 2.3.0
 #+END_SRC
 
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
 sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8=
 #+END_SRC
 
+*** empty
+
 #+NAME: direnv-sha_
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
 sha256-0000000000000000000000000000000000000000000=
 #+END_SRC
 
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
 - https://github.com/nix-community/nix-direnv
 NixDirEnvSHA="sha256-0000000000000000000000000000000000000000000="
 direnv fetchurl https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc
@@ -136,7 +161,7 @@ direnv fetchurl https://raw.githubusercontent.com/nix-community/nix-direnv/${Nix
 
 #+HEADER: :tangle ../.envrc-git-init
 #+HEADER: :noweb yes
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
 if [[ ! -d ./.git ]]; then
   git init
   git add .
@@ -149,94 +174,37 @@ fi
 
 #+HEADER: :tangle ../.envrc-local_
 #+HEADER: :noweb yes
-#+BEGIN_SRC sh
-export DFLAGS="-O2 -inline -boundscheck=on -color=on"
-export SpineVER=$(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g')
-export SpineBIN=result/bin
-export SpinePROJ=~/grotto/repo/git.repo/projects/doc-reform/code/software/spine
-export SpineDOC=~/grotto/repo/git.repo/projects/project-spine/doc-reform-markup/spine-markup-samples
-export SpinePOD=${SpineDOC}/markup/pod
-export SpineOUT=/srv/www/spine
-export SpineOUTversioned=/srv/www/spine/${SpineVER}
-export SpineSearchActionLocal='http://localhost/spine_search'
-export SpineSearchActionRemote='https://sisudoc.org/spine_search'
-export SpineCGIform='spine_search'
-export SpineSQLdb='spine.search.db'
-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
-'
+#+BEGIN_SRC shell
+export SisuVER=$(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g')
+PATH_add result/bin
+#export sisuBIN=bin
+#export sisuBIN=result/bin
+export sisuSRC=~/grotto/repo/git.repo/projects/project-sisu/sisu
+export sisuPROJ=~/grotto/repo/git.repo/projects/doc-reform/code/software/sisu
+export sisuDOC=~/grotto/repo/git.repo/projects/project-sisu/susu-markup/sisu-markup-samples/data/samples/current
+export sisuOUT=/srv/www/sisu
+#export sisuOUT=/var/www
+#export sisuOUTver=/tmp/sisu/$sisuVER/www
+export sisuCGIbin=/var/www/cgi/cgi-bin
+export sisuSearchActionLocal='http://localhost/sisu_search'
+export sisuSearchActionRemote='https://sisudoc.org/sisu_search'
+export sisuCGIform='sisu_search'
+export sisuSQLdb='spine.search.db'
+export sisuDBpath=/var/www/sqlite
+#export sisuDBpath=/srv/www/sisu/sqlite
+export RUBYLIB+=`pwd`/lib
 #+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
+export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos
 
 *** .envrc-local CHECK MODIFY
 
 - bespoke modify appropriately and generate if needed
 
-#+HEADER: :tangle ../.envrc-local_
 #+HEADER: :noweb yes
-#+BEGIN_SRC sh
-export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos
-#export NIX_PATH=nixpkgs=/nixpkgs-ra/nixpkgs
-## reload when these files change
-use flake
-watch_file flake.nix
-#eval "$(nix print-dev-env)"
-export sisuVER=$(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g')
-#export sisuBIN=bin
-export sisuSRC=~/grotto/repo/git.repo/projects/project-sisu/sisu
-export sisuDOC=~/grotto/repo/git.repo/projects/project-sisu/susu-markup/sisu-markup-samples/data/samples/current
-export sisuOUT=/var/www
-export sisuOUTver=/tmp/sisu/$sisuVER/www
-export RUBYLIB+=`pwd`/lib
-#+END_SRC
-
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
  export Date=`date "+%Y%m%d"`
  export sisuver=$(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g')
- ### set local values in .envrc-local (or modify here if you must)
- # export sisuPROJ=~/grotto/repo/git.repo/projects/doc-reform/code/software/sisu
- # export sisuDOC=~/grotto/repo/git.repo/projects/project-sisu/doc-reform-markup/sisu-markup-samples
- # export sisuSRC=~/grotto/repo/git.repo/projects/project-sisu/sisu
- # export sisuDOC=~/grotto/repo/git.repo/projects/project-sisu/susu-markup/sisu-markup-samples/data/samples/current
- # export sisuOUT=/srv/www/sisu
- # export sisuOUTver=/srv/www/sisu/$sisuVER/www
- # export sisu=/srv/www/sisu
- # export sisu=/var/www/sqlite
- # export sisu=/srv/www/sisu/sqlite
- export sisu=$sisuPROJ/src
- export sisu=$sisuPROJ/result/lib
- export sisu=$sisuDOC/markup/pod
- export sisu=$sisuOUT/$sisuVER
- export sisu='http://localhost/sisu_search'
- # export sisuSearchActionRemote='https://sisudoc.org/sisu_search'
- export sisuCGIform='sisu_search'
- export sisuSQLdb='sisusearch.db'
  export PROG_VER_GIT="`git describe --long --tags | sed -e 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g'`"
  #export PROG_VER_DECLARED="`cat ./views/version.txt | grep --color=never "enum" | sed 's/.\+(\([0-9]\+\),[ \t]\+\([0-9]\+\),[ \t]\+\([0-9]\+\)[ \t]*).\+/\1.\2.\3/g'`"
  export sisuNixHelp="cat ./.env/nix-commands"
@@ -249,5 +217,3 @@ export RUBYLIB+=`pwd`/lib
  export sisuSqlite="sisu --very-verbose --sqlite-discrete --sqlite-db-path=\"$sisuDBpath\" --sqlite-db-filename=\"sisu.search.db\" --output=\"\$sisuOUT\" $sisuPOD/*"
  #export sisuSqlite="sisu --very-verbose --sqlite-update --sqlite-db-path=\"$sisuDBpath\" --sqlite-db-filename=\"sisu.search.db\" --output=\"\$sisuOUT\" $sisuPOD/*"
 #+END_SRC
-
-