diff options
| -rw-r--r-- | .envrc-nix | 4 | ||||
| -rw-r--r-- | devenv.nix | 1 | ||||
| -rw-r--r-- | flake.lock | 22 | ||||
| -rw-r--r-- | flake.nix | 8 | ||||
| -rw-r--r-- | makefile | 4 | ||||
| -rw-r--r-- | org/config_env.org | 6 | ||||
| -rw-r--r-- | org/config_nix.org | 39 | ||||
| -rw-r--r-- | org/nix-develop-dlang-shared.org | 138 | ||||
| -rwxr-xr-x | shell.nix | 15 |
9 files changed, 163 insertions, 74 deletions
@@ -30,7 +30,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-2.109.1, ldc-1.40.0, dub-1.38.1) + • nix develop using package overlays: (dmd-2.110.0, ldc-1.40.1, dub-1.39.0) ❯❯ 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 @@ -45,7 +45,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.109.1, ldc-1.40.0, dub-1.38.1) + • nix build using package overlays: (dmd-2.110.0, ldc-1.40.1, dub-1.39.0, dtools-2.110.0) ❯❯ nix build ".#spine-overlay-dmd" --print-build-logs ❯❯ nix build ".#spine-overlay-ldc" --print-build-logs @@ -21,6 +21,7 @@ with pkgs; # ❯❯❯ dev gnumake ps + dtools # ❯❯❯ d_build_related # ❯❯ package manager dub @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1741310760, - "narHash": "sha256-aizILFrPgq/W53Jw8i0a1h1GZAAKtlYOrG/A5r46gVM=", + "lastModified": 1742578646, + "narHash": "sha256-GiQ40ndXRnmmbDZvuv762vS+gew1uDpFwOfgJ8tLiEs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "de0fe301211c267807afd11b12613f5511ff7433", + "rev": "94c4dbe77c0740ebba36c173672ca15a7926c993", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1741379209, - "narHash": "sha256-5BuRCnrAOzYnKoQ5n16DO4lXLG5/19TEZekS/oepF1Q=", + "lastModified": 1742662623, + "narHash": "sha256-YBUZoinyoKLISf1BvJFEdhqtcKQTG8k+qq9MEgxAEdY=", "ref": "refs/heads/main", - "rev": "a6315ffe8a46382e79640dd9127bff447dc13768", - "revCount": 17, + "rev": "39b16223937fa3fc8da80495a25d7397712b8bae", + "revCount": 19, "type": "git", "url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake" }, @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1741380437, - "narHash": "sha256-lzpjtQuVQqR2VynHzRsAktsESKolgCwyCssirLfM1pE=", + "lastModified": 1742665494, + "narHash": "sha256-RXjA18HxCrvm4U6c3iWR8AkRbSWOq97+uvR6li9bl8I=", "ref": "refs/heads/main", - "rev": "cdb96df1a54c13cf55e0c073455107053fdc9a45", - "revCount": 675, + "rev": "bc2c4e51320599fb18d457c7e0e1b5d10223f666", + "revCount": 677, "type": "git", "url": "git://git.sisudoc.org/software/sisudoc-spine" }, @@ -86,6 +86,7 @@ ldc #dmd dub + dtools gnumake sqlite libxml2 @@ -114,6 +115,7 @@ ldc #dmd dub + dtools gnumake sqlite # ❯❯ text-mode web browsers @@ -134,11 +136,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; }; @@ -150,6 +154,7 @@ ldc #dmd dub + dtools gnumake sqlite ]; @@ -163,6 +168,7 @@ ldc #dmd dub + dtools gnumake sqlite perl538Packages.Po4a @@ -811,8 +811,8 @@ gitsnapshot: distclean tangle # find data/sisudir/media/text -name *.ss[tm] | sort version_tag: - echo "DRV=0.16.0; git tag -f doc-reform-markup-samples_v$$\{DRV} -m\"doc-reform markup-samples spine-$$\{DRV}\" HEAD"; \ - echo "git tag -f doc-reform-markup-samples_v0.16.0 -m\"doc-reform markup-samples spine-0.16.0\" HEAD"; + echo "DRV=0.18.0; git tag -f doc-reform-markup-samples_v$$\{DRV} -m\"doc-reform markup-samples spine-$$\{DRV}\" HEAD"; \ + echo "git tag -f doc-reform-markup-samples_v0.18.0 -m\"doc-reform markup-samples spine-0.18.0\" HEAD"; .PHONY : all build release \ distclean init \ diff --git a/org/config_env.org b/org/config_env.org index 33b3cf0..5dd3ef3 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 @@ -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-<<dmd_version>>, ldc-<<ldc_version>>, dub-<<dub_version>>, dtools-<<dtools_version>>) ❯❯ nix build ".#spine-overlay-dmd" --print-build-logs ❯❯ nix build ".#spine-overlay-ldc" --print-build-logs diff --git a/org/config_nix.org b/org/config_nix.org index d830202..88d61bf 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -111,6 +111,7 @@ ldc #dmd dub + dtools gnumake sqlite libxml2 @@ -139,6 +140,7 @@ ldc #dmd dub + dtools gnumake sqlite # ❯❯ text-mode web browsers @@ -159,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; }; @@ -175,6 +179,7 @@ ldc #dmd dub + dtools gnumake sqlite ]; @@ -188,6 +193,7 @@ ldc #dmd dub + dtools gnumake sqlite perl538Packages.Po4a @@ -220,7 +226,7 @@ with pkgs; nix-output-monitor #nix-tree #jq - #alejandra + #nixfmt-rfc-style #git # ❯❯❯ dev #gnumake @@ -229,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 @@ -273,7 +282,8 @@ with pkgs; pkgs.callPackage ./devenv.nix {} #+END_SRC -** devEnv +* devEnv +** devenv.nix :default:devenv: nix profile install . @@ -303,6 +313,7 @@ with pkgs; # ❯❯❯ dev gnumake ps + dtools # ❯❯❯ d_build_related # ❯❯ package manager dub @@ -449,8 +460,6 @@ with ( } #+END_SRC -#src = ./.; - #+NAME: project_path_local_out_static #+HEADER: :noweb yes #+BEGIN_SRC nix @@ -498,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 @@ -527,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..f0a7aac 100644 --- a/org/nix-develop-dlang-shared.org +++ b/org/nix-develop-dlang-shared.org @@ -94,24 +94,44 @@ 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.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 @@ -226,20 +246,60 @@ sha256-/bs3bwgkLZF5IqaiKnc5gCF/r6MQBG/F1kWUkK8j2s0= #+NAME: dmd-version #+BEGIN_SRC org -<<dmd_version_2_109_1>> +<<dmd_version_2_110_0>> #+END_SRC #+NAME: dmd-hash #+BEGIN_SRC org -<<dmd_hash_2_109_1>> +<<dmd_hash_2_110_0>> #+END_SRC #+NAME: phobos-hash #+BEGIN_SRC org -<<phobos_hash_2_109_1>> +<<phobos_hash_2_110_0>> #+END_SRC *** versions +**** 2.111.0 OK ✓ + +- nix-prefetch-url --unpack https://github.com/dlang/dmd/archive/refs/tags/v2.111.0-beta.1.tar.gz +- nix-prefetch-url --unpack https://github.com/dlang/phobos/archive/refs/tags/v2.111.0-beta.1.tar.gz + +#+NAME: dmd_version_2_111_0 +#+BEGIN_SRC nix +2.111.0-beta.1 +#+END_SRC + +#+NAME: phobos_hash_2_111_0 +#+BEGIN_SRC nix +sha256-yPmstS52J0BboR++9nYaeUq2mAJrFuUjxxi2BGgGCUY= +#+END_SRC + +#+NAME: dmd_hash_2_111_0 +#+BEGIN_SRC nix +sha256-MfGcno6o+GXZTWyWZ0kGYtMcMPuj2VgQd5I+nPKz1I4= +#+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 +421,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 +557,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 @@ -13,7 +13,7 @@ with pkgs; nix-output-monitor #nix-tree #jq - #alejandra + #nixfmt-rfc-style #git # ❯❯❯ dev #gnumake @@ -22,14 +22,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 |