flake.nix dmd build fix overlay: revert to GCC14

- revert to using GCC14: (current) GCC 15
  introduced nullptr in its headers, and DMD's
  ImportC parser needs update to handle it,
  monitor and update

- (nix ldc overlay, minor comsetic)

6 files changed, 31 insertions, 77 deletions

diff --git a/flake.lock b/flake.lock
index d98f5a2..02cec2f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1773628058,
-        "narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=",
+        "lastModified": 1775701739,
+        "narHash": "sha256-2FWWY1rr/+pGUJK1npcVcsWNEblzmKs6VxD3VEvwJSs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df",
+        "rev": "0f7663154ff2fec150f9dbf5f81ec2785dc1e0db",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index d2bf33b..a172369 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,10 +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
-      dmd = prev.callPackage ./nix-overlays/dmd {  };       # -> ok 2.111.0
-      dub = prev.callPackage ./nix-overlays/dub {  };       # -> ? 1.40.0
-      dtools = prev.callPackage ./nix-overlays/dtools {  }; # -> ok 2.110.0
+      ldc = prev.callPackage ./nix-overlays/ldc {  };                           # -> ok 1.42.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.111.0
+      dub = prev.callPackage ./nix-overlays/dub {  };                           # -> ? 1.40.0
+      dtools = prev.callPackage ./nix-overlays/dtools {  };                     # -> ok 2.110.0
       #gdc = prev.callPackage ./nix-overlays/gdc {  };
     });
     pkgsForSystem = system: import nixpkgs {
@@ -97,7 +98,9 @@
       default = self.packages.${system}.spine-nixpkgs-ldc;
       spine-nixpkgs-dmd = mkSpine {
         pkgs = pkgs-nix;
-        compilerPkg = pkgs-nix.dmd;
+        # nixpkgs dmd: revert to GCC14 (same nullptr/ImportC fix as overlay dmd)
+        compilerPkg = pkgs-nix.dmd.override { stdenv = pkgs-nix.gcc14Stdenv; };
+        #compilerPkg = pkgs-nix.dmd;
         compilerBin = "dmd";
         buildType = "dmd";
       };
@@ -146,7 +149,9 @@
       dsh-nixpkgs-dmd = mkDevShell {
         pkgs = pkgs-nix;
         name = "spine-${version} dev shell (nixpkgs dmd)";
-        compiler = pkgs-nix.dmd;
+        # nixpkgs dmd: revert to GCC14 (same nullptr/ImportC fix as overlay dmd)
+        compiler = pkgs-nix.dmd.override { stdenv = pkgs-nix.gcc14Stdenv; };
+        #compiler = pkgs-nix.dmd;
       };
       dsh-nixpkgs-ldc = mkDevShell {
         pkgs = pkgs-nix;
diff --git a/nix-overlays/ldc/package.nix b/nix-overlays/ldc/package.nix
index 75eb898..b5daa75 100644
--- a/nix-overlays/ldc/package.nix
+++ b/nix-overlays/ldc/package.nix
@@ -138,6 +138,8 @@ stdenv.mkDerivation (finalAttrs: {
     find $out/bin -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${ldcBootstrap} '{}' +
   '';
 
+  # doCheck = false;
+
   disallowedReferences = [ ldcBootstrap ];
 
   meta = with lib; {
@@ -181,6 +183,6 @@ stdenv.mkDerivation (finalAttrs: {
       no-references-to-compiler = helloWorld.overrideAttrs {
         disallowedReferences = [ ldc ];
         dFlags = ["-g"];
+      };
     };
-  };
 })
diff --git a/org/config_nix.org b/org/config_nix.org
index 7d1f6a7..eba0917 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -35,10 +35,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 <<ldc_version>>
-      dmd = prev.callPackage ./nix-overlays/dmd {  };       # -> ok <<dmd_version>>
-      dub = prev.callPackage ./nix-overlays/dub {  };       # -> ? <<dub_version>>
-      dtools = prev.callPackage ./nix-overlays/dtools {  }; # -> ok <<dtools_version>>
+      ldc = prev.callPackage ./nix-overlays/ldc {  };                           # -> ok <<ldc_version>>
+      # 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 <<dmd_version>>
+      dub = prev.callPackage ./nix-overlays/dub {  };                           # -> ? <<dub_version>>
+      dtools = prev.callPackage ./nix-overlays/dtools {  };                     # -> ok <<dtools_version>>
       #gdc = prev.callPackage ./nix-overlays/gdc {  };
     });
     pkgsForSystem = system: import nixpkgs {
@@ -120,7 +121,9 @@
       default = self.packages.${system}.spine-nixpkgs-ldc;
       spine-nixpkgs-dmd = mkSpine {
         pkgs = pkgs-nix;
-        compilerPkg = pkgs-nix.dmd;
+        # nixpkgs dmd: revert to GCC14 (same nullptr/ImportC fix as overlay dmd)
+        compilerPkg = pkgs-nix.dmd.override { stdenv = pkgs-nix.gcc14Stdenv; };
+        #compilerPkg = pkgs-nix.dmd;
         compilerBin = "dmd";
         buildType = "dmd";
       };
@@ -169,7 +172,9 @@
       dsh-nixpkgs-dmd = mkDevShell {
         pkgs = pkgs-nix;
         name = "spine-${version} dev shell (nixpkgs dmd)";
-        compiler = pkgs-nix.dmd;
+        # nixpkgs dmd: revert to GCC14 (same nullptr/ImportC fix as overlay dmd)
+        compiler = pkgs-nix.dmd.override { stdenv = pkgs-nix.gcc14Stdenv; };
+        #compiler = pkgs-nix.dmd;
       };
       dsh-nixpkgs-ldc = mkDevShell {
         pkgs = pkgs-nix;
diff --git a/org/nix-develop-dlang-shared.org b/org/nix-develop-dlang-shared.org
index 005d7f7..d11b752 100644
--- a/org/nix-develop-dlang-shared.org
+++ b/org/nix-develop-dlang-shared.org
@@ -63,66 +63,6 @@ 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
diff --git a/org/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org
index f4af7cb..dc8291f 100644
--- a/org/nixpkgs_overlays_d_related.org
+++ b/org/nixpkgs_overlays_d_related.org
@@ -655,6 +655,8 @@ stdenv.mkDerivation (finalAttrs: {
     find $out/bin -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${ldcBootstrap} '{}' +
   '';
 
+  # doCheck = false;
+
   disallowedReferences = [ ldcBootstrap ];
 
   meta = with lib; {
@@ -698,8 +700,8 @@ stdenv.mkDerivation (finalAttrs: {
       no-references-to-compiler = helloWorld.overrideAttrs {
         disallowedReferences = [ ldc ];
         dFlags = ["-g"];
+      };
     };
-  };
 })
 #+END_SRC