aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.envrc-nix8
-rw-r--r--flake.lock6
-rw-r--r--flake.nix14
-rw-r--r--nix-overlays/README6
-rw-r--r--nix-overlays/ldc/package.nix4
-rw-r--r--org/config_env.org2
-rw-r--r--org/config_nix.org26
-rw-r--r--org/nix-develop-dlang-shared.org95
-rw-r--r--org/nixpkgs_overlays_d_related.org11
-rw-r--r--org/ocda.org18
-rw-r--r--src/sisudoc/meta/metadoc_from_src.d4
11 files changed, 141 insertions, 53 deletions
diff --git a/.envrc-nix b/.envrc-nix
index fef0626..c70accf 100644
--- a/.envrc-nix
+++ b/.envrc-nix
@@ -1,7 +1,7 @@
NIX_ENFORCE_PURITY=1
# - https://github.com/nix-community/nix-direnv
-NixDirEnvVersion="3.0.6"
-NixDirEnvSHA="sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
+NixDirEnvVersion="3.0.7"
+NixDirEnvSHA="sha256-bn8WANE5a91RusFmRI7kS751ApelG02nMcwRekC/qzc="
if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "${NixDirEnvSHA}"
fi
@@ -26,7 +26,7 @@ echo '
• 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 using package overlays: (dmd-2.110.0, ldc-1.40.1, dub-1.39.0, dtools-2.110.0)
+ • 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-dub" --print-build-logs -c zsh
❯❯ nix develop ".#dsh-overlay-ldc-dub" --print-build-logs -c zsh
❯❯ nix flake show
@@ -40,7 +40,7 @@ echo '
• nix build using nixpkgs
❯❯ nix build ".#spine-nixpkgs-dmd" --print-build-logs
❯❯ nix build ".#spine-nixpkgs-ldc" --print-build-logs
- • nix build using package overlays: (dmd-2.110.0, ldc-1.40.1, dub-1.39.0, dtools-2.110.0)
+ • nix build using package overlays: (dmd-2.111.0, ldc-1.41.0, dub-1.39.0, dtools-2.110.0)
❯❯ nix build ".#spine-overlay-dmd" --print-build-logs
❯❯ nix build ".#spine-overlay-ldc" --print-build-logs
diff --git a/flake.lock b/flake.lock
index 5a8c597..646b379 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
- "lastModified": 1740019556,
- "narHash": "sha256-vn285HxnnlHLWnv59Og7muqECNMS33mWLM14soFIv2g=",
+ "lastModified": 1749213349,
+ "narHash": "sha256-UAaWOyQhdp7nXzsbmLVC67fo+QetzoTm9hsPf9X3yr4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "dad564433178067be1fbdfcce23b546254b6d641",
+ "rev": "a4ff0e3c64846abea89662bfbacf037ef4b34207",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index e54fb9d..1bf974c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,8 +21,8 @@
runHook postCheck
'';
localOverlay = (final: prev: {
- ldc = prev.callPackage ./nix-overlays/ldc { }; # -> ok 1.40.1
- dmd = prev.callPackage ./nix-overlays/dmd { }; # -> ok 2.110.0
+ ldc = prev.callPackage ./nix-overlays/ldc { }; # -> ok 1.41.0
+ dmd = prev.callPackage ./nix-overlays/dmd { }; # -> ok 2.111.0
dub = prev.callPackage ./nix-overlays/dub { }; # -> ? 1.39.0
dtools = prev.callPackage ./nix-overlays/dtools { }; # -> ok 2.110.0
#gdc = prev.callPackage ./nix-overlays/gdc { };
@@ -131,7 +131,7 @@
spine-overlay-dmd = stdenv.mkDerivation {
inherit pname;
inherit version;
- #name = "spine-0.18.0 dmd-2.110.0 dub-1.39.0";
+ #name = "spine-0.18.0 dmd-2.111.0 dub-1.39.0";
meta.mainProgram = "spine-dmd";
executable = true;
src = self;
@@ -155,7 +155,7 @@
spine-overlay-ldc = stdenv.mkDerivation {
inherit pname;
inherit version;
- #name = "spine-0.18.0 ldc-1.40.1 dub-1.39.0";
+ #name = "spine-0.18.0 ldc-1.41.0 dub-1.39.0";
meta.mainProgram = "spine-ldc";
executable = true;
src = self;
@@ -215,7 +215,7 @@
in
with pkgs-nix; {
dsh-overlay = mkShell {
- name = "spine-0.18.0 base dev shell, ldc-1.40.1, dub-1.39.0 - dtools-2.110.0";
+ name = "spine-0.18.0 base dev shell, ldc-1.41.0, dub-1.39.0 - dtools-2.110.0";
inherit shell;
inherit devEnv;
packages = with pkgs-ovl; [
@@ -255,7 +255,7 @@
inherit shellHook;
};
dsh-overlay-dmd-dub = mkShell {
- name = "spine-0.18.0 base dev shell, dmd-2.110.0, dub-1.39.0 - dtools-2.110.0";
+ name = "spine-0.18.0 base dev shell, dmd-2.111.0, dub-1.39.0 - dtools-2.110.0";
inherit shell;
inherit devEnv;
packages = with pkgs-ovl; [
@@ -268,7 +268,7 @@
inherit shellHook;
};
dsh-overlay-ldc-dub = mkShell {
- name = "spine-0.18.0 base dev shell, ldc-1.40.1, dub-1.39.0 - dtools-2.110.0";
+ name = "spine-0.18.0 base dev shell, ldc-1.41.0, dub-1.39.0 - dtools-2.110.0";
inherit shell;
inherit devEnv;
packages = with pkgs-ovl; [
diff --git a/nix-overlays/README b/nix-overlays/README
index 56a23e9..59b02ca 100644
--- a/nix-overlays/README
+++ b/nix-overlays/README
@@ -16,7 +16,7 @@ compiler and build tools: ldc, dub and dtools, than exist in nixpkgs at the time
of publishing, in some cases with additional fixes.
nix overlays for (updates nixpkgs, more recent versions of):
- - ldc ( 1.30.0 -> 1.40.1 )
+ - ldc ( 1.30.0 -> 1.41.0 )
- dub ( 1.23.0 -> 1.39.0 ) [for nix versions 1.31.0 ... 1.33.0 broken]
- dtools ( 2.095.1 -> 2.110.0 )
@@ -47,13 +47,13 @@ search nixpkgs here:
- https://search.nixos.org/packages?channel=unstable&from=0&size=100&sort=relevance&query=
** compilers
-*** ldc OK ✓ ( 1.30.0 -> 1.40.1 )
+*** ldc OK ✓ ( 1.30.0 -> 1.41.0 )
- https://wiki.dlang.org/LDC
- https://github.com/ldc-developers/ldc
- https://github.com/ldc-developers/ldc/releases
- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.40.1.tar.gz
+ nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.41.0.tar.gz
- https://github.com/ldc-developers/ldc/issues
- version in nixpkgs:
diff --git a/nix-overlays/ldc/package.nix b/nix-overlays/ldc/package.nix
index 39b510a..ff2089b 100644
--- a/nix-overlays/ldc/package.nix
+++ b/nix-overlays/ldc/package.nix
@@ -31,13 +31,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "ldc";
- version = "1.40.1";
+ version = "1.41.0";
src = fetchFromGitHub {
owner = "ldc-developers";
repo = "ldc";
rev = "v${finalAttrs.version}";
- hash = "sha256-WdnwdH25A5oMNNY3uWG2hxnaAT+S1hNuP7LElH3uuuk=";
+ hash = "sha256-6LcpY3LSFK4KgEiGrFp/LONu5Vr+/+vI04wEEpF3s+s=";
fetchSubmodules = true;
};
diff --git a/org/config_env.org b/org/config_env.org
index db6af9d..1eb1f6d 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -175,7 +175,7 @@ export SpineDBpath=/var/www/sqlite
#export SpineDBpath=/srv/www/spine/sqlite
#+END_SRC
-* SHARED versions
+* versions GET
** direnv
#+NAME: direnv_version
diff --git a/org/config_nix.org b/org/config_nix.org
index 3ec97d0..de1d3b0 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -1032,9 +1032,8 @@ postInstall:
echo `ls -la $${out}/bin/spine`
#+END_SRC
-* SHARED
-** versions
-*** spine project VERSION :version:set:project:
+* versions GET
+** spine project VERSION :version:set:project:
#+NAME: spine_version
#+HEADER: :noweb yes
@@ -1042,8 +1041,8 @@ postInstall:
<<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:spine_project_version()>>
#+END_SRC
-*** dlang overlays
-**** ldc
+** dlang overlays
+*** ldc
#+NAME: ldc_version
#+HEADER: :noweb yes
@@ -1051,7 +1050,7 @@ postInstall:
<<./nix-develop-dlang-shared.org:ldc-version()>>
#+END_SRC
-**** dmd
+*** dmd
#+NAME: dmd_version
#+HEADER: :noweb yes
@@ -1059,7 +1058,7 @@ postInstall:
<<./nix-develop-dlang-shared.org:dmd-version()>>
#+END_SRC
-**** dub
+*** dub
#+NAME: dub_version
#+HEADER: :noweb yes
@@ -1067,7 +1066,7 @@ postInstall:
<<./nix-develop-dlang-shared.org:dub-version()>>
#+END_SRC
-**** dtools
+*** dtools
#+NAME: dtools_version
#+HEADER: :noweb yes
@@ -1075,15 +1074,14 @@ postInstall:
<<./nix-develop-dlang-shared.org:dtools-version()>>
#+END_SRC
-*** empty sha56 hash
+** sha256 blank hash
-#+NAME: blank_hash
+#+NAME: sha256-blank
#+BEGIN_SRC nix
-sha256-0000000000000000000000000000000000000000000=
+<<./nix-develop-dlang-shared.org:sha256-blank()>>
#+END_SRC
-#+NAME: assumed_hash
+#+NAME: blank_hash
#+BEGIN_SRC nix
-sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
+<<./nix-develop-dlang-shared.org:sha256-blank()>>
#+END_SRC
-
diff --git a/org/nix-develop-dlang-shared.org b/org/nix-develop-dlang-shared.org
index e40403d..451c53c 100644
--- a/org/nix-develop-dlang-shared.org
+++ b/org/nix-develop-dlang-shared.org
@@ -17,20 +17,51 @@
* nix
** direnv
+*** NOTES to update direnv in .envrc-nix
+
+- https://github.com/nix-community/nix-direnv
+
+check for latest version:
+
+- https://github.com/nix-community/nix-direnv/releases
+
+update direnv version and sha hash:
+- emacs org/nix-develop-dlang-shared.org
+
+re-tangle file:
+
+- emacs org/config_env.org
+ updates: .envrc-nix
+
+update flake.lock:
+- nix flake update && nix flake check && nix flake show
+
*** version SET
#+NAME: direnv-version
#+BEGIN_SRC org
-<<direnv_version_3_0_6>>
+<<direnv_version_3_0_7>>
#+END_SRC
#+NAME: direnv-hash
#+BEGIN_SRC org
-<<direnv_hash_3_0_6>>
+<<direnv_hash_3_0_7>>
#+END_SRC
*** versions
+**** 3.0.7
+
+#+NAME: direnv_version_3_0_7
+#+BEGIN_SRC org
+3.0.7
+#+END_SRC
+
+#+NAME: direnv_hash_3_0_7
+#+BEGIN_SRC org
+sha256-bn8WANE5a91RusFmRI7kS751ApelG02nMcwRekC/qzc=
+#+END_SRC
+
**** 3.0.6
#+NAME: direnv_version_3_0_6
@@ -81,6 +112,36 @@ sha256-XQzUAvL6pysIJnRJyR7uVpmUSZfc7LSgWQwq/4mBr1U=
* dlang
** ldc
+*** NOTES to update ldc
+
+check for latest version:
+
+update ldc version and sha hash:
+- emacs ./org/nix-develop-dlang-shared.org
+
+re-tangle files:
+- emacs ./org/nixpkgs_overlays_d_related.org
+ updates: nix-overlays/ldc/package.nix
+- emacs ./org/config_nix.org
+ updates: flake.nix
+- emacs ./org/config_env.org
+ updates: .envrc-nix
+
+update flake.lock:
+- nix flake update && nix flake check && nix flake show
+
+build:
+- nix build ".#spine-overlay-ldc" --print-build-logs
+
+adjust nix overlay if required (to get started):
+- git clone --depth 1 https://github.com/NixOS/nixpkgs
+- find ./nixpkgs/pkgs/ -type d -name "ldc"
+ ./nixpkgs/pkgs/by-name/ld/ldc
+- compare with overlay:
+ ./nix-overlays/ldc
+- overlay is tangled from:
+ emacs ./org/nixpkgs_overlays_d_related.org
+
*** version SET
**** version & sha256 nix composite
@@ -94,20 +155,41 @@ sha256 = "<<ldc-hash>>";
#+NAME: ldc-version
#+BEGIN_SRC org
-<<ldc_version_1_40_1>>
+<<ldc_version_1_41_0>>
#+END_SRC
#+NAME: ldc-hash
#+BEGIN_SRC org
-<<ldc_hash_1_40_1>>
+<<ldc_hash_1_41_0>>
#+END_SRC
#+NAME: ldc-llvm-set
#+BEGIN_SRC org
-<<ldc_llvm_set_1_40_1>>
+<<ldc_llvm_set_1_41_0>>
#+END_SRC
*** versions
+**** 1.41 OK ✓
+***** 1.41.0 OK ✓
+
+ - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.41.0.tar.gz
+ - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz
+
+#+NAME: ldc_version_1_41_0
+#+BEGIN_SRC nix
+1.41.0
+#+END_SRC
+
+#+NAME: ldc_hash_1_41_0
+#+BEGIN_SRC nix
+sha256-6LcpY3LSFK4KgEiGrFp/LONu5Vr+/+vI04wEEpF3s+s=
+#+END_SRC
+
+#+NAME: ldc_llvm_set_1_41_0
+#+BEGIN_SRC nix
+llvm_19
+#+END_SRC
+
**** 1.40 OK ✓
***** 1.40.1 OK ✓
@@ -242,6 +324,9 @@ sha256-/bs3bwgkLZF5IqaiKnc5gCF/r6MQBG/F1kWUkK8j2s0=
#+END_SRC
** dmd
+
+- https://github.com/dlang/dmd/tags
+
*** version SET
#+NAME: dmd-version
diff --git a/org/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org
index f79d3e2..1b89d89 100644
--- a/org/nixpkgs_overlays_d_related.org
+++ b/org/nixpkgs_overlays_d_related.org
@@ -1309,7 +1309,7 @@ stdenv.mkDerivation (finalAttrs: {
})
#+END_SRC
-*** dcompiler SET
+*** dcompiler
#+NAME: dcompiler
#+BEGIN_SRC nix
@@ -1522,9 +1522,9 @@ Adapted from https://github.com/dlang/tools/commit/6c6a042d1b08e3ec1790bd07a7f69
$(ROOT)/catdoc$(DOTEXE) \
#+END_SRC
-** versions SET
+** versions GET
*** direnv
-***** select version SET OK ✓
+***** select version
#+NAME: direnv_version
#+HEADER: :noweb yes
@@ -1545,7 +1545,7 @@ Adapted from https://github.com/dlang/tools/commit/6c6a042d1b08e3ec1790bd07a7f69
<<./nix-develop-dlang-shared.org:ldc-version-info()>>
#+END_SRC
-***** select version SET OK ✓
+***** selected version
#+NAME: ldc_version
#+HEADER: :noweb yes
@@ -1564,6 +1564,7 @@ Adapted from https://github.com/dlang/tools/commit/6c6a042d1b08e3ec1790bd07a7f69
#+END_SRC
*** dmd
+**** selected version
#+NAME: dmd_version
#+HEADER: :noweb yes
@@ -1582,6 +1583,7 @@ Adapted from https://github.com/dlang/tools/commit/6c6a042d1b08e3ec1790bd07a7f69
#+END_SRC
*** dub
+**** selected version
#+NAME: dub_version
#+HEADER: :noweb yes
@@ -1595,6 +1597,7 @@ Adapted from https://github.com/dlang/tools/commit/6c6a042d1b08e3ec1790bd07a7f69
#+END_SRC
*** dtools
+**** selected version
#+NAME: dtools_version
#+HEADER: :noweb yes
diff --git a/org/ocda.org b/org/ocda.org
index 148edf8..2509725 100644
--- a/org/ocda.org
+++ b/org/ocda.org
@@ -1,6 +1,7 @@
-*- mode: org -*-
#+TITLE: sisudoc spine (doc_reform) object-centric document abstraction
#+DESCRIPTION: documents - structuring, publishing in multiple formats & search
+#+SUMMARY: process markup document, create document abstraction
#+FILETAGS: :spine:abstraction:
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
@@ -18,7 +19,8 @@
- [[./doc-reform.org][doc-reform.org]] [[./][org/]]
* (Object-Centric) Document Abstraction
-Process markup document, create document abstraction.
+
+- Process markup document, create document abstraction
** _module template_ :module:metadoc_from_src:
@@ -69,7 +71,7 @@ mixin docAbstractionFunctions;
#+END_SRC
** docAbstraction
-*** abstraction summary
+*** _toc_ abstraction summary
#+NAME: docAbstraction
#+HEADER: :noweb yes
@@ -219,7 +221,7 @@ int cnt1 = 1; int cnt2 = 1; int cnt3 = 1;
// abstraction init ↑
#+END_SRC
-*** abstraction init substitutions
+*** debug abstraction init substitutions
#+NAME: docAbstractionInitSubstitutionsDebug
#+HEADER: :noweb yes
@@ -231,8 +233,8 @@ debug (substitutions) {
}
if (conf_make_meta.make.substitute) {
foreach(substitution_pair; conf_make_meta.make.substitute) {
- writeln("regex to match: ", substitution_pair[Substitute.match]);
- writeln("substitution to make: ", substitution_pair[Substitute.markup]);
+ writeln("regex to match: ", substitution_pair[Substitute.match]);
+ writeln("substitution to make: ", substitution_pair[Substitute.markup]);
}
}
if (conf_make_meta.make.bold) {
@@ -250,7 +252,7 @@ debug (substitutions) {
}
#+END_SRC
-*** loop source by line (large block)
+*** _loop_ source by line (large block)
#+NAME: docAbstractionMainLoopSrcByLine
#+HEADER: :noweb yes
@@ -883,7 +885,7 @@ _loopMarkupSrcByLineStruct loopMarkupSrcByLine(
}
#+END_SRC
-*** post loop (consider and segment/break up further in code & org)
+*** _post loop_ (consider and segment/break up further in code & org)
#+NAME: docAbstractionPostMainLoop
#+HEADER: :noweb yes
@@ -1456,7 +1458,7 @@ debug(segnames) {
}
#+END_SRC
-*** return structure
+*** _return structure_
#+NAME: docAbstractionReturnsStruct
#+HEADER: :noweb yes
diff --git a/src/sisudoc/meta/metadoc_from_src.d b/src/sisudoc/meta/metadoc_from_src.d
index 4aa49dc..b5b4f6d 100644
--- a/src/sisudoc/meta/metadoc_from_src.d
+++ b/src/sisudoc/meta/metadoc_from_src.d
@@ -214,8 +214,8 @@ template docAbstraction() {
}
if (conf_make_meta.make.substitute) {
foreach(substitution_pair; conf_make_meta.make.substitute) {
- writeln("regex to match: ", substitution_pair[Substitute.match]);
- writeln("substitution to make: ", substitution_pair[Substitute.markup]);
+ writeln("regex to match: ", substitution_pair[Substitute.match]);
+ writeln("substitution to make: ", substitution_pair[Substitute.markup]);
}
}
if (conf_make_meta.make.bold) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-08 08:27:20 +0000