aboutsummaryrefslogtreecommitdiffhomepage
path: root/org
diff options
context:
space:
mode:
Diffstat (limited to 'org')
-rw-r--r--org/config_env.org16
-rw-r--r--org/config_nix.org51
-rw-r--r--org/nix-develop-dlang-shared.org165
-rw-r--r--org/sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org6
4 files changed, 179 insertions, 59 deletions
diff --git a/org/config_env.org b/org/config_env.org
index 33b3cf0..e376bb0 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -4,7 +4,7 @@
#+FILETAGS: :spine:build:tools:
#+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 :exports code
@@ -49,7 +49,7 @@ fi
- https://github.com/nix-community/nix-direnv
- source_url
- - direnv fetchurl "https://raw.githubusercontent.com/nix-community/nix-direnv/<<direnv_version>>/direnvrc" "<<direnv_hash>>"
+ - direnv fetchurl "https://raw.githubusercontent.com/nix-community/nix-direnv/<<direnv-version>>/direnvrc" "<<direnv_hash>>"
- ${NixDirEnvVersion}
#+HEADER: :tangle ../.envrc-nix
@@ -86,7 +86,7 @@ echo '
❯❯ nix develop ".#dsh-latex-pdf" --print-build-logs -c zsh
❯❯ nix develop ".#dsh-spine" --print-build-logs -c zsh
❯❯ nix develop ".#dsh-sqlite" --print-build-logs -c zsh
- • nix develop using package overlays: (dmd-<<dmd_version>>, ldc-<<ldc_version>>, dub-<<dub_version>>)
+ • nix develop using package overlays: (dmd, ldc, dub)
❯❯ nix develop ".#dsh" --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
@@ -101,7 +101,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-<<dmd_version>>, ldc-<<ldc_version>>, dub-<<dub_version>>)
+ • nix build using package overlays: (dmd, ldc, dub, dtools)
❯❯ nix build ".#spine-overlay-dmd" --print-build-logs
❯❯ nix build ".#spine-overlay-ldc" --print-build-logs
@@ -176,7 +176,7 @@ export SpineDBpath=/var/www/sqlite
#export SpineDBpath=/srv/www/spine/sqlite
#+END_SRC
-* SHARED versions
+* versions GET
** direnv
#+NAME: direnv_version
@@ -200,6 +200,12 @@ export SpineDBpath=/var/www/sqlite
#+END_SRC
** dlang overlays
+
+- does not make sense to update versions here, unless you carry on careful
+ syncing with provided dlang related overlays ... which should not be
+ necessary, so they are available here but have been taken out of use;
+ the latest available overlay is pulled
+
*** ldc
#+NAME: ldc_version
diff --git a/org/config_nix.org b/org/config_nix.org
index 651d310..88d61bf 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: {
@@ -103,6 +111,7 @@
ldc
#dmd
dub
+ dtools
gnumake
sqlite
libxml2
@@ -131,6 +140,7 @@
ldc
#dmd
dub
+ dtools
gnumake
sqlite
# ❯❯ text-mode web browsers
@@ -151,11 +161,13 @@
ldc
#dmd
dub
+ dtools
gnumake
source-sans-pro
source-serif-pro
source-code-pro
- texlive.combined.scheme-full
+ texliveFull
+ #texlive.combined.scheme-full
];
inherit shellHook;
};
@@ -167,6 +179,7 @@
ldc
#dmd
dub
+ dtools
gnumake
sqlite
];
@@ -180,6 +193,7 @@
ldc
#dmd
dub
+ dtools
gnumake
sqlite
perl538Packages.Po4a
@@ -212,7 +226,7 @@ with pkgs;
nix-output-monitor
#nix-tree
#jq
- #alejandra
+ #nixfmt-rfc-style
#git
# ❯❯❯ dev
#gnumake
@@ -221,14 +235,17 @@ with pkgs;
# ❯❯ package manager
#dub
# ❯❯ compiler
+ #dmd
#ldc
- ##rund
+ #rund
# ❯❯ linker
- ##lld
- ##mold
+ #lld
+ #mold
# ❯❯ builder
- ##ninja
- ##meson
+ #ninja
+ #meson
+ # ❯❯ tools
+ #dtools
# ❯❯❯ sqlite search related
#sqlite
# ❯❯❯ pdf_latex_related
@@ -265,7 +282,8 @@ with pkgs;
pkgs.callPackage ./devenv.nix {}
#+END_SRC
-** devEnv
+* devEnv
+** devenv.nix :default:devenv:
nix profile install .
@@ -295,6 +313,7 @@ with pkgs;
# ❯❯❯ dev
gnumake
ps
+ dtools
# ❯❯❯ d_build_related
# ❯❯ package manager
dub
@@ -441,8 +460,6 @@ with (
}
#+END_SRC
-#src = ./.;
-
#+NAME: project_path_local_out_static
#+HEADER: :noweb yes
#+BEGIN_SRC nix
@@ -490,12 +507,6 @@ spine-0.12.0-tag-0.11.2.r107.gf89a107.tar.gz
sha256:03dr7dn7kq6arw4ry7qar13iqmi1caw70imfjwi8qr7g2j4mnk2q
#+END_SRC
-#+BEGIN_SRC nix
-sha256:0000000000000000000000000000000000000000000000000000
-#+END_SRC
-
-/home/ralph/grotto/repo/git.repo/projects/project-spine/tarball
-
#+NAME: project_path_local_out_static_
#+BEGIN_SRC nix
/var/www
@@ -519,10 +530,6 @@ github:NixOS/nixpkgs/nixpkgs-unstable
"nixpkgs/nixos-unstable";
#+END_SRC
-#+BEGIN_SRC nix
-"nixpkgs/nixos-23.05";
-#+END_SRC
-
#+HEADER: :noweb yes
#+BEGIN_SRC nix
<<nixpkgs_path_local>>
diff --git a/org/nix-develop-dlang-shared.org b/org/nix-develop-dlang-shared.org
index 5623f63..1d8fe34 100644
--- a/org/nix-develop-dlang-shared.org
+++ b/org/nix-develop-dlang-shared.org
@@ -81,6 +81,9 @@ sha256-XQzUAvL6pysIJnRJyR7uVpmUSZfc7LSgWQwq/4mBr1U=
* dlang
** ldc
+
+- https://github.com/ldc-developers/ldc/releases
+
*** version SET
**** version & sha256 nix composite
@@ -94,24 +97,65 @@ sha256 = "<<ldc-hash>>";
#+NAME: ldc-version
#+BEGIN_SRC org
-<<ldc_version_1_40_0>>
+<<ldc_version_1_40_1>>
#+END_SRC
#+NAME: ldc-hash
#+BEGIN_SRC org
-<<ldc_hash_1_40_0>>
+<<ldc_hash_1_40_1>>
#+END_SRC
#+NAME: ldc-llvm-set
#+BEGIN_SRC org
-<<ldc_llvm_set_1_40_0>>
+<<ldc_llvm_set_1_40_1>>
#+END_SRC
*** versions
+**** 1.41
+***** 1.41.0 beta1 OK ✓
+
+ - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.41.0-beta1.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-beta1
+#+END_SRC
+
+#+NAME: ldc_hash_1_41_0
+#+BEGIN_SRC nix
+sha256-FSdBOVkHdEJ7flKTyjkE0MCEUIMOXRv4uBn8OKPPdn4=
+#+END_SRC
+
+#+NAME: ldc_llvm_set_1_41_0
+#+BEGIN_SRC nix
+llvm_19
+#+END_SRC
+
**** 1.40 OK ✓
+***** 1.40.1 OK ✓
+
+ - 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/releases/download/v${version}/ldc-${version}-src.tar.gz
+
+#+NAME: ldc_version_1_40_1
+#+BEGIN_SRC nix
+1.40.1
+#+END_SRC
+
+#+NAME: ldc_hash_1_40_1
+#+BEGIN_SRC nix
+sha256-WdnwdH25A5oMNNY3uWG2hxnaAT+S1hNuP7LElH3uuuk=
+#+END_SRC
+
+#+NAME: ldc_llvm_set_1_40_1
+#+BEGIN_SRC nix
+llvm_19
+#+END_SRC
+
***** 1.40.0 OK ✓
- - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.40.0-beta6.tar.gz
+ - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.40.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_40_0
@@ -222,24 +266,67 @@ sha256-/bs3bwgkLZF5IqaiKnc5gCF/r6MQBG/F1kWUkK8j2s0=
#+END_SRC
** dmd
+
+- https://github.com/dlang/dmd/tags
+
*** version SET
#+NAME: dmd-version
#+BEGIN_SRC org
-<<dmd_version_2_109_1>>
+<<dmd_version_2_111_0>>
#+END_SRC
#+NAME: dmd-hash
#+BEGIN_SRC org
-<<dmd_hash_2_109_1>>
+<<dmd_hash_2_111_0>>
#+END_SRC
#+NAME: phobos-hash
#+BEGIN_SRC org
-<<phobos_hash_2_109_1>>
+<<phobos_hash_2_111_0>>
#+END_SRC
*** versions
+**** 2.111.0 OK ✓
+
+- nix-prefetch-url --unpack https://github.com/dlang/dmd/archive/refs/tags/v2.111.0.tar.gz
+- nix-prefetch-url --unpack https://github.com/dlang/phobos/archive/refs/tags/v2.111.0.tar.gz
+
+#+NAME: dmd_version_2_111_0
+#+BEGIN_SRC nix
+2.111.0
+#+END_SRC
+
+#+NAME: phobos_hash_2_111_0
+#+BEGIN_SRC nix
+sha256-9jySZbODoL8sULhYKj/l4+c/uiG5xY2dO240k9XQtPk=
+#+END_SRC
+
+#+NAME: dmd_hash_2_111_0
+#+BEGIN_SRC nix
+sha256-2bjsGa9nTny818dLRV6LKkes+Ycq8W+PFjwhGVrD5TM=
+#+END_SRC
+
+**** 2.110.0 OK ✓
+
+- nix-prefetch-url --unpack https://github.com/dlang/dmd/archive/refs/tags/v2.110.0.tar.gz
+- nix-prefetch-url --unpack https://github.com/dlang/phobos/archive/refs/tags/v2.110.0.tar.gz
+
+#+NAME: dmd_version_2_110_0
+#+BEGIN_SRC nix
+2.110.0
+#+END_SRC
+
+#+NAME: phobos_hash_2_110_0
+#+BEGIN_SRC nix
+sha256-CmJpcHM+sIsaYBlpALCFoQFG+93s8gUyWmM0tYqjXkk=
+#+END_SRC
+
+#+NAME: dmd_hash_2_110_0
+#+BEGIN_SRC nix
+sha256-icXp9xWF2AI2gp7z/lQFAChmXfQePe9b5pbpQ9Mn19Y=
+#+END_SRC
+
**** 2.109.1 OK ✓
- nix-prefetch-url --unpack https://github.com/dlang/dmd/archive/refs/tags/v2.109.1.tar.gz
@@ -361,15 +448,30 @@ sha256-yRL9ub3u4mREG9PVxBvgQ/LDXD57RadPTZ2h08qyh/s=
#+NAME: dub-version
#+HEADER: :noweb yes
#+BEGIN_SRC org
-<<dub_version_1_38_1>>
+<<dub_version_1_39_0>>
#+END_SRC
#+NAME: dub-hash
#+BEGIN_SRC org
-<<dub_hash_1_38_1>>
+<<dub_hash_1_39_0>>
#+END_SRC
*** versions
+**** 1.39 OK ✓
+***** 1.39.0
+
+- nix-prefetch-url --unpack https://github.com/dlang/dub/archive/refs/tags/v1.39.0.tar.gz
+
+#+NAME: dub_version_1_39_0
+#+BEGIN_SRC nix
+1.39.0
+#+END_SRC
+
+#+NAME: dub_hash_1_39_0
+#+BEGIN_SRC nix
+sha256-73b15A9+hClD6IbuxTy9QZKpTKjUFYBuqGOclUyhrnM=
+#+END_SRC
+
**** 1.38 OK ✓
***** 1.38.1
@@ -482,61 +584,66 @@ sha256-5pW3Fu3PQ1ZLJnsuh7fPpEBNbVQgGfFyiuMrAVOJKQA=
#+NAME: dtools-version
#+BEGIN_SRC org
-<<dtools_version_2_103_1>>
+<<dtools_version_2_110_0>>
#+END_SRC
#+NAME: dtools-hash
#+BEGIN_SRC org
-<<dtools_hash_2_103_1>>
+<<dtools_hash_2_110_0>>
#+END_SRC
*** versions
-**** 2.103.1 OK ✓
+**** 2.110.0 OK ✓
-- https://github.com/dlang/tools/releases/tag/v2.103.1
+- https://github.com/dlang/tools/releases/tag/v2.110.0
-#+NAME: dtools_version_2_103_1
+#+NAME: dtools_version_2_110_0
#+BEGIN_SRC nix
-2.103.1
+2.110.0
#+END_SRC
-#+NAME: dtools_hash_2_103_1
+#+NAME: dtools_hash_2_110_0
#+BEGIN_SRC nix
-sha256-XM4gUxcarQCOBR8W/o0iWAI54PyLDkH6CsDce22Cnu4=
+sha256-xMEHnrstL5hAkhp8+/z1I2KZWZ7eztWZnUGLTKCfbBI=
#+END_SRC
-**** 2.102.2
+**** 2.109.1 OK ✓
-- https://github.com/dlang/tools/releases/tag/v2.102.2
+- https://github.com/dlang/tools/releases/tag/v2.109.1
-#+NAME: dtools_version_2_102_2
+#+NAME: dtools_version_2_109_1
#+BEGIN_SRC nix
-2.102.2
+2.109.1
#+END_SRC
-#+NAME: dtools_hash_2_102_2
+#+NAME: dtools_hash_2_109_1
#+BEGIN_SRC nix
-sha256-XM4gUxcarQCOBR8W/o0iWAI54PyLDkH6CsDce22Cnu4=
+sha256-Pfj8Kwf5AlcrHhLs5A/0vIFWLZaNR3ro+esbs7oWN9I=
#+END_SRC
-**** 2.095.1
+**** 2.104.1 OK ✓
-- https://github.com/dlang/tools/releases/tag/v2.095.1
+- https://github.com/dlang/tools/releases/tag/v2.104.2
-#+NAME: dtools_version_2_095_1
+#+NAME: dtools_version_2_104_2
#+BEGIN_SRC nix
-2.095.1
+2.104.2
#+END_SRC
-#+NAME: dtools_hash_2_095_1
+#+NAME: dtools_hash_2_104_2
#+BEGIN_SRC nix
-sha256:0rdfk3mh3fjrb0h8pr8skwlq6ac9hdl1fkrkdl7n1fa2806b740b
+sha256-Pfj8Kwf5AlcrHhLs5A/0vIFWLZaNR3ro+esbs7oWN9I=
#+END_SRC
** sha256 blank_hash
#+NAME: blank_hash
#+BEGIN_SRC nix
+<<sha256-blank>>
+#+END_SRC
+
+#+NAME: sha256-blank
+#+BEGIN_SRC nix
sha256-0000000000000000000000000000000000000000000=
#+END_SRC
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-16 07:56:05 +0000