From 0dafb8b4f0e3fe6b7fb00a7c06ddb1e24c85d5ff Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Wed, 2 Apr 2025 15:10:51 -0400
Subject: dmd-2.111.0

---
 org/nix-develop-dlang-shared.org   | 16 ++++++++--------
 org/nixpkgs_overlays_d_related.org | 10 ++++++----
 2 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'org')

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 ✓
diff --git a/org/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org
index 14d2383..f79d3e2 100644
--- a/org/nixpkgs_overlays_d_related.org
+++ b/org/nixpkgs_overlays_d_related.org
@@ -944,7 +944,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
@@ -956,9 +958,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
-- 
cgit v1.2.3