aboutsummaryrefslogtreecommitdiffhomepage
path: root/org
diff options
context:
space:
mode:
Diffstat (limited to 'org')
-rw-r--r--org/config_env.org18
-rw-r--r--org/config_git.org35
-rw-r--r--org/config_nix.org14
-rw-r--r--org/nix-develop-dlang-shared.org123
4 files changed, 107 insertions, 83 deletions
diff --git a/org/config_env.org b/org/config_env.org
index 5974b90..151435b 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -9,7 +9,7 @@
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
#+PROPERTY: header-args+ :noweb yes
-#+PROPERTY: header-args+ :results output none
+#+PROPERTY: header-args+ :results silent
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
#+PROPERTY: header-args+ :mkdirp yes
@@ -33,6 +33,7 @@ fi
#+NAME: envrc
#+HEADER: :tangle ../.envrc
+#+HEADER: :tangle-mode (identity #o644)
#+HEADER: :shebang "# -*- mode: sh -*-"
#+BEGIN_SRC shell
if [ -f .envrc-git-init ]; then
@@ -56,15 +57,16 @@ fi
- ${NixDirEnvVersion}
#+HEADER: :tangle ../.envrc-nix
+#+HEADER: :tangle-mode (identity #o644)
#+HEADER: :shebang "# -*- mode: nix -*-"
#+BEGIN_SRC shell
NIX_ENFORCE_PURITY=1
-# - https://github.com/nix-community/nix-direnv
-NixDirEnvVersion="<<direnv_version>>"
-NixDirEnvSHA="<<direnv_hash>>"
-if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then
- source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "${NixDirEnvSHA}"
-fi
+## - https://github.com/nix-community/nix-direnv
+#NixDirEnvVersion="<<direnv_version>>"
+#NixDirEnvSHA="<<direnv_hash>>"
+#if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then
+# source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "${NixDirEnvSHA}"
+#fi
watch_file flake.lock
watch_file flake.nix
watch_file shell.nix
@@ -145,6 +147,7 @@ echo "•
** .envrc-git-init
#+HEADER: :tangle ../.envrc-git-init
+#+HEADER: :tangle-mode (identity #o644)
#+HEADER: :shebang "# -*- mode: sh -*-"
#+HEADER: :noweb yes
#+BEGIN_SRC shell
@@ -159,6 +162,7 @@ fi
- bespoke modify appropriately and generate if needed
#+HEADER: :tangle ../.envrc-local_
+#+HEADER: :tangle-mode (identity #o644)
#+HEADER: :shebang "# -*- mode: sh -*-"
#+HEADER: :noweb yes
#+BEGIN_SRC shell
diff --git a/org/config_git.org b/org/config_git.org
index 1bd016e..220cad7 100644
--- a/org/config_git.org
+++ b/org/config_git.org
@@ -44,12 +44,12 @@
!configuration.txt
!*.json
!*.sdl
-!*.md
-!*.txt
!tangle
!*.org
!org
!org/*.org
+!*.md
+!*.txt
!.dr
!.dr/*
!markup/
@@ -92,6 +92,30 @@
!markup/pod-samples/pod/*/tools/po4a/po/*/index.html.in.po
!markup/pod-samples/pod/.dr
!markup/pod-samples/pod/.dr/*
+#!markup/pod-samples-playground/
+#!markup/pod-samples-playground/*
+#!markup/pod-samples-playground/*/
+#!markup/pod-samples-playground/*/pod/
+#!markup/pod-samples-playground/*/pod
+#!markup/pod-samples-playground/*/pod/**/
+#!markup/pod-samples-playground/*/pod/**/*
+#!markup/pod-samples-playground/*/pod/**/pod.manifest
+#!markup/pod-samples-playground/*/pod/**/pod.manifest
+#!markup/pod-samples-playground/*/pod/**/conf/
+#!markup/pod-samples-playground/*/pod/**/conf/document_make
+#!markup/pod-samples-playground/*/pod/**/media/
+#!markup/pod-samples-playground/*/pod/**/media/text/
+#!markup/pod-samples-playground/*/pod/**/media/text/*/
+#!markup/pod-samples-playground/*/pod/**/media/text/*/*.sst
+#!markup/pod-samples-playground/*/pod/**/media/text/*/*.ssm
+#!markup/pod-samples-playground/*/pod/**/media/text/*/*.ssi
+#!markup/pod-samples-playground/*/pod/**/media/image/
+#!markup/pod-samples-playground/*/pod/**/media/image/*.png
+#!markup/pod-samples-playground/*/pod/**/media/image/*.jpg
+#!markup/pod-samples-playground/*/pod/**/media/image/*.PNG
+#!markup/pod-samples-playground/*/pod/**/media/image/*.JPG
+#!markup/pod-samples-playground/*/pod/.dr
+#!markup/pod-samples-playground/*/pod/.dr/*
!markup/non-pod-samples/
!markup/non-pod-samples/*.sst
!markup/non-pod-samples/image/
@@ -105,18 +129,17 @@
,**/.dub/**
tmp/**
,*_.org
-,*_.md
-,*_.txt
-,*_.json
,*_.nix
,*_.d
+,*_.md
,*_.txt
+,*_.json
,*_
+!.envrc-local_
,*.swp
,*~
\#*
,*.\#*
-!.envrc-local_
#!*/
#\#*
#*.\#*
diff --git a/org/config_nix.org b/org/config_nix.org
index b6a0a01..f637c68 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -98,6 +98,8 @@
inherit shell;
inherit devEnv;
packages = [
+ direnv
+ nix-direnv
ldc
#dmd
dub
@@ -124,6 +126,8 @@
inherit shell;
inherit devEnv;
packages = [
+ direnv
+ nix-direnv
ldc
#dmd
dub
@@ -144,6 +148,8 @@
inherit shell;
inherit devEnv;
packages = [
+ direnv
+ nix-direnv
ldc
#dmd
dub
@@ -160,6 +166,8 @@
inherit shell;
inherit devEnv;
packages = [
+ direnv
+ nix-direnv
ldc
#dmd
dub
@@ -173,6 +181,8 @@
inherit shell;
inherit devEnv;
packages = [
+ direnv
+ nix-direnv
ldc
#dmd
dub
@@ -242,6 +252,7 @@ with pkgs;
# ❯❯❯ nix_related
##nix
#direnv
+ #nix-direnv
#nixVersions.latest #nixVersions.latest #nixVersions.git
#nix-prefetch-git
#validatePkgConfig
@@ -324,7 +335,8 @@ with pkgs;
# ❯❯❯ nix_related
#nix # if not on NixOS, this is needed
direnv
- nixVersions.latest #nixVersions.latest #nixVersions.git #nixVersions.nix_2_29 #nixVersions.nix_2_29
+ nix-direnv
+ nixVersions.latest #nixVersions.latest #nixVersions.git
nix-prefetch-git
validatePkgConfig
nix-output-monitor
diff --git a/org/nix-develop-dlang-shared.org b/org/nix-develop-dlang-shared.org
index 1b9129e..d11b752 100644
--- a/org/nix-develop-dlang-shared.org
+++ b/org/nix-develop-dlang-shared.org
@@ -9,7 +9,7 @@
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :noweb yes
#+PROPERTY: header-args+ :exports code
-#+PROPERTY: header-args+ :results no
+#+PROPERTY: header-args+ :results silent
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
#+PROPERTY: header-args+ :mkdirp yes
@@ -63,68 +63,12 @@ update flake.lock:
sha256-yMJ2OVMzrFaDPn7q8nCBZFRYpL/f0RcHzhmw/i6btJM=
#+END_SRC
-**** 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
-#+BEGIN_SRC org
-3.0.6
-#+END_SRC
-
-#+NAME: direnv_hash_3_0_6
-#+BEGIN_SRC org
-sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM=
-#+END_SRC
-
-**** 3.0.4
-
-#+NAME: direnv_version_3_0_4
-#+BEGIN_SRC org
-3.0.4
-#+END_SRC
-
-#+NAME: direnv_hash_3_0_4
-#+BEGIN_SRC org
-sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4=
-#+END_SRC
-
-**** 3.0.0
-
-#+NAME: direnv_version_3_0_0
-#+BEGIN_SRC org
-3.0.0
-#+END_SRC
-
-#+NAME: direnv_hash_3_0_0
-#+BEGIN_SRC org
-sha256-21TMnI2xWX7HkSTjFFri2UaohXVj854mgvWapWrxRXg=
-#+END_SRC
-
-**** 2.4.0
-
-#+NAME: direnv_version_2_4_0
-#+BEGIN_SRC org
-2.4.0
-#+END_SRC
-
-#+NAME: direnv_hash_2_4_0
-#+BEGIN_SRC org
-sha256-XQzUAvL6pysIJnRJyR7uVpmUSZfc7LSgWQwq/4mBr1U=
-#+END_SRC
-
* dlang
** ldc
+*** tags link
+
+- https://github.com/ldc-developers/ldc/tags
+
*** NOTES to update ldc
check for latest version:
@@ -168,20 +112,41 @@ sha256 = "<<ldc-hash>>";
#+NAME: ldc-version
#+BEGIN_SRC org
-<<ldc_version_1_41_0>>
+<<ldc_version_1_42_0>>
#+END_SRC
#+NAME: ldc-hash
#+BEGIN_SRC org
-<<ldc_hash_1_41_0>>
+<<ldc_hash_1_42_0>>
#+END_SRC
#+NAME: ldc-llvm-set
#+BEGIN_SRC org
-<<ldc_llvm_set_1_41_0>>
+<<ldc_llvm_set_1_42_0>>
#+END_SRC
*** versions
+**** 1.42 OK ✓
+***** 1.42.0 OK ✓
+
+ - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.42.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_42_0
+#+BEGIN_SRC nix
+1.42.0
+#+END_SRC
+
+#+NAME: ldc_hash_1_42_0
+#+BEGIN_SRC nix
+sha256-adA14tx/bruGvHVoODz13f8h/U2ol1lK0ytxnypsLv8=
+#+END_SRC
+
+#+NAME: ldc_llvm_set_1_42_0
+#+BEGIN_SRC nix
+llvm_21
+#+END_SRC
+
**** 1.41 OK ✓
***** 1.41.0 OK ✓
@@ -337,6 +302,7 @@ sha256-/bs3bwgkLZF5IqaiKnc5gCF/r6MQBG/F1kWUkK8j2s0=
#+END_SRC
** dmd
+*** tags link
- https://github.com/dlang/dmd/tags
@@ -514,20 +480,39 @@ sha256-yRL9ub3u4mREG9PVxBvgQ/LDXD57RadPTZ2h08qyh/s=
#+END_SRC
** dub
+*** tags link
+
+- https://github.com/dlang/dub/releases
+
*** version SET
#+NAME: dub-version
#+HEADER: :noweb yes
#+BEGIN_SRC org
-<<dub_version_1_39_0>>
+<<dub_version_1_40_0>>
#+END_SRC
#+NAME: dub-hash
#+BEGIN_SRC org
-<<dub_hash_1_39_0>>
+<<dub_hash_1_40_0>>
#+END_SRC
*** versions
+**** 1.40 OK ✓
+***** 1.40.0
+
+- nix-prefetch-url --unpack https://github.com/dlang/dub/archive/refs/tags/v1.40.0.tar.gz
+
+#+NAME: dub_version_1_40_0
+#+BEGIN_SRC nix
+1.40.0
+#+END_SRC
+
+#+NAME: dub_hash_1_40_0
+#+BEGIN_SRC nix
+sha256-OirchEKf66gis70gCSTOYcrHLyHhCsyt/rTEGT83Vcc=
+#+END_SRC
+
**** 1.39 OK ✓
***** 1.39.0
@@ -709,17 +694,17 @@ sha256-Pfj8Kwf5AlcrHhLs5A/0vIFWLZaNR3ro+esbs7oWN9I=
** sha256 blank_hash
#+NAME: blank_hash
-#+BEGIN_SRC nix
+#+BEGIN_SRC org
<<sha256-blank>>
#+END_SRC
#+NAME: sha256-blank
-#+BEGIN_SRC nix
+#+BEGIN_SRC org
sha256-0000000000000000000000000000000000000000000=
#+END_SRC
#+NAME: assumed_hash
-#+BEGIN_SRC nix
+#+BEGIN_SRC org
sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
#+END_SRC
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-22 11:20:37 +0000