diff options
| author | Ralph Amissah <ralph.amissah@gmail.com> | 2026-10-01 10:45:21 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph.amissah@gmail.com> | 2026-10-01 11:08:43 -0400 |
| commit | bbc3803918a4ac4b82902afd38136ac78e492c32 (patch) | |
| tree | 06c4b2f12c0a9b8d6e7a083d7ceef96230d02f18 | |
| parent | nix devshell: transient fix re broken nixpkgs (diff) | |
dlang related overlay updates
- dmd 2.113.0
- dtools 2.113.0
- dub 1.42.0
- ldc 1.43.0 (unchanged)
| -rw-r--r-- | .envrc-nix | 2 | ||||
| -rw-r--r-- | flake.nix | 12 | ||||
| -rw-r--r-- | nix-overlays/README | 20 | ||||
| -rw-r--r-- | nix-overlays/dmd/package.nix | 6 | ||||
| -rw-r--r-- | nix-overlays/dtools/package.nix | 4 | ||||
| -rw-r--r-- | nix-overlays/dub/package.nix | 4 | ||||
| -rw-r--r-- | org/nix-develop-dlang-shared.org | 64 |
7 files changed, 81 insertions, 31 deletions
@@ -27,7 +27,7 @@ echo ' • nix develop using nixpkgs ❯❯ nix develop ".#dsh-nixpkgs-dmd" --print-build-logs -c zsh ❯❯ nix develop ".#dsh-nixpkgs-ldc" --print-build-logs -c zsh - • nix develop using package overlays: (dmd-2.112.1, ldc-1.43.0, dub-1.41.0, dtools-2.112.1) + • nix develop using package overlays: (dmd-2.113.0, ldc-1.43.0, dub-1.42.0, dtools-2.113.0) ❯❯ nix develop ".#dsh-overlay-dmd" --print-build-logs -c zsh ❯❯ nix develop ".#dsh-overlay-ldc" --print-build-logs -c zsh ❯❯ nix flake show @@ -14,9 +14,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 { @@ -144,7 +144,7 @@ #default = import ./shell.nix {pkgs = pkgs-nix; flake = self;}; dsh-overlay = mkDevShell { pkgs = pkgs-ovl; - # "spine-0.25.1 base dev shell, ldc-1.43.0, dub-1.41.0 - dtools-2.112.1"; + # "spine-0.25.1 base dev shell, ldc-1.43.0, dub-1.42.0 - dtools-2.113.0"; name = "spine-${version} dev shell (overlay ldc)"; compiler = pkgs-ovl.ldc; }; @@ -162,13 +162,13 @@ }; dsh-overlay-dmd = mkDevShell { pkgs = pkgs-ovl; - # "spine-0.25.1 base dev shell, dmd-2.112.1, dub-1.41.0 - dtools-2.112.1"; + # "spine-0.25.1 base dev shell, dmd-2.113.0, dub-1.42.0 - dtools-2.113.0"; name = "spine-${version} dev shell (overlay dmd)"; compiler = pkgs-ovl.dmd; }; dsh-overlay-ldc = mkDevShell { pkgs = pkgs-ovl; - # "spine-0.25.1 base dev shell, ldc-1.43.0, dub-1.41.0 - dtools-2.112.1"; + # "spine-0.25.1 base dev shell, ldc-1.43.0, dub-1.42.0 - dtools-2.113.0"; name = "spine-${version} dev shell (overlay ldc)"; compiler = pkgs-ovl.ldc; }; diff --git a/nix-overlays/README b/nix-overlays/README index 34d4a68..dd2ee19 100644 --- a/nix-overlays/README +++ b/nix-overlays/README @@ -17,10 +17,10 @@ of publishing, in some cases with additional fixes. 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.106.1 -> 2.112.1 ) + - dmd ( 2.106.1 -> 2.113.0 ) - gdc [not yet available] dlang-nix-flakes.org --❯ @@ -59,14 +59,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: @@ -88,13 +88,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: @@ -102,19 +102,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 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 75161a0..c2c2e42 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 @@ -332,20 +333,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 @@ -551,15 +572,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 @@ -717,15 +753,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 |
