summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.envrc-nix5
-rw-r--r--flake.lock27
-rw-r--r--nix-overlays/README6
-rw-r--r--nix-overlays/ldc/default.nix4
-rw-r--r--org/config_env.org15
-rw-r--r--org/nixpkgs_overlays_d_related.org35
6 files changed, 67 insertions, 25 deletions
diff --git a/.envrc-nix b/.envrc-nix
index 579e33c..86856b5 100644
--- a/.envrc-nix
+++ b/.envrc-nix
@@ -1,6 +1,7 @@
NIX_ENFORCE_PURITY=1
-NixDirEnvVersion="2.3.0"
-NixDirEnvSHA="sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8="
+# - https://github.com/nix-community/nix-direnv
+NixDirEnvVersion="2.4.0"
+NixDirEnvSHA="sha256-XQzUAvL6pysIJnRJyR7uVpmUSZfc7LSgWQwq/4mBr1U="
if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "${NixDirEnvSHA}"
fi
diff --git a/flake.lock b/flake.lock
index 6e35d42..9edfbb0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,10 +8,11 @@
]
},
"locked": {
- "dirtyRev": "e0a47b6196c8e5808617cf3e4faebc5a511ea65c-dirty",
- "dirtyShortRev": "e0a47b6-dirty",
- "lastModified": 1690898297,
- "narHash": "sha256-8R/m+65RlIlCmhT4nkf0Sob2+nNqCU0aXTGl2AopRkI=",
+ "lastModified": 1697649634,
+ "narHash": "sha256-y7V50JZuqyk7XX6yBJzvROaSTPkD1Tmo2foFOOxdDe4=",
+ "ref": "refs/heads/main",
+ "rev": "fd1a5c1ec645f39e6600d87c1830f851beb682b1",
+ "revCount": 5,
"type": "git",
"url": "file:///home/ralph/grotto/repo/git.repo/projects/doc-reform/packages/nix-flakes/dlang/dlang-nix-flakes"
},
@@ -25,11 +26,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1689068808,
- "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+ "lastModified": 1694529238,
+ "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+ "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
@@ -43,11 +44,11 @@
"systems": "systems_2"
},
"locked": {
- "lastModified": 1692799911,
- "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
+ "lastModified": 1694529238,
+ "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
+ "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
@@ -58,11 +59,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1693844670,
- "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=",
+ "lastModified": 1697379843,
+ "narHash": "sha256-RcnGuJgC2K/UpTy+d32piEoBXq2M+nVFzM3ah/ZdJzg=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1",
+ "rev": "12bdeb01ff9e2d3917e6a44037ed7df6e6c3df9d",
"type": "github"
},
"original": {
diff --git a/nix-overlays/README b/nix-overlays/README
index 729b1f5..55b9381 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.34.0 )
+ - ldc ( 1.30.0 -> 1.35.0 )
- dub ( 1.23.0 -> 1.34.0 ) [for nix versions 1.31.0 ... 1.33.0 broken]
- dtools ( 2.095.1 -> 2.103.1 )
@@ -49,13 +49,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.34.0 )
+*** ldc OK ✓ ( 1.30.0 -> 1.35.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.34.0.tar.gz
+ nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.35.0.tar.gz
- https://github.com/ldc-developers/ldc/issues
- version in nixpkgs:
diff --git a/nix-overlays/ldc/default.nix b/nix-overlays/ldc/default.nix
index 2e34ac8..8624e64 100644
--- a/nix-overlays/ldc/default.nix
+++ b/nix-overlays/ldc/default.nix
@@ -1,4 +1,4 @@
import ./generic.nix {
- version = "1.34.0";
- sha256 = "sha256-MAXG6ceSWFOMg5eXZnZ6WePXTzy5CsLLDc5ddXO+txk=";
+ version = "1.35.0";
+ sha256 = "sha256-bilpk3BsdsCT5gkTmqCz+HBDVfoPN1b2dY141EIm36A=";
}
diff --git a/org/config_env.org b/org/config_env.org
index 15d600b..75be302 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -35,11 +35,14 @@ fi
** .envrc-nix
- https://github.com/nix-community/nix-direnv
- - source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "sha256-0000000000000000000000000000000000000000000="
+ - source_url
+ - direnv fetchurl "https://raw.githubusercontent.com/nix-community/nix-direnv/<<direnv-version>>/direnvrc" "<<direnv-sha>>"
+ - ${NixDirEnvVersion}
#+HEADER: :tangle ../.envrc-nix
#+BEGIN_SRC sh
NIX_ENFORCE_PURITY=1
+# - https://github.com/nix-community/nix-direnv
NixDirEnvVersion="<<direnv-version>>"
NixDirEnvSHA="<<direnv-sha>>"
if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then
@@ -60,11 +63,19 @@ use flake .
#+NAME: direnv-version
#+BEGIN_SRC sh
-2.3.0
+2.4.0
#+END_SRC
#+NAME: direnv-sha
#+BEGIN_SRC sh
+sha256-XQzUAvL6pysIJnRJyR7uVpmUSZfc7LSgWQwq/4mBr1U=
+#+END_SRC
+
+#+BEGIN_SRC sh
+2.3.0
+#+END_SRC
+
+#+BEGIN_SRC sh
sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8=
#+END_SRC
diff --git a/org/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org
index 4b88f1a..6bd14f5 100644
--- a/org/nixpkgs_overlays_d_related.org
+++ b/org/nixpkgs_overlays_d_related.org
@@ -438,7 +438,7 @@ with pkgs;
nix-output-monitor
#nix-tree
#nvd
- jq
+ jq #gx
alejandra
git
# ❯❯❯ dev
@@ -759,12 +759,41 @@ sha256 = "<<ldc_hash>>";
#+NAME: ldc_version
#+BEGIN_SRC nix
-<<ldc_version_1_34_0>>
+<<ldc_version_1_35_0>>
#+END_SRC
#+NAME: ldc_hash
#+BEGIN_SRC nix
-<<ldc_hash_1_34_0>>
+<<ldc_hash_1_35_0>>
+#+END_SRC
+
+**** 1.35.0 OK ✓
+***** 1.35.0 OK ✓
+
+- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.35.0.tar.gz
+
+#+NAME: ldc_version_1_35_0
+#+BEGIN_SRC nix
+1.35.0
+#+END_SRC
+
+#+NAME: ldc_hash_1_35_0
+#+BEGIN_SRC nix
+sha256-bilpk3BsdsCT5gkTmqCz+HBDVfoPN1b2dY141EIm36A=
+#+END_SRC
+
+***** 1.35.0-beta1
+
+- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.35.0-beta1.tar.gz
+
+#+NAME: ldc_version_1_35_0-beta1
+#+BEGIN_SRC nix
+1.35.0-beta1
+#+END_SRC
+
+#+NAME: ldc_hash_1_35_0-beta1
+#+BEGIN_SRC nix
+sha256-qOg7bIG42oxPo4l/ni43V9RkOeP5cmlVeSsW50uv8J8=
#+END_SRC
**** 1.34.0 OK ✓
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-04 05:16:34 +0000