-
-
Notifications
You must be signed in to change notification settings - Fork 14k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ldc: 1.17.0 -> 1.20.1 #85488
Merged
Merged
ldc: 1.17.0 -> 1.20.1 #85488
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
{ stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames | ||
, version, hashes }: | ||
with stdenv; | ||
let | ||
OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; | ||
ARCH = toString hostPlatform.parsed.cpu.name; | ||
in mkDerivation { | ||
pname = "ldc-bootstrap"; | ||
inherit version; | ||
|
||
src = fetchurl rec { | ||
name = "ldc2-${version}-${OS}-${ARCH}.tar.xz"; | ||
url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/${name}"; | ||
sha256 = hashes."${OS}-${ARCH}" or (throw "missing bootstrap sha256 for ${OS}-${ARCH}"); | ||
}; | ||
|
||
dontConfigure = true; | ||
dontBuild = true; | ||
|
||
nativeBuildInputs = [ fixDarwinDylibNames autoPatchelfHook ]; | ||
propagatedBuildInputs = [ curl tzdata ]; | ||
|
||
installPhase = '' | ||
mkdir -p $out | ||
|
||
mv bin etc import lib LICENSE README $out/ | ||
|
||
# fix paths in ldc2.conf (one level less) | ||
# substituteInPlace $out/bin/ldc2.conf --replace "/../../" "/../" | ||
''; | ||
|
||
meta = with lib; { | ||
inherit version; | ||
description = "The 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 ]; | ||
maintainers = with maintainers; [ ThomasMader lionello ]; | ||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
{ callPackage }: | ||
callPackage ./binary.nix { | ||
version = "1.19.0"; | ||
hashes = { | ||
# Get these from `nix-prefetch-url https://github.com/ldc-developers/ldc/releases/download/v1.19.0/ldc2-1.19.0-osx-x86_64.tar.xz` etc.. | ||
osx-x86_64 = "1bp3xkh9zp64dzq8isanib1gacb3nfbl70qv15qygwk1zan6zgy7"; | ||
linux-x86_64 = "146grr2lwarfk13wgkpyb77xb6b3as1is2rf4s2hipqjmc8biy1h"; | ||
linux-aarch64 = "1fv6jshfvi15m7masgxq1hgp216qjd5amizrqdf26vhrq3a08li3"; | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,173 +1,5 @@ | ||
{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata | ||
, libconfig, lit, gdb, unzip, darwin, bash | ||
, callPackage, makeWrapper, runCommand, targetPackages | ||
, bootstrapVersion ? false | ||
, version ? "1.17.0" | ||
, ldcSha256 ? "1aag5jfrng6p4ms0fs90hjbv9bcj3hj8h52r68c3cm6racdajbva" | ||
}: | ||
|
||
let | ||
bootstrapLdc = if !bootstrapVersion then | ||
# LDC 0.17.x is the last version which doesn't need a working D compiler to | ||
# build so we use that version to bootstrap the actual build. | ||
callPackage ./default.nix { | ||
bootstrapVersion = true; | ||
version = "0.17.6"; | ||
ldcSha256 = "0qf5kbxddgmg3kqzi0kf4bgv8vdrnv16y07hcpm0cwv9mc3qr2w6"; | ||
} | ||
else | ||
""; | ||
|
||
pathConfig = runCommand "ldc-lib-paths" {} '' | ||
mkdir $out | ||
echo ${tzdata}/share/zoneinfo/ > $out/TZDatabaseDirFile | ||
echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > $out/LibcurlPathFile | ||
''; | ||
in | ||
|
||
stdenv.mkDerivation rec { | ||
pname = "ldc"; | ||
inherit version; | ||
|
||
enableParallelBuilding = true; | ||
|
||
src = fetchurl { | ||
url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; | ||
sha256 = ldcSha256; | ||
}; | ||
|
||
# https://issues.dlang.org/show_bug.cgi?id=19553 | ||
hardeningDisable = [ "fortify" ]; | ||
|
||
postUnpack = '' | ||
patchShebangs . | ||
'' | ||
|
||
+ stdenv.lib.optionalString (!bootstrapVersion) '' | ||
rm ldc-${version}-src/tests/d2/dmd-testsuite/fail_compilation/mixin_gc.d | ||
rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/xtest46_gc.d | ||
rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/testptrref_gc.d | ||
|
||
# test depends on current year | ||
rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ddocYear.d | ||
'' | ||
|
||
+ stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' | ||
# https://github.com/NixOS/nixpkgs/issues/34817 | ||
rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall | ||
''; | ||
|
||
postPatch = '' | ||
# Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow | ||
substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" | ||
'' | ||
|
||
+ stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isLinux) '' | ||
substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" | ||
'' | ||
|
||
+ stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' | ||
substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" | ||
'' | ||
|
||
+ stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) '' | ||
# Was not able to compile on darwin due to "__inline_isnanl" | ||
# being undefined. | ||
# TODO Remove with version > 0.17.6 | ||
substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan | ||
''; | ||
|
||
nativeBuildInputs = [ cmake ninja makeWrapper unzip ] | ||
++ stdenv.lib.optionals (!bootstrapVersion) [ | ||
bootstrapLdc lit lit.python | ||
] | ||
++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin) | ||
# https://github.com/NixOS/nixpkgs/issues/57120 | ||
# https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 | ||
llvm_5 | ||
++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) | ||
llvm_8 | ||
++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) | ||
# https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 | ||
gdb | ||
++ stdenv.lib.optionals (bootstrapVersion) [ | ||
libconfig llvm_5 | ||
] | ||
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin | ||
darwin.apple_sdk.frameworks.Foundation; | ||
|
||
|
||
buildInputs = [ curl tzdata ]; | ||
|
||
cmakeFlags = stdenv.lib.optionals (!bootstrapVersion) [ | ||
"-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J${pathConfig}" | ||
"-DCMAKE_BUILD_TYPE=Release" | ||
]; | ||
|
||
postConfigure = '' | ||
export DMD=$PWD/bin/ldmd2 | ||
''; | ||
|
||
makeFlags = [ "DMD=$DMD" ]; | ||
|
||
fixNames = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' | ||
fixDarwinDylibNames() { | ||
local flags=() | ||
|
||
for fn in "$@"; do | ||
flags+=(-change "$(basename "$fn")" "$fn") | ||
done | ||
|
||
for fn in "$@"; do | ||
if [ -L "$fn" ]; then continue; fi | ||
echo "$fn: fixing dylib" | ||
install_name_tool -id "$fn" "''${flags[@]}" "$fn" | ||
done | ||
} | ||
|
||
fixDarwinDylibNames $(find "$(pwd)/lib" -name "*.dylib") | ||
export DYLD_LIBRARY_PATH=$(pwd)/lib | ||
''; | ||
|
||
# https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746 | ||
additionalExceptions = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin | ||
"|druntime-test-shared"; | ||
|
||
doCheck = !bootstrapVersion; | ||
|
||
checkPhase = stdenv.lib.optionalString doCheck '' | ||
# Build default lib test runners | ||
ninja -j$NIX_BUILD_CORES all-test-runners | ||
|
||
${fixNames} | ||
|
||
# Run dmd testsuite | ||
export DMD_TESTSUITE_MAKE_ARGS="-j$NIX_BUILD_CORES DMD=$DMD CC=$CXX" | ||
ctest -V -R "dmd-testsuite" | ||
|
||
# Build and run LDC D unittests. | ||
ctest --output-on-failure -R "ldc2-unittest" | ||
|
||
# Run LIT testsuite. | ||
ctest -V -R "lit-tests" | ||
|
||
# Run default lib unittests | ||
ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${additionalExceptions}" | ||
''; | ||
|
||
postInstall = '' | ||
wrapProgram $out/bin/ldc2 \ | ||
--prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ | ||
--set-default CC "${targetPackages.stdenv.cc}/bin/cc" | ||
''; | ||
|
||
meta = with stdenv.lib; { | ||
description = "The 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 ]; | ||
maintainers = with maintainers; [ ThomasMader ]; | ||
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; | ||
}; | ||
import ./generic.nix { | ||
version = "1.20.1"; | ||
ldcSha256 = "1bqsgab22v02pc3c9gcyf15y7aimadv24d68icaw5lpgnvzxy89b"; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,164 @@ | ||
{ bootstrapVersion ? false | ||
lionello marked this conversation as resolved.
Show resolved
Hide resolved
|
||
, version | ||
, ldcSha256 | ||
}: | ||
{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata | ||
, libconfig, lit, gdb, unzip, darwin, bash, ldcBootstrap | ||
, callPackage, makeWrapper, runCommand, targetPackages | ||
}: | ||
|
||
let | ||
pathConfig = runCommand "ldc-lib-paths" {} '' | ||
mkdir $out | ||
echo ${tzdata}/share/zoneinfo/ > $out/TZDatabaseDirFile | ||
echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > $out/LibcurlPathFile | ||
''; | ||
|
||
bootstrapLdc = if bootstrapVersion then null else ldcBootstrap; | ||
|
||
in | ||
|
||
stdenv.mkDerivation rec { | ||
pname = "ldc"; | ||
inherit version; | ||
|
||
enableParallelBuilding = true; | ||
|
||
src = fetchurl { | ||
url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; | ||
sha256 = ldcSha256; | ||
}; | ||
|
||
# https://issues.dlang.org/show_bug.cgi?id=19553 | ||
hardeningDisable = [ "fortify" ]; | ||
|
||
postUnpack = '' | ||
patchShebangs . | ||
'' | ||
|
||
+ stdenv.lib.optionalString (!bootstrapVersion) '' | ||
rm ldc-${version}-src/tests/d2/dmd-testsuite/fail_compilation/mixin_gc.d | ||
rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/xtest46_gc.d | ||
rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/testptrref_gc.d | ||
|
||
# test depends on current year | ||
rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ddocYear.d | ||
'' | ||
|
||
+ stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' | ||
# https://github.com/NixOS/nixpkgs/issues/34817 | ||
rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall | ||
''; | ||
|
||
postPatch = '' | ||
# Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow | ||
substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" | ||
'' | ||
|
||
+ stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isLinux) '' | ||
substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" | ||
'' | ||
|
||
+ stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' | ||
substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" | ||
'' | ||
|
||
+ stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) '' | ||
# Was not able to compile on darwin due to "__inline_isnanl" | ||
# being undefined. | ||
# TODO Remove with version > 0.17.6 | ||
substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan | ||
''; | ||
|
||
nativeBuildInputs = [ cmake ninja makeWrapper unzip ] | ||
++ stdenv.lib.optionals (!bootstrapVersion) [ | ||
bootstrapLdc lit lit.python | ||
] | ||
++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin) | ||
# https://github.com/NixOS/nixpkgs/issues/57120 | ||
# https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 | ||
llvm_5 | ||
++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) | ||
llvm_8 | ||
++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) | ||
# https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 | ||
gdb | ||
++ stdenv.lib.optionals (bootstrapVersion) [ | ||
libconfig llvm_5 | ||
] | ||
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin | ||
darwin.apple_sdk.frameworks.Foundation; | ||
|
||
buildInputs = [ curl tzdata ]; | ||
|
||
cmakeFlags = stdenv.lib.optionals (!bootstrapVersion) [ | ||
"-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J${pathConfig}" | ||
"-DCMAKE_BUILD_TYPE=Release" | ||
]; | ||
|
||
postConfigure = '' | ||
export DMD=$PWD/bin/ldmd2 | ||
''; | ||
|
||
makeFlags = [ "DMD=$DMD" ]; | ||
|
||
fixNames = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' | ||
fixDarwinDylibNames() { | ||
local flags=() | ||
|
||
for fn in "$@"; do | ||
flags+=(-change "$(basename "$fn")" "$fn") | ||
done | ||
|
||
for fn in "$@"; do | ||
if [ -L "$fn" ]; then continue; fi | ||
echo "$fn: fixing dylib" | ||
install_name_tool -id "$fn" "''${flags[@]}" "$fn" | ||
done | ||
} | ||
|
||
fixDarwinDylibNames $(find "$(pwd)/lib" -name "*.dylib") | ||
export DYLD_LIBRARY_PATH=$(pwd)/lib | ||
''; | ||
|
||
# https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746 | ||
additionalExceptions = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin | ||
"|druntime-test-shared"; | ||
|
||
doCheck = !bootstrapVersion; | ||
|
||
checkPhase = stdenv.lib.optionalString doCheck '' | ||
# Build default lib test runners | ||
ninja -j$NIX_BUILD_CORES all-test-runners | ||
|
||
${fixNames} | ||
|
||
# Run dmd testsuite | ||
export DMD_TESTSUITE_MAKE_ARGS="-j$NIX_BUILD_CORES DMD=$DMD" | ||
ctest -V -R "dmd-testsuite" | ||
|
||
# Build and run LDC D unittests. | ||
ctest --output-on-failure -R "ldc2-unittest" | ||
|
||
# Run LIT testsuite. | ||
ctest -V -R "lit-tests" | ||
|
||
# Run default lib unittests | ||
ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${additionalExceptions}" | ||
''; | ||
|
||
postInstall = '' | ||
wrapProgram $out/bin/ldc2 \ | ||
--prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ | ||
--set-default CC "${targetPackages.stdenv.cc}/bin/cc" | ||
''; | ||
|
||
meta = with stdenv.lib; { | ||
description = "The 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 ]; | ||
maintainers = with maintainers; [ ThomasMader lionello ]; | ||
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; | ||
}; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was there a specific reason why the previous version is used for bootstrapping?
I can think of no technical reason but it would make it even easier if the same version is used for bootstrapping.
This way only one version specifier needs to exist.