summaryrefslogtreecommitdiffhomepage
path: root/nix-overlays
diff options
context:
space:
mode:
Diffstat (limited to 'nix-overlays')
-rw-r--r--nix-overlays/dmd/generic.nix10
-rw-r--r--nix-overlays/dmd/package.nix6
-rw-r--r--nix-overlays/dub/package.nix6
-rw-r--r--nix-overlays/ldc/bootstrap.nix12
-rw-r--r--nix-overlays/ldc/package.nix29
5 files changed, 35 insertions, 28 deletions
diff --git a/nix-overlays/dmd/generic.nix b/nix-overlays/dmd/generic.nix
index e130d69..59a781e 100644
--- a/nix-overlays/dmd/generic.nix
+++ b/nix-overlays/dmd/generic.nix
@@ -96,7 +96,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
@@ -108,9 +110,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
diff --git a/nix-overlays/dmd/package.nix b/nix-overlays/dmd/package.nix
index 69a9f75..3aa1183 100644
--- a/nix-overlays/dmd/package.nix
+++ b/nix-overlays/dmd/package.nix
@@ -1,5 +1,5 @@
import ./generic.nix {
- version = "2.110.0";
- dmdHash = "sha256-icXp9xWF2AI2gp7z/lQFAChmXfQePe9b5pbpQ9Mn19Y=";
- phobosHash = "sha256-CmJpcHM+sIsaYBlpALCFoQFG+93s8gUyWmM0tYqjXkk=";
+ version = "2.111.0";
+ dmdHash = "sha256-2bjsGa9nTny818dLRV6LKkes+Ycq8W+PFjwhGVrD5TM=";
+ phobosHash = "sha256-9jySZbODoL8sULhYKj/l4+c/uiG5xY2dO240k9XQtPk=";
}
diff --git a/nix-overlays/dub/package.nix b/nix-overlays/dub/package.nix
index b537a43..4d63f2d 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.39.0";
+ version = "1.40.0";
enableParallelBuilding = true;
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "dlang";
repo = "dub";
rev = "v${finalAttrs.version}";
- hash = "sha256-73b15A9+hClD6IbuxTy9QZKpTKjUFYBuqGOclUyhrnM=";
+ hash = "sha256-OirchEKf66gis70gCSTOYcrHLyHhCsyt/rTEGT83Vcc=";
};
postPatch = ''
@@ -39,7 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
break
fi
done
- #export DMD=${ldc}/bin/ldmd2
if [ "$DC" == "" ]; then
exit "Error: could not find D compiler"
fi
@@ -71,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
rm -rf test/pr2642-cache-db # added to build v1.34.0
rm -rf test/pr2644-describe-artifact-path # added to build v1.36.0
rm -rf test/pr2647-build-deep # added to build v1.36.0
+ rm -rf test/issue2698-cimportpaths-broken-with-dmd-ldc # added to build v1.40.0
./test/run-unittest.sh
runHook postCheck
diff --git a/nix-overlays/ldc/bootstrap.nix b/nix-overlays/ldc/bootstrap.nix
index 8f76b5b..f166568 100644
--- a/nix-overlays/ldc/bootstrap.nix
+++ b/nix-overlays/ldc/bootstrap.nix
@@ -13,13 +13,13 @@ 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.25.0";
+ version = "1.41.0";
hashes = {
- # Get these from `nix store prefetch-file https://github.com/ldc-developers/ldc/releases/download/v1.25.0/ldc2-1.25.0-osx-x86_64.tar.xz` etc..
- osx-x86_64 = "sha256-6iKnbS+oalLKmyS8qYD/wS21b7+O+VgsWG2iT4PrWPU=";
- linux-x86_64 = "sha256-sfg47RdlsIpryc3iZvE17OtLweh3Zw6DeuNJYgpuH+o=";
- linux-aarch64 = "sha256-UDZ43x4flSo+SfsPeE8juZO2Wtk2ZzwySk0ADHnvJBI=";
- osx-arm64 = "sha256-O/x0vy0wwQFaDc4uWSeMhx+chJKqbQb6e5QNYf+7DCw=";
+ # 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=";
};
in stdenv.mkDerivation {
pname = "ldc-bootstrap";
diff --git a/nix-overlays/ldc/package.nix b/nix-overlays/ldc/package.nix
index 39b510a..1767785 100644
--- a/nix-overlays/ldc/package.nix
+++ b/nix-overlays/ldc/package.nix
@@ -2,20 +2,21 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch,
+ callPackage,
+ makeWrapper,
+ removeReferencesTo,
+ runCommand,
+ writeText,
+ targetPackages,
cmake,
ninja,
- llvm_19,
+ llvm_20,
curl,
tzdata,
lit,
gdb,
unzip,
- darwin,
- callPackage,
- makeWrapper,
- runCommand,
- writeText,
- targetPackages,
ldcBootstrap ? callPackage ./bootstrap.nix { },
}:
@@ -31,13 +32,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "ldc";
- version = "1.40.1";
+ version = "1.41.0";
src = fetchFromGitHub {
owner = "ldc-developers";
repo = "ldc";
rev = "v${finalAttrs.version}";
- hash = "sha256-WdnwdH25A5oMNNY3uWG2hxnaAT+S1hNuP7LElH3uuuk=";
+ hash = "sha256-6LcpY3LSFK4KgEiGrFp/LONu5Vr+/+vI04wEEpF3s+s=";
fetchSubmodules = true;
};
@@ -63,9 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
nativeBuildInputs = [
- cmake ldcBootstrap lit lit.python llvm_19.dev makeWrapper ninja unzip
- ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
- darwin.apple_sdk.frameworks.Foundation
+ cmake ldcBootstrap lit lit.python llvm_20.dev makeWrapper ninja unzip
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
# https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
gdb
@@ -135,6 +134,12 @@ stdenv.mkDerivation (finalAttrs: {
--set-default CC ${targetPackages.stdenv.cc}/bin/cc
'';
+ preFixup = ''
+ find $out/bin -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${ldcBootstrap} '{}' +
+ '';
+
+ disallowedReferences = [ ldcBootstrap ];
+
meta = with lib; {
description = "LLVM-based D compiler";
homepage = "https://github.com/ldc-developers/ldc";
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-15 20:17:42 +0000