Skip to content

Commit 2e32e68

Browse files
committed
ldc-bootstrap: 1.28.1, 1.30.0 -> 1.41.0, ldc: 1.40.1 -> 1.41.0 (#414928)
2 parents 28f39cb + e994cae commit 2e32e68

File tree

2 files changed

+7
-22
lines changed

2 files changed

+7
-22
lines changed

pkgs/by-name/ld/ldc/bootstrap.nix

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,13 @@ let
1414
OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name;
1515
ARCH =
1616
if hostPlatform.isDarwin && hostPlatform.isAarch64 then "arm64" else hostPlatform.parsed.cpu.name;
17-
# Work around macOS Sequoia 15.4 segfault by downgrading the bootstrap compiler - see:
18-
# - https://github.com/NixOS/nixpkgs/issues/398443
19-
# - https://github.com/dlang/dmd/issues/21126#issuecomment-2775948553
20-
# TODO: Remove this when bootstrap can be upgraded to a fixed version (>= 1.41.0-beta2)?
21-
version = if hostPlatform.isDarwin then "1.28.1" else "1.30.0";
17+
version = "1.41.0";
2218
hashes = {
2319
# Get these from `nix store prefetch-file https://github.com/ldc-developers/ldc/releases/download/v1.19.0/ldc2-1.19.0-osx-x86_64.tar.xz` etc..
24-
osx-x86_64 = "sha256-mqQ+hNlDePOGX2mwgEEzHGiOAx3SxfNA6x8+ML3qYmw=";
25-
linux-x86_64 = "sha256-V4TUzEfQhFrwiX07dHOgjdAoGkzausCkhnQIQNAU/eE=";
26-
linux-aarch64 = "sha256-kTeglub75iv/jWWNPCn15aCGAbmck0RQl6L7bFOUu7Y=";
27-
osx-arm64 = "sha256-m93rGywncBnPEWslcrXuGBnZ+Z/mNgLIaevkL/uBOu0=";
20+
osx-x86_64 = "sha256-W8/0i2PFakXbqs2wxb3cjqa+htSgx7LHyDGOBH9yEYE=";
21+
linux-x86_64 = "sha256-SkOUV/D+WeadAv1rV1Sfw8h60PVa2fueQlB7b44yfI8=";
22+
linux-aarch64 = "sha256-HEuVChPVM3ntT1ZDZsJ+xW1iYeIWhogNcMdIaz6Me6g=";
23+
osx-arm64 = "sha256-FXJnBC8QsEchBhkxSqcZtPC/iHYB6TscY0qh7LPFRuQ=";
2824
};
2925
in
3026
stdenv.mkDerivation {

pkgs/by-name/ld/ldc/package.nix

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,30 +32,19 @@ in
3232

3333
stdenv.mkDerivation (finalAttrs: {
3434
pname = "ldc";
35-
version = "1.40.1";
35+
version = "1.41.0";
3636

3737
src = fetchFromGitHub {
3838
owner = "ldc-developers";
3939
repo = "ldc";
4040
rev = "v${finalAttrs.version}";
41-
hash = "sha256-WdnwdH25A5oMNNY3uWG2hxnaAT+S1hNuP7LElH3uuuk=";
41+
hash = "sha256-6LcpY3LSFK4KgEiGrFp/LONu5Vr+/+vI04wEEpF3s+s=";
4242
fetchSubmodules = true;
4343
};
4444

4545
# https://issues.dlang.org/show_bug.cgi?id=19553
4646
hardeningDisable = [ "fortify" ];
4747

48-
# Fix output programs segfaulting on macOS Sequoia 15.4 - see:
49-
# https://github.com/NixOS/nixpkgs/issues/398443
50-
# https://github.com/ldc-developers/ldc/issues/4899
51-
# TODO: Remove this when upgrading to a fixed version (>= 1.41.0-beta2)
52-
patches = [
53-
(fetchpatch {
54-
url = "https://github.com/ldc-developers/ldc/commit/60079c3b596053b1a70f9f2e0cf38a287089df56.patch";
55-
hash = "sha256-Y/5+zt5ou9rzU7rLJq2OqUxMDvC7aSFS6AsPeDxNATQ=";
56-
})
57-
];
58-
5948
postPatch =
6049
''
6150
patchShebangs runtime tools tests

0 commit comments

Comments
 (0)