dmd-2.111.0HEADmain

7 files changed, 31 insertions, 27 deletions

diff --git a/README b/README
index 917aa92..bc6d79c 100644
--- a/README
+++ b/README
@@ -39,7 +39,7 @@ nix overlays for (updates nixpkgs, more recent versions of):
   - dub     ( 1.23.0 -> 1.39.0 ) [for nix versions 1.31.0 ... 1.33.0 broken]
   - dtools  ( 2.095.1 -> 2.110.0 )
 
-  - dmd     ( 2.100.2 -> 2.110.0 )
+  - dmd     ( 2.100.2 -> 2.111.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.110.0 )
+*** dmd OK ✓ ( 2.100.2 -> 2.111.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.110.0.tar.gz
+    nix-prefetch-url --unpack https://github.com/dlang/dmd/archive/refs/tags/v2.111.0.tar.gz
   - https://github.com/dlang/dmd/pulls
 
 - version in nixpkgs:
diff --git a/flake.lock b/flake.lock
index 0f8fa66..dca1b19 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1742578646,
-        "narHash": "sha256-GiQ40ndXRnmmbDZvuv762vS+gew1uDpFwOfgJ8tLiEs=",
+        "lastModified": 1743568003,
+        "narHash": "sha256-ZID5T65E8ruHqWRcdvZLsczWDOAWIE7om+vQOREwiX0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "94c4dbe77c0740ebba36c173672ca15a7926c993",
+        "rev": "b7ba7f9f45c5cd0d8625e9e217c28f8eb6a19a76",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 0f00540..d045f9e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,7 +22,7 @@
     '';
     localOverlay = (final: prev: {
       ldc = prev.callPackage ./nix-overlays/ldc {  };       # -> ok 1.40.1
-      dmd = prev.callPackage ./nix-overlays/dmd {  };       # -> ok 2.110.0
+      dmd = prev.callPackage ./nix-overlays/dmd {  };       # -> ok 2.111.0
       dub = prev.callPackage ./nix-overlays/dub {  };       # -> ? 1.39.0
       dtools = prev.callPackage ./nix-overlays/dtools {  }; # -> ok 2.110.0
       #gdc = prev.callPackage ./nix-overlays/gdc {  };      # empty
@@ -109,7 +109,7 @@
           inherit shellHook;
         };
         dsh-overlay-dmd-dub = mkShell {
-          name = "overlay - dmd-2.110.0 - dub-1.39.0 - dtools-2.110.0";
+          name = "overlay - dmd-2.111.0 - dub-1.39.0 - dtools-2.110.0";
           inherit shell;
           inherit devEnv;
           packages = [
diff --git a/nix-overlays/dmd/generic.nix b/nix-overlays/dmd/generic.nix
index e130d69..59a781e 100644
--- a/nix-overlays/dmd/generic.nix
+++ b/nix-overlays/dmd/generic.nix
@@ -96,7 +96,9 @@ stdenv.mkDerivation (finalAttrs: {
     rm dmd/compiler/test/runnable/gdb4149.d
     rm dmd/compiler/test/runnable/gdb4181.d
     rm dmd/compiler/test/compilable/ddocYear.d
-    rm dmd/compiler/test/fail_compilation/needspkgmod.d
+    rm dmd/compiler/test/compilable/sarif_success_test.d
+    rm dmd/compiler/test/fail_compilation/sarif_test.d
+    rm dmd/compiler/test/fail_compilation/sarifmultiple_test.d
 
     # Disable tests that rely on objdump whitespace until fixed upstream:
     #   https://issues.dlang.org/show_bug.cgi?id=23317
@@ -108,9 +110,9 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace dmd/compiler/test/dshell/test6952.d --replace-fail "/usr/bin/env bash" "${bash}/bin/bash"
   '' + lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace phobos/std/socket.d --replace-fail "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace phobos/std/socket.d --replace-fail "foreach (name; names)" "names = []; foreach (name; names)"
-  '';
+  ''; # + lib.optionalString stdenv.hostPlatform.isDarwin ''
+  #  substituteInPlace phobos/std/socket.d --replace-fail "foreach (name; names)" "names = []; foreach (name; names)"
+  #'';
 
   nativeBuildInputs = [
     makeWrapper
diff --git a/nix-overlays/dmd/package.nix b/nix-overlays/dmd/package.nix
index 69a9f75..3aa1183 100644
--- a/nix-overlays/dmd/package.nix
+++ b/nix-overlays/dmd/package.nix
@@ -1,5 +1,5 @@
 import ./generic.nix {
-  version = "2.110.0";
-  dmdHash = "sha256-icXp9xWF2AI2gp7z/lQFAChmXfQePe9b5pbpQ9Mn19Y=";
-  phobosHash = "sha256-CmJpcHM+sIsaYBlpALCFoQFG+93s8gUyWmM0tYqjXkk=";
+  version = "2.111.0";
+  dmdHash = "sha256-2bjsGa9nTny818dLRV6LKkes+Ycq8W+PFjwhGVrD5TM=";
+  phobosHash = "sha256-9jySZbODoL8sULhYKj/l4+c/uiG5xY2dO240k9XQtPk=";
 }
diff --git a/org/dlang-nix-flakes.org b/org/dlang-nix-flakes.org
index 8318729..aeb87ea 100644
--- a/org/dlang-nix-flakes.org
+++ b/org/dlang-nix-flakes.org
@@ -1043,7 +1043,9 @@ stdenv.mkDerivation (finalAttrs: {
     rm dmd/compiler/test/runnable/gdb4149.d
     rm dmd/compiler/test/runnable/gdb4181.d
     rm dmd/compiler/test/compilable/ddocYear.d
-    rm dmd/compiler/test/fail_compilation/needspkgmod.d
+    rm dmd/compiler/test/compilable/sarif_success_test.d
+    rm dmd/compiler/test/fail_compilation/sarif_test.d
+    rm dmd/compiler/test/fail_compilation/sarifmultiple_test.d
 
     # Disable tests that rely on objdump whitespace until fixed upstream:
     #   https://issues.dlang.org/show_bug.cgi?id=23317
@@ -1055,9 +1057,9 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace dmd/compiler/test/dshell/test6952.d --replace-fail "/usr/bin/env bash" "${bash}/bin/bash"
   '' + lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace phobos/std/socket.d --replace-fail "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace phobos/std/socket.d --replace-fail "foreach (name; names)" "names = []; foreach (name; names)"
-  '';
+  ''; # + lib.optionalString stdenv.hostPlatform.isDarwin ''
+  #  substituteInPlace phobos/std/socket.d --replace-fail "foreach (name; names)" "names = []; foreach (name; names)"
+  #'';
 
   nativeBuildInputs = [
     makeWrapper
diff --git a/org/nix-develop-dlang-shared.org b/org/nix-develop-dlang-shared.org
index f0a7aac..e40403d 100644
--- a/org/nix-develop-dlang-shared.org
+++ b/org/nix-develop-dlang-shared.org
@@ -246,38 +246,38 @@ sha256-/bs3bwgkLZF5IqaiKnc5gCF/r6MQBG/F1kWUkK8j2s0=
 
 #+NAME: dmd-version
 #+BEGIN_SRC org
-<<dmd_version_2_110_0>>
+<<dmd_version_2_111_0>>
 #+END_SRC
 
 #+NAME: dmd-hash
 #+BEGIN_SRC org
-<<dmd_hash_2_110_0>>
+<<dmd_hash_2_111_0>>
 #+END_SRC
 
 #+NAME: phobos-hash
 #+BEGIN_SRC org
-<<phobos_hash_2_110_0>>
+<<phobos_hash_2_111_0>>
 #+END_SRC
 
 *** versions
 **** 2.111.0 OK ✓
 
-- nix-prefetch-url --unpack https://github.com/dlang/dmd/archive/refs/tags/v2.111.0-beta.1.tar.gz
-- nix-prefetch-url --unpack https://github.com/dlang/phobos/archive/refs/tags/v2.111.0-beta.1.tar.gz
+- nix-prefetch-url --unpack https://github.com/dlang/dmd/archive/refs/tags/v2.111.0.tar.gz
+- nix-prefetch-url --unpack https://github.com/dlang/phobos/archive/refs/tags/v2.111.0.tar.gz
 
 #+NAME: dmd_version_2_111_0
 #+BEGIN_SRC nix
-2.111.0-beta.1
+2.111.0
 #+END_SRC
 
 #+NAME: phobos_hash_2_111_0
 #+BEGIN_SRC nix
-sha256-yPmstS52J0BboR++9nYaeUq2mAJrFuUjxxi2BGgGCUY=
+sha256-9jySZbODoL8sULhYKj/l4+c/uiG5xY2dO240k9XQtPk=
 #+END_SRC
 
 #+NAME: dmd_hash_2_111_0
 #+BEGIN_SRC nix
-sha256-MfGcno6o+GXZTWyWZ0kGYtMcMPuj2VgQd5I+nPKz1I4=
+sha256-2bjsGa9nTny818dLRV6LKkes+Ycq8W+PFjwhGVrD5TM=
 #+END_SRC
 
 **** 2.110.0 OK ✓