ldc-1.42.0-beta3 overlayHEADmain

8 files changed, 53 insertions, 25 deletions

diff --git a/README b/README
index 54ab48b..1a1a929 100644
--- a/README
+++ b/README
@@ -35,7 +35,7 @@ nix control files
   - flake.nix
 
 nix overlays for (updates nixpkgs, more recent versions of):
-  - ldc     ( 1.30.0 -> 1.42.0-beta2 )
+  - ldc     ( 1.30.0 -> 1.42.0-beta3 )
   - dub     ( 1.23.0 -> 1.40.0 ) [for nix versions 1.31.0 ... 1.33.0 broken]
   - dtools  ( 2.095.1 -> 2.110.0 )
 
@@ -73,13 +73,13 @@ search nixpkgs here:
 - https://search.nixos.org/packages?channel=unstable&from=0&size=100&sort=relevance&query=
 
 ** compilers
-*** ldc OK ✓ ( 1.30.0 -> 1.42.0-beta2 )
+*** ldc OK ✓ ( 1.30.0 -> 1.42.0-beta3 )
 
 - https://wiki.dlang.org/LDC
 
 - https://github.com/ldc-developers/ldc
   - https://github.com/ldc-developers/ldc/releases
-    nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.42.0-beta2.tar.gz
+    nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.42.0-beta3.tar.gz
   - https://github.com/ldc-developers/ldc/issues
 
 - version in nixpkgs:
diff --git a/flake.lock b/flake.lock
index 67aa939..18fa20d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1770169770,
-        "narHash": "sha256-awR8qIwJxJJiOmcEGgP2KUqYmHG4v/z8XpL9z8FnT1A=",
+        "lastModified": 1771207753,
+        "narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "aa290c9891fa4ebe88f8889e59633d20cc06a5f2",
+        "rev": "d1c15b7d5806069da59e819999d70e1cec0760bf",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 91a7ff2..ea18574 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,7 @@
       runHook postCheck
     '';
     localOverlay = (final: prev: {
-      ldc = prev.callPackage ./nix-overlays/ldc {  };       # -> ok 1.42.0-beta2
+      ldc = prev.callPackage ./nix-overlays/ldc {  };       # -> ok 1.42.0-beta3
       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
@@ -85,7 +85,7 @@
     in
       with pkgs-ovl; {
         dsh-overlay-dtools = mkShell {
-          name = "overlay - ldc-1.42.0-beta2 - dub-1.40.0 - dtools-2.110.0";
+          name = "overlay - ldc-1.42.0-beta3 - dub-1.40.0 - dtools-2.110.0";
           inherit shell;
           inherit devEnv;
           packages = [
@@ -97,7 +97,7 @@
           inherit shellHook;
         };
         dsh-overlay-ldc-dub = mkShell {
-          name = "overlay - ldc-1.42.0-beta2 - dub-1.40.0 - dtools-2.110.0";
+          name = "overlay - ldc-1.42.0-beta3 - dub-1.40.0 - dtools-2.110.0";
           inherit shell;
           inherit devEnv;
           packages = [
@@ -121,7 +121,7 @@
           inherit shellHook;
         };
         dsh-overlay-dtest-tilix = mkShell {
-          name = "overlay - ldc-1.42.0-beta2 - dub-1.40.0 - tilix - gtkd";
+          name = "overlay - ldc-1.42.0-beta3 - dub-1.40.0 - tilix - gtkd";
           inherit shell;
           inherit devEnv;
           packages = [
diff --git a/nix-overlays/dmd/binary.nix b/nix-overlays/dmd/binary.nix
index 3a5d6b7..baca4dd 100644
--- a/nix-overlays/dmd/binary.nix
+++ b/nix-overlays/dmd/binary.nix
@@ -1,5 +1,15 @@
-{ lib, stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, glibc
-, version, hashes }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  curl,
+  tzdata,
+  autoPatchelfHook,
+  fixDarwinDylibNames,
+  glibc,
+  version,
+  hashes,
+}:
 
 let
   inherit (stdenv) hostPlatform;
diff --git a/nix-overlays/dmd/generic.nix b/nix-overlays/dmd/generic.nix
index 59a781e..aabbf52 100644
--- a/nix-overlays/dmd/generic.nix
+++ b/nix-overlays/dmd/generic.nix
@@ -15,7 +15,6 @@
   curl,
   tzdata,
   gdb,
-  # Foundation,
   callPackage,
   targetPackages,
   fetchpatch,
@@ -125,8 +124,6 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     curl
     tzdata
-  # ] ++ lib.optionals stdenv.hostPlatform.isDarwin []
-  #   Foundation
   ];
 
   nativeCheckInputs = [
diff --git a/nix-overlays/ldc/package.nix b/nix-overlays/ldc/package.nix
index 5b778d4..5cf8c3e 100644
--- a/nix-overlays/ldc/package.nix
+++ b/nix-overlays/ldc/package.nix
@@ -32,13 +32,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ldc";
-  version = "1.42.0-beta2";
+  version = "1.42.0-beta3";
 
   src = fetchFromGitHub {
     owner = "ldc-developers";
     repo = "ldc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-O605SQftca34ZzQnKiu8VkQPUSv3bU9m884FqXyFoAs=";
+    hash = "sha256-cApRQ54OkW3+r9EkKOxa6yzmbxGAUSVqNBTA+rqGmAo=";
     fetchSubmodules = true;
   };
 
diff --git a/org/dlang-nix-flakes.org b/org/dlang-nix-flakes.org
index c6c68a9..ccf1202 100644
--- a/org/dlang-nix-flakes.org
+++ b/org/dlang-nix-flakes.org
@@ -971,7 +971,6 @@ import ./generic.nix {
   curl,
   tzdata,
   gdb,
-  # Foundation,
   callPackage,
   targetPackages,
   fetchpatch,
@@ -1081,8 +1080,6 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     curl
     tzdata
-  # ] ++ lib.optionals stdenv.hostPlatform.isDarwin []
-  #   Foundation
   ];
 
   nativeCheckInputs = [
@@ -1206,8 +1203,18 @@ callPackage ./binary.nix {
 
 #+HEADER: :tangle "../nix-overlays/dmd/binary.nix"
 #+BEGIN_SRC nix
-{ lib, stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, glibc
-, version, hashes }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  curl,
+  tzdata,
+  autoPatchelfHook,
+  fixDarwinDylibNames,
+  glibc,
+  version,
+  hashes,
+}:
 
 let
   inherit (stdenv) hostPlatform;
diff --git a/org/nix-develop-dlang-shared.org b/org/nix-develop-dlang-shared.org
index 92e809e..c1eb130 100644
--- a/org/nix-develop-dlang-shared.org
+++ b/org/nix-develop-dlang-shared.org
@@ -177,16 +177,16 @@ sha256 = "<<ldc-hash>>";
  - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.42.0.tar.gz
  - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz
 
-****** beta2
+****** beta3
 
 #+NAME: ldc_version_1_42_0
 #+BEGIN_SRC nix
-1.42.0-beta2
+1.42.0-beta3
 #+END_SRC
 
 #+NAME: ldc_hash_1_42_0
 #+BEGIN_SRC nix
-sha256-O605SQftca34ZzQnKiu8VkQPUSv3bU9m884FqXyFoAs=
+sha256-cApRQ54OkW3+r9EkKOxa6yzmbxGAUSVqNBTA+rqGmAo=
 #+END_SRC
 
 #+NAME: ldc_llvm_set_1_42_0
@@ -194,6 +194,20 @@ sha256-O605SQftca34ZzQnKiu8VkQPUSv3bU9m884FqXyFoAs=
 llvm_20
 #+END_SRC
 
+****** beta2
+
+#+BEGIN_SRC nix
+1.42.0-beta2
+#+END_SRC
+
+#+BEGIN_SRC nix
+sha256-O605SQftca34ZzQnKiu8VkQPUSv3bU9m884FqXyFoAs=
+#+END_SRC
+
+#+BEGIN_SRC nix
+llvm_20
+#+END_SRC
+
 ****** beta1
 
 #+BEGIN_SRC nix