From c894c36fe6cd0eba504d572854c89d07af31aaa2 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Fri, 31 Jan 2025 22:50:18 -0500
Subject: nix minor

---
 org/config_env.org                                 |   6 +-
 org/config_nix.org                                 | 154 +++++++++++++--------
 ..._doc_header_including_copyright_and_license.org |  83 +++++++++++
 3 files changed, 184 insertions(+), 59 deletions(-)
 create mode 100644 org/sisu_version_info_and_doc_header_including_copyright_and_license.org

(limited to 'org')

diff --git a/org/config_env.org b/org/config_env.org
index f481649..63ff47e 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -85,12 +85,12 @@ echo "
 • 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
+  ❯❯ nix develop '.#' --print-build-logs -c zsh
+  ❯❯ nix develop '.#dsh-latex-pdf' --print-build-logs -c zsh
 
 • to build project:
 
-  ❯❯ nix build ".#" --print-build-logs
+  ❯❯ nix build '.#' --print-build-logs
   - (see nix other/additional build options):
     ❯❯ nix flake show
 "
diff --git a/org/config_nix.org b/org/config_nix.org
index 4cc10b4..ddc0122 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -15,19 +15,8 @@
 #+PROPERTY:    header-args+ :mkdirp yes
 #+OPTIONS:     H:3 num:nil toc:t \n:t ::t |:t ^:nil -:t f:t *:t
 
-* nix :nix:
-
-#+NAME: nixpkgs_local
-#+BEGIN_SRC sh
-/srv/nix/nixpkgs
-#+END_SRC
-
 * sisu
-
-- default.nix
-- shell.nix
-
-** flake.nix
+** flake.nix :flake:
 
 #+HEADER: :tangle ../flake.nix
 #+HEADER: :noweb yes
@@ -44,12 +33,12 @@
     nixpkgs,
     sisu
   } @ inputs: let
-    version = "<<sisu_version_set>>";
+    version = "<<sisu_project_version>>";
     shell = ./shell.nix; # ./default.nix;
     devEnv = ./.envrc; # ./.envrc; # ./shell.nix; # ./default.nix;
     supportedSystems = [ "x86_64-linux" ]; # [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
     forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
-    nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; }); # nixpkgs instantiated for supported system types.
+    nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; }); # nixpkgs instantiated for supported system types
   in {
     packages = forAllSystems (system: let
       pkgs = nixpkgsFor.${system};
@@ -216,23 +205,6 @@
 }
 #+END_SRC
 
-*** flake :flake:
-**** flake parts
-***** ruby version
-
-#+NAME: ruby_current
-#+BEGIN_SRC shell
-ruby<<ruby_version>>
-rubyPackages<<ruby_version>>.rake
-rubyPackages<<ruby_version>>.sqlite3
-rubyPackages<<ruby_version>>.thor
-#+END_SRC
-
-#+NAME: ruby_version
-#+BEGIN_SRC shell
-_3_4
-#+END_SRC
-
 ** shell.nix :shell:
 *** tangle
 
@@ -248,10 +220,6 @@ in pkgs.mkShell {
     nix
     bundler
     bundix
-    #ruby
-    #rubyPackages.rake
-    #rubyPackages.sqlite3
-    #rubyPackages.thor
     <<ruby_current>>
     sqlite
     graphicsmagick
@@ -260,32 +228,97 @@ in pkgs.mkShell {
     zip
     #texliveFull # texliveTeTeX
   ];
+  shellHook = ''
+  '';
 }
 #+END_SRC
 
-**** shell parts (packages)
-***** packages nix related
+** shared parts
+*** nixpkgs url
 
-#+NAME: shell_packages_nix_related
+#+NAME: nixpkgs_url
 #+BEGIN_SRC nix
-### nix_related
-direnv
-nixVersions.unstable #nixFlakes
-nix-prefetch-git
-validatePkgConfig
-jq
-git
-ps
+github:NixOS/nixpkgs/nixpkgs-unstable
 #+END_SRC
 
-** variables
-*** sisu version SET VERSION :version:set:project:
+*** ruby versions
+**** ruby package selection
+***** ruby next
 
-#+NAME: sisu_version_set
-#+BEGIN_SRC sh
-0.7.3
+#+NAME: ruby_next
+#+BEGIN_SRC nix
+ruby<<ruby_version_next>>
+rubyPackages<<ruby_version_next>>.rake
+rubyPackages<<ruby_version_next>>.sqlite3
+rubyPackages<<ruby_version_next>>.thor
+#+END_SRC
+
+***** ruby current
+
+#+NAME: ruby_current
+#+BEGIN_SRC nix
+ruby<<ruby_version_current>>
+rubyPackages<<ruby_version_current>>.rake
+rubyPackages<<ruby_version_current>>.sqlite3
+rubyPackages<<ruby_version_current>>.thor
+#+END_SRC
+
+***** ruby legacy
+
+#+NAME: ruby_legacy
+#+BEGIN_SRC nix
+ruby<<ruby_version_legacy>>
+rubyPackages<<ruby_version_legacy>>.rake
+rubyPackages<<ruby_version_legacy>>.sqlite3
+rubyPackages<<ruby_version_legacy>>.thor
+#+END_SRC
+
+**** SET ruby nix package versions (current, next)
+***** SET ruby version next
+
+#+NAME: ruby_version_next
+#+BEGIN_SRC nix
+_3_4
+#+END_SRC
+
+***** SET ruby version current
+
+- default to current nix version, which is ruby 3.3 but not provided as a fixed lable/tag, so leave blank and will
+  follow nix current nix
+
+#+NAME: ruby_version_current
+#+BEGIN_SRC nix
+#+END_SRC
+
+***** SET ruby version legacy
+
+#+NAME: ruby_version_legacy
+#+BEGIN_SRC nix
+_3_2
 #+END_SRC
 
+**** ruby fixed versions
+***** ruby 3.4 - ruby_version_3_4
+
+#+NAME: ruby_version_3_4
+#+BEGIN_SRC nix
+ruby_3_4
+rubyPackages_3_4.rake
+rubyPackages_3_4.sqlite3
+rubyPackages_3_4.thor
+#+END_SRC
+
+***** ruby 3.2 - ruby_version_3_2
+
+#+NAME: ruby_version_3_2
+#+BEGIN_SRC nix
+ruby_3_2
+rubyPackages_3_2.rake
+rubyPackages_3_2.sqlite3
+rubyPackages_3_2.thor
+#+END_SRC
+
+*** packages.nix
 *** set names SET
 
 #+NAME: sisu_search_db
@@ -378,11 +411,6 @@ nixpkgs=<<nixpkgs_path_local>>
 /var/www/sqlite
 #+END_SRC
 
-#+NAME: nixpkgs_url
-#+BEGIN_SRC nix
-github:NixOS/nixpkgs/nixpkgs-unstable
-#+END_SRC
-
 #+BEGIN_SRC nix
 github:nixos/nixpkgs
 #+END_SRC
@@ -438,3 +466,17 @@ pkgs.mkShell {
   '';
 }
 #+END_SRC
+
+*** sisu version SET VERSION :version:set:project:
+
+#+NAME: sisu_project_version
+#+BEGIN_SRC emacs-lisp
+<<./sisu_version_info_and_doc_header_including_copyright_and_license.org:sisu_project_version()>>
+#+END_SRC
+
+* nix :nix:
+
+#+NAME: nixpkgs_local
+#+BEGIN_SRC sh
+/srv/nix/nixpkgs
+#+END_SRC
diff --git a/org/sisu_version_info_and_doc_header_including_copyright_and_license.org b/org/sisu_version_info_and_doc_header_including_copyright_and_license.org
new file mode 100644
index 0000000..0d66a58
--- /dev/null
+++ b/org/sisu_version_info_and_doc_header_including_copyright_and_license.org
@@ -0,0 +1,83 @@
+-*- mode: org -*-
+#+TITLE:       spine (doc_reform) object-centric document abstraction
+#+DESCRIPTION: documents - structuring, publishing in multiple formats & search
+#+FILETAGS:    :spine:abstraction:
+#+AUTHOR:      Ralph Amissah
+#+EMAIL:       [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
+#+COPYRIGHT:   Copyright (C) 2015 - 2023 Ralph Amissah
+#+LANGUAGE:    en
+#+STARTUP:     content hideblocks hidestars noindent entitiespretty
+#+PROPERTY:    header-args  :noweb yes
+#+PROPERTY:    header-args+ :exports code
+#+PROPERTY:    header-args+ :results no
+#+PROPERTY:    header-args+ :cache no
+#+PROPERTY:    header-args+ :padline no
+#+PROPERTY:    header-args+ :mkdirp yes
+#+OPTIONS:     H:3 num:nil toc:t \n:t ::t |:t ^:nil -:t f:t *:t
+
+- [[./doc-reform.org][doc-reform.org]]  [[./][org/]]
+
+* sisu doc header including copyright & license
+
+#+NAME: sisu_doc_header_including_copyright_and_license
+#+BEGIN_SRC org
+encoding: utf-8
+- Name: SiSU
+
+  - Description: documents, structuring, processing, publishing, search
+    sisu
+
+  - Author: Ralph Amissah
+    <ralph.amissah@gmail.com>
+
+  - Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+    2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2019,
+    2020, 2021, 2024, 2025 Ralph Amissah,
+    All Rights Reserved.
+
+  - License: GPL 3 or later:
+
+    SiSU, a framework for document structuring, publishing and search
+
+    Copyright (C) Ralph Amissah
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    This program is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+    more details.
+
+    You should have received a copy of the GNU General Public License along with
+    this program. If not, see <http://www.gnu.org/licenses/>.
+
+    If you have Internet connection, the latest version of the GPL should be
+    available at these locations:
+    <http://www.fsf.org/licensing/licenses/gpl.html>
+    <http://www.gnu.org/licenses/gpl.html>
+
+    <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
+
+  - SiSU uses:
+    - Standard SiSU markup syntax,
+    - Standard SiSU meta-markup syntax, and the
+    - Standard SiSU object citation numbering and system
+
+  - Homepages:
+    <http://www.sisudoc.org>
+
+  - Git
+    <https://git.sisudoc.org/projects/>
+    <https://git.sisudoc.org/projects/sisu>
+    <https://git.sisudoc.org/projects/sisu-markup>
+#+END_SRC
+
+* sisu version info SET VERSION :version:set:project:
+
+#+NAME: sisu_project_version
+#+BEGIN_SRC org
+7.3.1
+#+END_SRC
-- 
cgit v1.2.3