dmd: 2.084.0 -> 2.084.1
This commit is contained in:
Thomas Mader
parent
98c6d9d799
commit
64c958e9a4
@ -1,199 +1,165 @@
|
|||||||
{ stdenv, fetchFromGitHub
|
{ stdenv, lib, fetchFromGitHub, fetchpatch
|
||||||
, makeWrapper, unzip, which
|
, makeWrapper, unzip, which, writeTextFile
|
||||||
, curl, tzdata, gdb, darwin, git
|
, curl, tzdata, gdb, darwin, git
|
||||||
, callPackage, targetPackages, ldc
|
, callPackage, targetPackages, ldc
|
||||||
, version ? "2.084.0"
|
, version ? "2.084.1"
|
||||||
, dmdSha256 ? "1v61spdamncl8c1bzjc19b03p4jl0ih5zq9b7cqsy9ix7qaxmikf"
|
, dmdSha256 ? "10ll5072rkv3ln7i5l88h2f9mzda567kw2jwh6466vm6ylzl4jms"
|
||||||
, druntimeSha256 ? "0vp414j6s11l9s54v81np49mv60ywmd7nnk41idkbwrq0nz4sfrq"
|
, druntimeSha256 ? "0i0g2cnzh097pmvb86gvyj79canaxppw33hp7ylqnd11q4kqc8pb"
|
||||||
, phobosSha256 ? "1wp7z1x299b0w9ny1ah2wrfhrs05vc4bk51csgw9774l3dqcnv53"
|
, phobosSha256 ? "1hxpismj9gy5n1bc9kl9ykgd4lfmkq9i8xgrq09j0fybfwn9j1gc"
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
dmdBuild = stdenv.mkDerivation rec {
|
dmdConfFile = writeTextFile {
|
||||||
name = "dmdBuild-${version}";
|
name = "dmd.conf";
|
||||||
inherit version;
|
text = (lib.generators.toINI {} {
|
||||||
|
"Environment" = {
|
||||||
enableParallelBuilding = true;
|
DFLAGS = ''-I$@out@/include/d2 -L-L$@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}'';
|
||||||
|
};
|
||||||
srcs = [
|
});
|
||||||
(fetchFromGitHub {
|
|
||||||
owner = "dlang";
|
|
||||||
repo = "dmd";
|
|
||||||
rev = "v${version}";
|
|
||||||
sha256 = dmdSha256;
|
|
||||||
name = "dmd";
|
|
||||||
})
|
|
||||||
(fetchFromGitHub {
|
|
||||||
owner = "dlang";
|
|
||||||
repo = "druntime";
|
|
||||||
rev = "v${version}";
|
|
||||||
sha256 = druntimeSha256;
|
|
||||||
name = "druntime";
|
|
||||||
})
|
|
||||||
(fetchFromGitHub {
|
|
||||||
owner = "dlang";
|
|
||||||
repo = "phobos";
|
|
||||||
rev = "v${version}";
|
|
||||||
sha256 = phobosSha256;
|
|
||||||
name = "phobos";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
sourceRoot = ".";
|
|
||||||
|
|
||||||
# https://issues.dlang.org/show_bug.cgi?id=19553
|
|
||||||
hardeningDisable = [ "fortify" ];
|
|
||||||
|
|
||||||
postUnpack = ''
|
|
||||||
patchShebangs .
|
|
||||||
'';
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace dmd/test/compilable/extra-files/ddocYear.html \
|
|
||||||
--replace "2018" "__YEAR__"
|
|
||||||
|
|
||||||
substituteInPlace dmd/test/runnable/test16096.sh \
|
|
||||||
--replace "{EXT}" "{EXE}"
|
|
||||||
'';
|
|
||||||
|
|
||||||
nativeBuildInputs = [ ldc makeWrapper unzip which gdb git ]
|
|
||||||
|
|
||||||
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
|
|
||||||
Foundation
|
|
||||||
]);
|
|
||||||
|
|
||||||
buildInputs = [ curl tzdata ];
|
|
||||||
|
|
||||||
bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
|
|
||||||
osname = if stdenv.hostPlatform.isDarwin then
|
|
||||||
"osx"
|
|
||||||
else
|
|
||||||
stdenv.hostPlatform.parsed.kernel.name;
|
|
||||||
top = "$(echo $NIX_BUILD_TOP)";
|
|
||||||
pathToDmd = "${top}/dmd/generated/${osname}/release/${bits}/dmd";
|
|
||||||
|
|
||||||
# Buid and install are based on http://wiki.dlang.org/Building_DMD
|
|
||||||
buildPhase = ''
|
|
||||||
cd dmd
|
|
||||||
make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=ldmd2
|
|
||||||
cd ../druntime
|
|
||||||
make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd}
|
|
||||||
cd ../phobos
|
|
||||||
echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile
|
|
||||||
echo ${curl.out}/lib/libcurl.so > LibcurlPathFile
|
|
||||||
make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)"
|
|
||||||
cd ..
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Disable tests on Darwin for now because of
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/41099
|
|
||||||
doCheck = true;
|
|
||||||
|
|
||||||
checkPhase = ''
|
|
||||||
cd dmd
|
|
||||||
make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHARED=0 SHELL=$SHELL
|
|
||||||
cd ../druntime
|
|
||||||
make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release
|
|
||||||
cd ..
|
|
||||||
'';
|
|
||||||
|
|
||||||
dontStrip = true;
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
cd dmd
|
|
||||||
mkdir $out
|
|
||||||
mkdir $out/bin
|
|
||||||
cp ${pathToDmd} $out/bin
|
|
||||||
|
|
||||||
mkdir -p $out/share/man/man1
|
|
||||||
mkdir -p $out/share/man/man5
|
|
||||||
cp -r docs/man/man1/* $out/share/man/man1/
|
|
||||||
cp -r docs/man/man5/* $out/share/man/man5/
|
|
||||||
|
|
||||||
cd ../druntime
|
|
||||||
mkdir $out/include
|
|
||||||
mkdir $out/include/d2
|
|
||||||
cp -r import/* $out/include/d2
|
|
||||||
|
|
||||||
cd ../phobos
|
|
||||||
mkdir $out/lib
|
|
||||||
cp generated/${osname}/release/${bits}/libphobos2.* $out/lib
|
|
||||||
|
|
||||||
cp -r std $out/include/d2
|
|
||||||
cp -r etc $out/include/d2
|
|
||||||
|
|
||||||
wrapProgram $out/bin/dmd \
|
|
||||||
--prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \
|
|
||||||
--set-default CC "${targetPackages.stdenv.cc}/bin/cc"
|
|
||||||
|
|
||||||
cd $out/bin
|
|
||||||
tee dmd.conf << EOF
|
|
||||||
[Environment]
|
|
||||||
DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"} -fPIC
|
|
||||||
EOF
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
description = "Official reference compiler for the D language";
|
|
||||||
homepage = http://dlang.org/;
|
|
||||||
# Everything is now Boost licensed, even the backend.
|
|
||||||
# https://github.com/dlang/dmd/pull/6680
|
|
||||||
license = licenses.boost;
|
|
||||||
maintainers = with maintainers; [ ThomasMader ];
|
|
||||||
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Need to test Phobos in a fixed-output derivation, otherwise the
|
|
||||||
# network stuff in Phobos would fail if sandbox mode is enabled.
|
|
||||||
#
|
|
||||||
# Disable tests on Darwin for now because of
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/41099
|
|
||||||
phobosUnittests = if !stdenv.hostPlatform.isDarwin then
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "phobosUnittests-${version}";
|
|
||||||
version = dmdBuild.version;
|
|
||||||
|
|
||||||
enableParallelBuilding = dmdBuild.enableParallelBuilding;
|
|
||||||
preferLocalBuild = true;
|
|
||||||
inputString = dmdBuild.outPath;
|
|
||||||
outputHashAlgo = "sha256";
|
|
||||||
outputHash = builtins.hashString "sha256" inputString;
|
|
||||||
|
|
||||||
srcs = dmdBuild.srcs;
|
|
||||||
|
|
||||||
sourceRoot = ".";
|
|
||||||
|
|
||||||
nativeBuildInputs = dmdBuild.nativeBuildInputs;
|
|
||||||
buildInputs = dmdBuild.buildInputs;
|
|
||||||
|
|
||||||
buildPhase = ''
|
|
||||||
cd phobos
|
|
||||||
echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile
|
|
||||||
echo ${curl.out}/lib/libcurl.so > LibcurlPathFile
|
|
||||||
make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${dmdBuild}/bin/dmd DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)"
|
|
||||||
'';
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
echo -n $inputString > $out
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
else
|
|
||||||
"";
|
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
inherit phobosUnittests;
|
|
||||||
name = "dmd-${version}";
|
name = "dmd-${version}";
|
||||||
phases = "installPhase";
|
inherit version;
|
||||||
buildInputs = dmdBuild.buildInputs;
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
srcs = [
|
||||||
|
(fetchFromGitHub {
|
||||||
|
owner = "dlang";
|
||||||
|
repo = "dmd";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = dmdSha256;
|
||||||
|
name = "dmd";
|
||||||
|
})
|
||||||
|
(fetchFromGitHub {
|
||||||
|
owner = "dlang";
|
||||||
|
repo = "druntime";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = druntimeSha256;
|
||||||
|
name = "druntime";
|
||||||
|
})
|
||||||
|
(fetchFromGitHub {
|
||||||
|
owner = "dlang";
|
||||||
|
repo = "phobos";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = phobosSha256;
|
||||||
|
name = "phobos";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
name = "fix-loader-import.patch";
|
||||||
|
url = "https://github.com/dlang/dmd/commit/e7790436c4af1910b8c079dac9bb69627d7dea4b.patch";
|
||||||
|
sha256 = "0w69hajx8agywc7m2hph5m27g2yclz8ml0gjjyjk9k6ii3jv45kx";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
patchFlags = [ "--directory=dmd" "-p1" ];
|
||||||
|
|
||||||
|
sourceRoot = ".";
|
||||||
|
|
||||||
|
# https://issues.dlang.org/show_bug.cgi?id=19553
|
||||||
|
hardeningDisable = [ "fortify" ];
|
||||||
|
|
||||||
|
postUnpack = ''
|
||||||
|
patchShebangs .
|
||||||
|
'';
|
||||||
|
|
||||||
|
postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||||
|
substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
|
||||||
|
''
|
||||||
|
|
||||||
|
+ stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||||
|
substituteInPlace phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)"
|
||||||
|
'';
|
||||||
|
|
||||||
|
nativeBuildInputs = [ ldc makeWrapper unzip which gdb git ]
|
||||||
|
|
||||||
|
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||||
|
Foundation
|
||||||
|
]);
|
||||||
|
|
||||||
|
buildInputs = [ curl tzdata ];
|
||||||
|
|
||||||
|
bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
|
||||||
|
osname = if stdenv.hostPlatform.isDarwin then
|
||||||
|
"osx"
|
||||||
|
else
|
||||||
|
stdenv.hostPlatform.parsed.kernel.name;
|
||||||
|
top = "$(echo $NIX_BUILD_TOP)";
|
||||||
|
pathToDmd = "${top}/dmd/generated/${osname}/release/${bits}/dmd";
|
||||||
|
|
||||||
|
# Buid and install are based on http://wiki.dlang.org/Building_DMD
|
||||||
|
buildPhase = ''
|
||||||
|
cd dmd
|
||||||
|
make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=ldmd2
|
||||||
|
cd ../druntime
|
||||||
|
make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd}
|
||||||
|
cd ../phobos
|
||||||
|
echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile
|
||||||
|
echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > LibcurlPathFile
|
||||||
|
make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)"
|
||||||
|
cd ..
|
||||||
|
'';
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
|
checkPhase = ''
|
||||||
|
cd dmd
|
||||||
|
# https://github.com/NixOS/nixpkgs/pull/55998#issuecomment-465871846
|
||||||
|
#make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHELL=$SHELL
|
||||||
|
cd ../druntime
|
||||||
|
make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release
|
||||||
|
cd ../phobos
|
||||||
|
make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)"
|
||||||
|
cd ..
|
||||||
|
'';
|
||||||
|
|
||||||
|
dontStrip = true;
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir $out
|
cd dmd
|
||||||
cp -r --symbolic-link ${dmdBuild}/* $out/
|
mkdir $out
|
||||||
|
mkdir $out/bin
|
||||||
|
cp ${pathToDmd} $out/bin
|
||||||
|
|
||||||
|
mkdir -p $out/share/man/man1
|
||||||
|
mkdir -p $out/share/man/man5
|
||||||
|
cp -r docs/man/man1/* $out/share/man/man1/
|
||||||
|
cp -r docs/man/man5/* $out/share/man/man5/
|
||||||
|
|
||||||
|
cd ../druntime
|
||||||
|
mkdir $out/include
|
||||||
|
mkdir $out/include/d2
|
||||||
|
cp -r import/* $out/include/d2
|
||||||
|
|
||||||
|
cd ../phobos
|
||||||
|
mkdir $out/lib
|
||||||
|
cp generated/${osname}/release/${bits}/libphobos2.* $out/lib
|
||||||
|
|
||||||
|
cp -r std $out/include/d2
|
||||||
|
cp -r etc $out/include/d2
|
||||||
|
|
||||||
|
wrapProgram $out/bin/dmd \
|
||||||
|
--prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \
|
||||||
|
--set-default CC "${targetPackages.stdenv.cc}/bin/cc"
|
||||||
|
|
||||||
|
substitute ${dmdConfFile} "$out/bin/dmd.conf" --subst-var out
|
||||||
'';
|
'';
|
||||||
meta = dmdBuild.meta;
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
description = "Official reference compiler for the D language";
|
||||||
|
homepage = http://dlang.org/;
|
||||||
|
# Everything is now Boost licensed, even the backend.
|
||||||
|
# https://github.com/dlang/dmd/pull/6680
|
||||||
|
license = licenses.boost;
|
||||||
|
maintainers = with maintainers; [ ThomasMader ];
|
||||||
|
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user