From 83ccf32c597a9384a2c8f9ac76080a9813c08137 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 28 Aug 2026 20:14:05 -0400 Subject: dlang overlays upkeep touch --- .envrc-nix | 2 +- flake.nix | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.envrc-nix b/.envrc-nix index f35a7ed..dad989d 100644 --- a/.envrc-nix +++ b/.envrc-nix @@ -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.111.0, ldc-1.42.0, dub-1.40.0, dtools-2.110.0) + • nix develop using package overlays: (dmd-2.112.1, ldc-1.43.0-beta1, dub-1.41.0, dtools-2.112.1) ❯❯ nix develop ".#dsh-overlay-dmd" --print-build-logs -c zsh ❯❯ nix develop ".#dsh-overlay-ldc" --print-build-logs -c zsh ❯❯ nix flake show diff --git a/flake.nix b/flake.nix index 3c5f0d9..7a63d64 100644 --- a/flake.nix +++ b/flake.nix @@ -12,11 +12,11 @@ forAllSystems = nixpkgs.lib.genAttrs supportedSystems; nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;}); # nixpkgs instantiated for supported system types localOverlay = (final: prev: { - ldc = prev.callPackage ./nix-overlays/ldc { }; # -> ok 1.42.0 + ldc = prev.callPackage ./nix-overlays/ldc { }; # -> ok 1.43.0-beta1 # 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.111.0 - dub = prev.callPackage ./nix-overlays/dub { }; # -> ? 1.40.0 - dtools = prev.callPackage ./nix-overlays/dtools { }; # -> ok 2.110.0 + 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 #gdc = prev.callPackage ./nix-overlays/gdc { }; }); pkgsForSystem = system: import nixpkgs { @@ -143,7 +143,7 @@ #default = import ./shell.nix {pkgs = pkgs-nix; flake = self;}; dsh-overlay = mkDevShell { pkgs = pkgs-ovl; - # "spine-0.22.0 base dev shell, ldc-1.42.0, dub-1.40.0 - dtools-2.110.0"; + # "spine-0.22.0 base dev shell, ldc-1.43.0-beta1, dub-1.41.0 - dtools-2.112.1"; name = "spine-${version} dev shell (overlay ldc)"; compiler = pkgs-ovl.ldc; }; @@ -161,13 +161,13 @@ }; dsh-overlay-dmd = mkDevShell { pkgs = pkgs-ovl; - # "spine-0.22.0 base dev shell, dmd-2.111.0, dub-1.40.0 - dtools-2.110.0"; + # "spine-0.22.0 base dev shell, dmd-2.112.1, dub-1.41.0 - dtools-2.112.1"; name = "spine-${version} dev shell (overlay dmd)"; compiler = pkgs-ovl.dmd; }; dsh-overlay-ldc = mkDevShell { pkgs = pkgs-ovl; - # "spine-0.22.0 base dev shell, ldc-1.42.0, dub-1.40.0 - dtools-2.110.0"; + # "spine-0.22.0 base dev shell, ldc-1.43.0-beta1, dub-1.41.0 - dtools-2.112.1"; name = "spine-${version} dev shell (overlay ldc)"; compiler = pkgs-ovl.ldc; }; -- cgit v1.2.3