2 files changed, 39 insertions, 15 deletions
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 00b41cd..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,
@@ -64,7 +63,14 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   nativeBuildInputs = [
-    cmake ldcBootstrap lit lit.python llvm_22.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
@@ -138,8 +144,6 @@ stdenv.mkDerivation (finalAttrs: {
     find $out/bin -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${ldcBootstrap} '{}' +
   '';
 
-  # doCheck = false;
-
   disallowedReferences = [ ldcBootstrap ];
 
   meta = with lib; {
@@ -147,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;
@@ -182,7 +197,7 @@ stdenv.mkDerivation (finalAttrs: {
       # references to the compiler binaries.
       no-references-to-compiler = helloWorld.overrideAttrs {
         disallowedReferences = [ ldc ];
-        dFlags = ["-g"];
+        dFlags = [ "-g" ];
       };
     };
 })