aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.envrc-nix4
-rw-r--r--flake.lock22
-rw-r--r--org/config_env.org12
-rw-r--r--org/nix-develop-dlang-shared.org43
4 files changed, 57 insertions, 24 deletions
diff --git a/.envrc-nix b/.envrc-nix
index ae275f7..00c303a 100644
--- a/.envrc-nix
+++ b/.envrc-nix
@@ -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.110.0, ldc-1.40.1, dub-1.39.0)
+ • 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
@@ -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.110.0, ldc-1.40.1, dub-1.39.0, dtools-2.110.0)
+ • 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
diff --git a/flake.lock b/flake.lock
index b76f6d8..2bc9b91 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
- "lastModified": 1742578646,
- "narHash": "sha256-GiQ40ndXRnmmbDZvuv762vS+gew1uDpFwOfgJ8tLiEs=",
+ "lastModified": 1744536153,
+ "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "94c4dbe77c0740ebba36c173672ca15a7926c993",
+ "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
"type": "github"
},
"original": {
@@ -30,11 +30,11 @@
]
},
"locked": {
- "lastModified": 1742662623,
- "narHash": "sha256-YBUZoinyoKLISf1BvJFEdhqtcKQTG8k+qq9MEgxAEdY=",
+ "lastModified": 1745018821,
+ "narHash": "sha256-eCkrJgGghQwT5Yp23wvAHKghGdb9S7tXR7+vv13/XTI=",
"ref": "refs/heads/main",
- "rev": "39b16223937fa3fc8da80495a25d7397712b8bae",
- "revCount": 19,
+ "rev": "c94ef3f0f8f379112c08f27edc623d637fd512de",
+ "revCount": 21,
"type": "git",
"url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake"
},
@@ -50,11 +50,11 @@
]
},
"locked": {
- "lastModified": 1742665494,
- "narHash": "sha256-RXjA18HxCrvm4U6c3iWR8AkRbSWOq97+uvR6li9bl8I=",
+ "lastModified": 1745020582,
+ "narHash": "sha256-jlITgkxR6IRsXSQOW3LphzqmTv10cKKjTwgNAXUDyKA=",
"ref": "refs/heads/main",
- "rev": "bc2c4e51320599fb18d457c7e0e1b5d10223f666",
- "revCount": 677,
+ "rev": "85447aadf685dcb8c2d86f0e36c82d7f5bc18907",
+ "revCount": 680,
"type": "git",
"url": "git://git.sisudoc.org/software/sisudoc-spine"
},
diff --git a/org/config_env.org b/org/config_env.org
index 5dd3ef3..e376bb0 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -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>>, dtools-<<dtools_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/nix-develop-dlang-shared.org b/org/nix-develop-dlang-shared.org
index f0a7aac..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
@@ -108,6 +111,27 @@ sha256 = "<<ldc-hash>>";
#+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 ✓
@@ -242,42 +266,45 @@ sha256-/bs3bwgkLZF5IqaiKnc5gCF/r6MQBG/F1kWUkK8j2s0=
#+END_SRC
** dmd
+
+- https://github.com/dlang/dmd/tags
+
*** version SET
#+NAME: dmd-version
#+BEGIN_SRC org
-<<dmd_version_2_110_0>>
+<<dmd_version_2_111_0>>
#+END_SRC
#+NAME: dmd-hash
#+BEGIN_SRC org
-<<dmd_hash_2_110_0>>
+<<dmd_hash_2_111_0>>
#+END_SRC
#+NAME: phobos-hash
#+BEGIN_SRC org
-<<phobos_hash_2_110_0>>
+<<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-beta.1.tar.gz
-- nix-prefetch-url --unpack https://github.com/dlang/phobos/archive/refs/tags/v2.111.0-beta.1.tar.gz
+- 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-beta.1
+2.111.0
#+END_SRC
#+NAME: phobos_hash_2_111_0
#+BEGIN_SRC nix
-sha256-yPmstS52J0BboR++9nYaeUq2mAJrFuUjxxi2BGgGCUY=
+sha256-9jySZbODoL8sULhYKj/l4+c/uiG5xY2dO240k9XQtPk=
#+END_SRC
#+NAME: dmd_hash_2_111_0
#+BEGIN_SRC nix
-sha256-MfGcno6o+GXZTWyWZ0kGYtMcMPuj2VgQd5I+nPKz1I4=
+sha256-2bjsGa9nTny818dLRV6LKkes+Ycq8W+PFjwhGVrD5TM=
#+END_SRC
**** 2.110.0 OK ✓
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-19 18:49:33 +0000