summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README26
-rw-r--r--flake.lock6
-rw-r--r--flake.nix10
-rw-r--r--nix-overlays/dmd/package.nix6
-rw-r--r--nix-overlays/dtools/package.nix4
-rw-r--r--nix-overlays/dub/package.nix4
-rw-r--r--org/nix-develop-dlang-shared.org64
-rwxr-xr-xshell.nix8
8 files changed, 89 insertions, 39 deletions
diff --git a/README b/README
index dcffdb1..e61525e 100644
--- a/README
+++ b/README
@@ -36,10 +36,10 @@ nix control files
nix overlays for (updates nixpkgs, more recent versions of):
- ldc ( 1.30.0 -> 1.43.0 )
- - dub ( 1.23.0 -> 1.41.0 ) [for nix versions 1.31.0 ... 1.33.0 broken]
- - dtools ( 2.095.1 -> 2.112.1 )
+ - dub ( 1.23.0 -> 1.42.0 ) [for nix versions 1.31.0 ... 1.33.0 broken]
+ - dtools ( 2.095.1 -> 2.113.0 )
- - dmd ( 2.100.2 -> 2.112.1 )
+ - dmd ( 2.100.2 -> 2.113.0 )
- gdc [not yet available]
(updates nixpkgs circa 2023-05-12)
@@ -85,14 +85,14 @@ search nixpkgs here:
- version in nixpkgs:
- https://search.nixos.org/packages?channel=unstable&show=ldc&from=0&size=100&sort=relevance&type=packages&query=ldc
-*** dmd OK ✓ ( 2.100.2 -> 2.112.1 )
+*** dmd OK ✓ ( 2.100.2 -> 2.113.0 )
- https://dlang.org/
- https://wiki.dlang.org/LDC
- https://github.com/dlang/dmd
- https://github.com/dlang/dmd/tags
- nix-prefetch-url --unpack https://github.com/dlang/dmd/archive/refs/tags/v2.112.1.tar.gz
+ nix-prefetch-url --unpack https://github.com/dlang/dmd/archive/refs/tags/v2.113.0.tar.gz
- https://github.com/dlang/dmd/pulls
- version in nixpkgs:
@@ -114,13 +114,13 @@ not yet provided in nixpkgs with gcc12, no attempt made
- https://github.com/D-Programming-GDC/gdc
** build tool
-*** dub ( 1.23.0 -> 1.41.0 )
+*** dub ( 1.23.0 -> 1.42.0 )
- https://code.dlang.org/packages/dub
- https://github.com/dlang/dub
- https://github.com/dlang/dub/releases
- nix-prefetch-url --unpack https://github.com/dlang/dub/archive/refs/tags/v1.41.0.tar.gz
+ nix-prefetch-url --unpack https://github.com/dlang/dub/archive/refs/tags/v1.42.0.tar.gz
- https://github.com/dlang/dub/issues
- version in nixpkgs:
@@ -128,19 +128,19 @@ not yet provided in nixpkgs with gcc12, no attempt made
- dub nixpkg overlay is updated and runs most dub tests correctly
-- dub OK ✓ ( 1.30.0 -> 1.41.0 )
+- dub OK ✓ ( 1.30.0 -> 1.42.0 )
from v1.31.0 requires seeting of pwd in buildPhase else fails to build
packages with nix tools that previous version of dub built;
** tools
-*** dtools OK ✓ ( 2.095.1 -> 2.112.1 )
+*** dtools OK ✓ ( 2.095.1 -> 2.113.0 )
- https://code.dlang.org/packages/dtools
- https://github.com/dlang/tools
- https://github.com/dlang/tools/tags
- nix-prefetch --unpack https://github.com/dlang/tools/archive/refs/tags/v2.112.1.tar.gz
+ nix-prefetch --unpack https://github.com/dlang/tools/archive/refs/tags/v2.113.0.tar.gz
- https://github.com/dlang/tools/issues
- version in nixpkgs
@@ -176,10 +176,10 @@ nix flake update && nix flake check --show-trace && nix flake info && echo "" &&
│ └───x86_64-linux
│ ├───default: development environment 'nix-shell'
│ ├───dsh-nixpkgs-ldc: development environment 'nixpkgs---ldc---dub'
- │ ├───dsh-overlay-dmd: development environment 'overlay_dmd-2.112.1_dub-1.41.0_dtools-2.112.1'
+ │ ├───dsh-overlay-dmd: development environment 'overlay_dmd-2.113.0_dub-1.42.0_dtools-2.113.0'
│ ├───dsh-overlay-dtest-tilix: development environment 'overlay_ldc_dub_tilix_gtkd'
- │ ├───dsh-overlay-dtools: development environment 'overlay_ldc-1.43.0_dub-1.41.0_dtools-2.112.1'
- │ └───dsh-overlay-ldc: development environment 'overlay_ldc-1.43.0_dub-1.41.0_dtools-2.112.1'
+ │ ├───dsh-overlay-dtools: development environment 'overlay_ldc-1.43.0_dub-1.42.0_dtools-2.113.0'
+ │ └───dsh-overlay-ldc: development environment 'overlay_ldc-1.43.0_dub-1.42.0_dtools-2.113.0'
└───packages
└───x86_64-linux
├───check-local-dir-build: package 'dummy-0.1.0'
diff --git a/flake.lock b/flake.lock
index 04b4a49..bd3498c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
- "lastModified": 1787964612,
- "narHash": "sha256-0N9nghg3nwzX6b6qc77EzjR9cu/Z+UR66FlfsCqiURs=",
+ "lastModified": 1790652569,
+ "narHash": "sha256-641r7xrlSOHYoktL9/aArPIYNgZJ9eM5URzSEOtPJDY=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "e8be7818e19ada32105a8af937a6a473b38167ca",
+ "rev": "b6c8664de9b6cc07fe5666a29f91884ba81197c4",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index e59133a..aa6c392 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,9 +19,9 @@
localOverlay = (final: prev: {
ldc = prev.callPackage ./nix-overlays/ldc { }; # -> ok 1.43.0
# dmd overlay: revert to GCC14; (current) GCC 15 introduced nullptr in its headers, and DMD's ImportC parser needs update to handle it, monitor and update:
- dmd = prev.callPackage ./nix-overlays/dmd { stdenv = prev.gcc14Stdenv; }; # -> ok 2.112.1
- dub = prev.callPackage ./nix-overlays/dub { }; # -> ? 1.41.0
- dtools = prev.callPackage ./nix-overlays/dtools { }; # -> ok 2.112.1
+ dmd = prev.callPackage ./nix-overlays/dmd { stdenv = prev.gcc14Stdenv; }; # -> ok 2.113.0
+ dub = prev.callPackage ./nix-overlays/dub { }; # -> ? 1.42.0
+ dtools = prev.callPackage ./nix-overlays/dtools { }; # -> ok 2.113.0
#gdc = prev.callPackage ./nix-overlays/gdc { };
});
pkgsForSystem = system: import nixpkgs {
@@ -79,7 +79,7 @@
in
with pkgs-ovl; {
dsh-overlay-ldc = mkShell {
- name = "overlay_ldc-1.43.0_dub-1.41.0_dtools-2.112.1";
+ name = "overlay_ldc-1.43.0_dub-1.42.0_dtools-2.113.0";
packages = [
ldc
dub
@@ -89,7 +89,7 @@
#inherit shellHook;
};
dsh-overlay-dmd = mkShell {
- name = "overlay_dmd-2.112.1_dub-1.41.0_dtools-2.112.1";
+ name = "overlay_dmd-2.113.0_dub-1.42.0_dtools-2.113.0";
packages = [
dmd
dub
diff --git a/nix-overlays/dmd/package.nix b/nix-overlays/dmd/package.nix
index 1813e46..3a22ef9 100644
--- a/nix-overlays/dmd/package.nix
+++ b/nix-overlays/dmd/package.nix
@@ -1,5 +1,5 @@
import ./generic.nix {
- version = "2.112.1";
- dmdHash = "sha256-UqNNUGoGmOV0lGNCGaFk8HbOE01qD55WuJ8NyQzqLJs=";
- phobosHash = "sha256-CNvDSlerOXh6Qn060MNaSF1IIcbrcZzljyIxkm+TQQ0=";
+ version = "2.113.0";
+ dmdHash = "sha256-ChXm/edLMCshQ/s4Qj1t5QED/Z0qymuPWaqMyfZxP6w=";
+ phobosHash = "sha256-l4EEI5WdNYalqlMqS1uL2i4NlveuPa95ATg6gY1lVvA=";
}
diff --git a/nix-overlays/dtools/package.nix b/nix-overlays/dtools/package.nix
index 12f4086..35a46a5 100644
--- a/nix-overlays/dtools/package.nix
+++ b/nix-overlays/dtools/package.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dtools";
- version = "2.112.1";
+ version = "2.113.0";
src = fetchFromGitHub {
owner = "dlang";
repo = "tools";
rev = "v${finalAttrs.version}";
- hash = "sha256-WHgV33fu1YhRQCERVatqXKEqmfHlUvZ4IXhga/yOQ3w=";
+ hash = "sha256-loXsGNaMH93dw9U2+s9D5xQBbO1aeeAPPS/bSHLJkP4=";
name = "dtools";
};
diff --git a/nix-overlays/dub/package.nix b/nix-overlays/dub/package.nix
index c10fff5..3697395 100644
--- a/nix-overlays/dub/package.nix
+++ b/nix-overlays/dub/package.nix
@@ -13,7 +13,7 @@ assert dcompiler != null;
stdenv.mkDerivation (finalAttrs: {
pname = "dub";
- version = "1.41.0";
+ version = "1.42.0";
enableParallelBuilding = true;
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "dlang";
repo = "dub";
rev = "v${finalAttrs.version}";
- hash = "sha256-86TzaRdu+CFM0Ld2fXxjaUUT9dl37MYPdmsvxE4ZUkE=";
+ hash = "sha256-GHvpssXWVodqj+X9NWVSvpzX0STK76iVTPtH2z5IFOM=";
};
postPatch = ''
diff --git a/org/nix-develop-dlang-shared.org b/org/nix-develop-dlang-shared.org
index a2f656a..b3f23d2 100644
--- a/org/nix-develop-dlang-shared.org
+++ b/org/nix-develop-dlang-shared.org
@@ -69,6 +69,7 @@ sha256-yMJ2OVMzrFaDPn7q8nCBZFRYpL/f0RcHzhmw/i6btJM=
*** tags link
- https://github.com/ldc-developers/ldc/tags
+- https://github.com/ldc-developers/ldc/releases
*** NOTES to update ldc
@@ -330,20 +331,40 @@ sha256-/bs3bwgkLZF5IqaiKnc5gCF/r6MQBG/F1kWUkK8j2s0=
#+NAME: dmd-version
#+BEGIN_SRC org
-<<dmd_version_2_112_1>>
+<<dmd_version_2_113_0>>
#+END_SRC
#+NAME: dmd-hash
#+BEGIN_SRC org
-<<dmd_hash_2_112_1>>
+<<dmd_hash_2_113_0>>
#+END_SRC
#+NAME: phobos-hash
#+BEGIN_SRC org
-<<phobos_hash_2_112_1>>
+<<phobos_hash_2_113_0>>
#+END_SRC
*** versions
+**** 2.113.0 OK ✓
+
+- nix-prefetch-url --unpack https://github.com/dlang/dmd/archive/refs/tags/v2.113.0.tar.gz
+- nix-prefetch-url --unpack https://github.com/dlang/phobos/archive/refs/tags/v2.113.0.tar.gz
+
+#+NAME: dmd_version_2_113_0
+#+BEGIN_SRC nix
+2.113.0
+#+END_SRC
+
+#+NAME: phobos_hash_2_113_0
+#+BEGIN_SRC nix
+sha256-l4EEI5WdNYalqlMqS1uL2i4NlveuPa95ATg6gY1lVvA=
+#+END_SRC
+
+#+NAME: dmd_hash_2_113_0
+#+BEGIN_SRC nix
+sha256-ChXm/edLMCshQ/s4Qj1t5QED/Z0qymuPWaqMyfZxP6w=
+#+END_SRC
+
**** 2.112.1 OK ✓
- nix-prefetch-url --unpack https://github.com/dlang/dmd/archive/refs/tags/v2.112.1.tar.gz
@@ -549,15 +570,30 @@ sha256-yRL9ub3u4mREG9PVxBvgQ/LDXD57RadPTZ2h08qyh/s=
#+NAME: dub-version
#+HEADER: :noweb yes
#+BEGIN_SRC org
-<<dub_version_1_41_0>>
+<<dub_version_1_42_0>>
#+END_SRC
#+NAME: dub-hash
#+BEGIN_SRC org
-<<dub_hash_1_41_0>>
+<<dub_hash_1_42_0>>
#+END_SRC
*** versions
+**** 1.42 OK ✓
+***** 1.42.0
+
+- nix-prefetch-url --unpack https://github.com/dlang/dub/archive/refs/tags/v1.42.0.tar.gz
+
+#+NAME: dub_version_1_42_0
+#+BEGIN_SRC nix
+1.42.0
+#+END_SRC
+
+#+NAME: dub_hash_1_42_0
+#+BEGIN_SRC nix
+sha256-GHvpssXWVodqj+X9NWVSvpzX0STK76iVTPtH2z5IFOM=
+#+END_SRC
+
**** 1.41 OK ✓
***** 1.41.0
@@ -715,15 +751,29 @@ sha256-5pW3Fu3PQ1ZLJnsuh7fPpEBNbVQgGfFyiuMrAVOJKQA=
#+NAME: dtools-version
#+BEGIN_SRC org
-<<dtools_version_2_112_1>>
+<<dtools_version_2_113_0>>
#+END_SRC
#+NAME: dtools-hash
#+BEGIN_SRC org
-<<dtools_hash_2_112_1>>
+<<dtools_hash_2_113_0>>
#+END_SRC
*** versions
+**** 2.113.0 OK ✓
+
+- https://github.com/dlang/tools/releases/tag/v2.113.0
+
+#+NAME: dtools_version_2_113_0
+#+BEGIN_SRC nix
+2.113.0
+#+END_SRC
+
+#+NAME: dtools_hash_2_113_0
+#+BEGIN_SRC nix
+sha256-loXsGNaMH93dw9U2+s9D5xQBbO1aeeAPPS/bSHLJkP4=
+#+END_SRC
+
**** 2.112.1 OK ✓
- https://github.com/dlang/tools/releases/tag/v2.112.1
diff --git a/shell.nix b/shell.nix
index 6cf37af..a12240c 100755
--- a/shell.nix
+++ b/shell.nix
@@ -5,13 +5,13 @@ let
ldc = pkgs-nix.callPackage ./nix-overlays/ldc {}; # -> 1.43.0
# dmd overlay reverts to gcc14Stdenv; gcc15 introduced nullptr in its headers
# and DMD's ImportC parser needs update to handle it. Monitor and update.
- dmd = pkgs-nix.callPackage ./nix-overlays/dmd { stdenv = pkgs-nix.gcc14Stdenv; }; # -> 2.112.1
- dub = pkgs-nix.callPackage ./nix-overlays/dub { inherit ldc; }; # -> 1.41.0
- dtools = pkgs-nix.callPackage ./nix-overlays/dtools { inherit ldc; }; # -> 2.112.1'
+ dmd = pkgs-nix.callPackage ./nix-overlays/dmd { stdenv = pkgs-nix.gcc14Stdenv; }; # -> 2.113.0
+ dub = pkgs-nix.callPackage ./nix-overlays/dub { inherit ldc; }; # -> 1.42.0
+ dtools = pkgs-nix.callPackage ./nix-overlays/dtools { inherit ldc; }; # -> 2.113.0'
in
with pkgs-nix;
mkShell {
- name = "overlay_ldc-1.43.0_dub-1.41.0_dtools-2.112.1";
+ name = "overlay_ldc-1.43.0_dub-1.42.0_dtools-2.113.0";
buildInputs = [
# ❯❯❯ nix_related
#nix
generated by cgit v1.2.3 (git 2.25.1) at 2026-11-05 03:07:44 +0000