summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.envrc-nix8
-rw-r--r--flake.lock14
-rw-r--r--flake.nix6
-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.org12
-rw-r--r--org/nix-develop-dlang-shared.org95
-rw-r--r--org/nixpkgs_overlays_d_related.org11
9 files changed, 123 insertions, 35 deletions
diff --git a/.envrc-nix b/.envrc-nix
index 165a025..e118848 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.109.1, ldc-1.40.0, dub-1.38.1)
+ • nix develop using package overlays: (dmd-2.111.0, ldc-1.41.0, dub-1.39.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-search-nixpkgs-dmd" --print-build-logs
❯❯ nix build ".#spine-search-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.111.0, ldc-1.41.0, dub-1.39.0)
❯❯ nix build ".#spine-search-overlay-dmd" --print-build-logs
❯❯ nix build ".#spine-search-overlay-ldc" --print-build-logs
diff --git a/flake.lock b/flake.lock
index b5f12ba..f587411 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": {
@@ -29,11 +29,11 @@
]
},
"locked": {
- "lastModified": 1734289685,
- "narHash": "sha256-nfnmDNn0OWIAPKAi7Lo9bCk6AhS7knUOp68AYwLhVAM=",
+ "lastModified": 1745018821,
+ "narHash": "sha256-eCkrJgGghQwT5Yp23wvAHKghGdb9S7tXR7+vv13/XTI=",
"ref": "refs/heads/main",
- "rev": "664c8a2c6450aca19b9c84c1a5c4b42d5d5a1f9f",
- "revCount": 16,
+ "rev": "c94ef3f0f8f379112c08f27edc623d637fd512de",
+ "revCount": 21,
"type": "git",
"url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake"
},
diff --git a/flake.nix b/flake.nix
index 43af700..481f7ae 100644
--- a/flake.nix
+++ b/flake.nix
@@ -211,7 +211,7 @@
with pkgs-nix; {
dsh-d-overlay = spine-d-overlay.devShells.${system}.default;
dsh-overlay = mkShell {
- name = "spine-0.18.0 base dev shell, ldc-1.40.0, dub-1.38.1";
+ name = "spine-0.18.0 base dev shell, ldc-1.41.0, dub-1.39.0";
inherit shell;
inherit devEnv;
packages = with pkgs-ovl; [
@@ -248,7 +248,7 @@
inherit shellHook;
};
dsh-overlay-dmd-dub = mkShell {
- name = "spine-0.18.0 base dev shell, dmd-2.109.1, dub-1.38.1";
+ name = "spine-0.18.0 base dev shell, dmd-2.111.0, dub-1.39.0";
inherit shell;
inherit devEnv;
packages = with pkgs-ovl; [
@@ -260,7 +260,7 @@
inherit shellHook;
};
dsh-overlay-ldc-dub = mkShell {
- name = "spine-0.18.0 base dev shell, ldc-1.40.0, dub-1.38.1";
+ name = "spine-0.18.0 base dev shell, ldc-1.41.0, dub-1.39.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 6dddf9c..e5f2a43 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -141,7 +141,7 @@ export SpineCGIform='spine_search'
export SpineCGIbin=/var/www/cgi/cgi-bin
#+END_SRC
-* SHARED versions
+* versions GET
** direnv
#+NAME: direnv_version
diff --git a/org/config_nix.org b/org/config_nix.org
index cf5e836..195114a 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -653,7 +653,7 @@ github:nixos/nixpkgs
<<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:sisudoc_dlang_nix_overlay_src()>>
#+END_SRC
-** versions dlang overlays versions
+** dlang overlays
*** ldc
#+NAME: ldc_version
@@ -686,14 +686,14 @@ github:nixos/nixpkgs
<<./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 889f79e..18ab78c 100644
--- a/org/nixpkgs_overlays_d_related.org
+++ b/org/nixpkgs_overlays_d_related.org
@@ -1303,7 +1303,7 @@ stdenv.mkDerivation (finalAttrs: {
})
#+END_SRC
-*** dcompiler SET
+*** dcompiler
#+NAME: dcompiler
#+BEGIN_SRC nix
@@ -1516,9 +1516,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
@@ -1539,7 +1539,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
@@ -1558,6 +1558,7 @@ Adapted from https://github.com/dlang/tools/commit/6c6a042d1b08e3ec1790bd07a7f69
#+END_SRC
*** dmd
+**** selected version
#+NAME: dmd_version
#+HEADER: :noweb yes
@@ -1576,6 +1577,7 @@ Adapted from https://github.com/dlang/tools/commit/6c6a042d1b08e3ec1790bd07a7f69
#+END_SRC
*** dub
+**** selected version
#+NAME: dub_version
#+HEADER: :noweb yes
@@ -1589,6 +1591,7 @@ Adapted from https://github.com/dlang/tools/commit/6c6a042d1b08e3ec1790bd07a7f69
#+END_SRC
*** dtools
+**** selected version
#+NAME: dtools_version
#+HEADER: :noweb yes
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-07 21:26:20 +0000