dlang related nixpkgs overlay updates

- dmd 2.112.1
- ldc 1.43.0 beta1
- dub 1.41.0
- dtools 2.112.1

9 files changed, 80 insertions, 40 deletions

diff --git a/nix-overlays/dmd/binary.nix b/nix-overlays/dmd/binary.nix
index baca4dd..e53ccb4 100644
--- a/nix-overlays/dmd/binary.nix
+++ b/nix-overlays/dmd/binary.nix
@@ -82,6 +82,9 @@ stdenv.mkDerivation {
     license = licenses.boost;
     maintainers = [ maintainers.lionello ];
     homepage = "https://dlang.org/";
-    platforms = [ "x86_64-darwin" "i686-linux" "x86_64-linux" ];
+    platforms = [
+      "i686-linux"
+      "x86_64-linux"
+    ];
   };
 }
diff --git a/nix-overlays/dmd/generic.nix b/nix-overlays/dmd/generic.nix
index aabbf52..bfe24b4 100644
--- a/nix-overlays/dmd/generic.nix
+++ b/nix-overlays/dmd/generic.nix
@@ -31,14 +31,15 @@ let
     name = "dmd.conf";
     text = (lib.generators.toINI { } {
       Environment = {
-        DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}'';
+        DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${
+          lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"
+        }'';
       };
     });
   };
 
-  bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
-  osname = if stdenv.hostPlatform.isDarwin then "osx"
-    else stdenv.hostPlatform.parsed.kernel.name;
+  bits = toString stdenv.hostPlatform.parsed.cpu.bits;
+  osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name;
 
   pathToDmd = "\${NIX_BUILD_TOP}/dmd/generated/${osname}/release/${bits}/dmd";
 in
@@ -95,9 +96,6 @@ 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/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
@@ -174,6 +172,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     NIX_ENFORCE_PURITY= \
       make -C phobos unittest -j$checkJobs $checkFlags \
+        DISABLED_TESTS=std/datetime/timezone \
         DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$PWD"
 
     runHook postCheck
@@ -220,7 +219,10 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.boost;
     mainProgram = "dmd";
     maintainers = with maintainers; [ lionello dukc jtbx ];
-    platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+    platforms = [
+      "x86_64-linux"
+      "i686-linux"
+    ];
     # ld: section __DATA/__thread_bss has type zero-fill but non-zero file offset file '/private/tmp/nix-build-dmd-2.109.1.drv-0/.rdmd-301/rdmd-build.d-A1CF043A7D87C5E88A58F3C0EF5A0DF7/objs/build.o' for architecture x86_64
     # clang-16: error: linker command failed with exit code 1 (use -v to see invocation)
     broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
diff --git a/nix-overlays/dmd/package.nix b/nix-overlays/dmd/package.nix
index 3aa1183..1813e46 100644
--- a/nix-overlays/dmd/package.nix
+++ b/nix-overlays/dmd/package.nix
@@ -1,5 +1,5 @@
 import ./generic.nix {
-  version = "2.111.0";
-  dmdHash = "sha256-2bjsGa9nTny818dLRV6LKkes+Ycq8W+PFjwhGVrD5TM=";
-  phobosHash = "sha256-9jySZbODoL8sULhYKj/l4+c/uiG5xY2dO240k9XQtPk=";
+  version = "2.112.1";
+  dmdHash = "sha256-UqNNUGoGmOV0lGNCGaFk8HbOE01qD55WuJ8NyQzqLJs=";
+  phobosHash = "sha256-CNvDSlerOXh6Qn060MNaSF1IIcbrcZzljyIxkm+TQQ0=";
 }
diff --git a/nix-overlays/dtools/disabled-tests.diff b/nix-overlays/dtools/disabled-tests.diff
index a22825a..79eb1cb 100644
--- a/nix-overlays/dtools/disabled-tests.diff
+++ b/nix-overlays/dtools/disabled-tests.diff
@@ -3,7 +3,7 @@
 @@ -616,7 +616,7 @@ void runTests(string rdmdApp, string compiler, string model)
          enforce(res.status == 1, res.output);
      }
- 
+
 -    version (Posix)
 +    version (none)
      {
diff --git a/nix-overlays/dtools/fix-ldc-arm64.diff b/nix-overlays/dtools/fix-ldc-arm64.diff
index 66eaa22..1c650a6 100644
--- a/nix-overlays/dtools/fix-ldc-arm64.diff
+++ b/nix-overlays/dtools/fix-ldc-arm64.diff
@@ -82,21 +82,21 @@ Adapted from https://github.com/dlang/tools/commit/6c6a042d1b08e3ec1790bd07a7f69
 @@ -9,9 +9,8 @@ DUB=dub
  WITH_DOC = no
  DOC = ../dlang.org
- 
+
 -# Load operating system $(OS) (e.g. linux, osx, ...) and $(MODEL) (e.g. 32, 64) detection Makefile from dmd
 -$(shell [ ! -d $(DMD_DIR) ] && git clone --depth=1 https://github.com/dlang/dmd $(DMD_DIR))
 -include $(DMD_DIR)/compiler/src/osmodel.mak
 +# Load operating system $(OS) (e.g. linux, osx, ...) and $(MODEL) (e.g. 32, 64) detection Makefile
 +include osmodel.mak
- 
+
  ifeq (windows,$(OS))
      DOTEXE:=.exe
 @@ -30,7 +29,7 @@ DFLAGS = $(MODEL_FLAG) $(if $(findstring windows,$(OS)),,-fPIC) -preview=dip1000
  DFLAGS += $(WARNINGS)
- 
+
  # Default DUB flags (DUB uses a different architecture format)
 -DUBFLAGS = --arch=$(subst 32,x86,$(subst 64,x86_64,$(MODEL)))
 +DUBFLAGS = --arch=$(ARCH)
- 
+
  TOOLS = \
      $(ROOT)/catdoc$(DOTEXE) \
diff --git a/nix-overlays/dtools/package.nix b/nix-overlays/dtools/package.nix
index 2e72b44..12f4086 100644
--- a/nix-overlays/dtools/package.nix
+++ b/nix-overlays/dtools/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dtools";
-  version = "2.110.0";
+  version = "2.112.1";
 
   src = fetchFromGitHub {
     owner = "dlang";
     repo = "tools";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-xMEHnrstL5hAkhp8+/z1I2KZWZ7eztWZnUGLTKCfbBI=";
+    hash = "sha256-WHgV33fu1YhRQCERVatqXKEqmfHlUvZ4IXhga/yOQ3w=";
     name = "dtools";
   };
 
diff --git a/nix-overlays/dub/package.nix b/nix-overlays/dub/package.nix
index 4d63f2d..c10fff5 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.40.0";
+  version = "1.41.0";
 
   enableParallelBuilding = true;
 
@@ -21,14 +21,18 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "dlang";
     repo = "dub";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-OirchEKf66gis70gCSTOYcrHLyHhCsyt/rTEGT83Vcc=";
+    hash = "sha256-86TzaRdu+CFM0Ld2fXxjaUUT9dl37MYPdmsvxE4ZUkE=";
   };
 
   postPatch = ''
     patchShebangs test
   '';
 
-  nativeBuildInputs = [ dcompiler libevent rsync ];
+  nativeBuildInputs = [
+    dcompiler
+    libevent
+    rsync
+  ];
   buildInputs = [ curl ];
 
   preBuild = ''
@@ -88,6 +92,11 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.mit;
     mainProgram = "dub";
     maintainers = with maintainers; [ jtbx ];
-    platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+    platforms = [
+      "x86_64-linux"
+      "i686-linux"
+      "aarch64-linux"
+      "aarch64-darwin"
+    ];
   };
 })
diff --git a/nix-overlays/ldc/bootstrap.nix b/nix-overlays/ldc/bootstrap.nix
index f166568..03e7ad4 100644
--- a/nix-overlays/ldc/bootstrap.nix
+++ b/nix-overlays/ldc/bootstrap.nix
@@ -13,13 +13,12 @@ let
   inherit (stdenv) hostPlatform;
   OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name;
   ARCH = if hostPlatform.isDarwin && hostPlatform.isAarch64 then "arm64" else hostPlatform.parsed.cpu.name;
-  version = "1.41.0";
+  version = "1.42.0";
   hashes = {
-    # Get these from `nix store prefetch-file https://github.com/ldc-developers/ldc/releases/download/v1.41.0/ldc2-1.41.0-osx-x86_64.tar.xz` etc..
-    osx-x86_64 = "sha256-W8/0i2PFakXbqs2wxb3cjqa+htSgx7LHyDGOBH9yEYE=";
-    linux-x86_64 = "sha256-SkOUV/D+WeadAv1rV1Sfw8h60PVa2fueQlB7b44yfI8=";
-    linux-aarch64 = "sha256-HEuVChPVM3ntT1ZDZsJ+xW1iYeIWhogNcMdIaz6Me6g=";
-    osx-arm64 = "sha256-FXJnBC8QsEchBhkxSqcZtPC/iHYB6TscY0qh7LPFRuQ=";
+    # Get these from `nix store prefetch-file https://github.com/ldc-developers/ldc/releases/download/v1.42.0/ldc2-1.41.0-osx-x86_64.tar.xz` etc..
+    linux-x86_64 = "sha256-p7yclWE49VjK35yWI1L1nUHIDfbrOuP4A58lvhSmkwM=";
+    linux-aarch64 = "sha256-aHcHw+IP+RBSjrLZLyepjLCWAoTeOwJua/IChKwchRE=";
+    osx-arm64 = "sha256-emjiHFMFdmp09HNsyJGnlC23hCqSJmIyCVBLyFxwE4I=";
   };
 in stdenv.mkDerivation {
   pname = "ldc-bootstrap";
@@ -52,8 +51,18 @@ in stdenv.mkDerivation {
     description = "LLVM-based D Compiler";
     homepage = "https://github.com/ldc-developers/ldc";
     # from https://github.com/ldc-developers/ldc/blob/master/LICENSE
-    license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ];
+    license = with licenses; [
+      bsd3
+      boost
+      mit
+      ncsa
+      gpl2Plus
+    ];
     maintainers = with maintainers; [ lionello ];
-    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "aarch64-darwin"
+    ];
   };
 }
diff --git a/nix-overlays/ldc/package.nix b/nix-overlays/ldc/package.nix
index 75eb898..5439e27 100644
--- a/nix-overlays/ldc/package.nix
+++ b/nix-overlays/ldc/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   callPackage,
   makeWrapper,
   removeReferencesTo,
@@ -11,7 +10,7 @@
   targetPackages,
   cmake,
   ninja,
-  llvm_21,
+  llvm_22,
   curl,
   tzdata,
   lit,
@@ -32,13 +31,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ldc";
-  version = "1.42.0";
+  version = "1.43.0-beta1";
 
   src = fetchFromGitHub {
     owner = "ldc-developers";
     repo = "ldc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-adA14tx/bruGvHVoODz13f8h/U2ol1lK0ytxnypsLv8=";
+    hash = "sha256-dKlk++vKwhJyPeSJvIuPOXe4snXJTtPsj7D425Fcd6o=";
     fetchSubmodules = true;
   };
 
@@ -64,7 +63,14 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   nativeBuildInputs = [
-    cmake ldcBootstrap lit lit.python llvm_21.dev makeWrapper ninja unzip
+    cmake
+    ldcBootstrap
+    lit
+    lit.python
+    llvm_22.dev
+    makeWrapper
+    ninja
+    unzip
   ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
     gdb
@@ -145,10 +151,21 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/ldc-developers/ldc";
     changelog = "https://github.com/ldc-developers/ldc/releases/tag/v${finalAttrs.version}";
     # from https://github.com/ldc-developers/ldc/blob/master/LICENSE
-    license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ];
+    license = with licenses; [
+      bsd3
+      boost
+      mit
+      ncsa
+      gpl2Plus
+    ];
     mainProgram = "ldc2";
     maintainers = with maintainers; [ lionello jtbx ];
-    platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+    platforms = [
+      "x86_64-linux"
+      "i686-linux"
+      "aarch64-linux"
+      "aarch64-darwin"
+    ];
   };
 
   passthru.ldcBootstrap = ldcBootstrap;
@@ -180,7 +197,7 @@ stdenv.mkDerivation (finalAttrs: {
       # references to the compiler binaries.
       no-references-to-compiler = helloWorld.overrideAttrs {
         disallowedReferences = [ ldc ];
-        dFlags = ["-g"];
+        dFlags = [ "-g" ];
+      };
     };
-  };
 })