b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #135905 from dukc/secondDmd2097

Browse source 
D compiler update
This commit is contained in:
adisbladis 2021-09-13 11:36:55 -05:00 committed by GitHub
parent f01755b7a8 cea016a961
commit fcf5397793
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 123 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/science/biology/sambamba/default.nix
View file

@ -2,21 +2,21 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sambamba"; pname = "sambamba";
version = "0.8.0"; version = "0.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "biod"; owner = "biod";
repo = "sambamba"; repo = "sambamba";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256:0kx5a0fmvv9ldz2hnh7qavgf7711kqc73zxf51k4cca4hr58zxr9"; sha256 = "0f4qngnys2zjb0ri54k6kxqnssg938mnnscs4z9713hjn41rk7yd";
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [ patches = [
# Fixes hardcoded gcc, making clang build possible. # make ldc 1.27.1 compatible
(fetchpatch { (fetchpatch {
url = "https://github.com/biod/sambamba/commit/c50a1c91e1ba062635467f197139bf6784e9be15.patch"; url = "https://github.com/biod/sambamba/pull/480/commits/b5c80feb62683d24ec0529f685a1d7a36962a1d4.patch";
sha256 = "1y0vlybmb9wpg4z1nca7m96mk9hxmvd3yrg7w8rxscj45hcqvf8q"; sha256 = "0yr9baxqbhyb4scwcwczk77z8gazhkl60jllhz9dnrb7p5qsvs7r";
}) })
]; ];

206
pkgs/development/compilers/dmd/default.nix
View file

@ -1,26 +1,25 @@
{ stdenv, lib, fetchFromGitHub { stdenv, lib, fetchFromGitHub
, makeWrapper, unzip, which, writeTextFile , makeWrapper, unzip, which, writeTextFile
, curl, tzdata, gdb, darwin, git, callPackage , curl, tzdata, gdb, Foundation, git, callPackage
, targetPackages, fetchpatch, bash , targetPackages, fetchpatch, bash
, dmdBootstrap ? callPackage ./bootstrap.nix { } , HOST_DMD? "${callPackage ./bootstrap.nix { }}/bin/dmd"
, HOST_DMD ? "${dmdBootstrap}/bin/dmd" , version? "2.097.2"
, version ? "2.095.1" , dmdSha256? "16ldkk32y7ln82n7g2ym5d1xf3vly3i31hf8600cpvimf6yhr6kb"
, dmdSha256 ? "sha256:0faca1y42a1h16aml4lb7z118mh9k9fjx3xlw3ki5f1h3ln91xhk" , druntimeSha256? "1sayg6ia85jln8g28vb4m124c27lgbkd6xzg9gblss8ardb8dsp1"
, druntimeSha256 ? "sha256:0ad4pa5llr9m9wqbvfv4yrcra4zz9qxlh5kx43mrv48f9bcxm2ha" , phobosSha256? "0czg13h65b6qwhk9ibya21z3iv3fpk3rsjr3zbcrpc2spqjknfw5"
, phobosSha256 ? "sha256:04w6jw4izix2vbw62j13wvz6q3pi7vivxnmxqj0g8904j5g0cxjl"
}: }:
let let
dmdConfFile = writeTextFile { dmdConfFile = writeTextFile {
name = "dmd.conf"; name = "dmd.conf";
text = (lib.generators.toINI {} { text = (lib.generators.toINI {} {
Environment = { Environment = {
DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}''; DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}'';
}; };
}); });
}; };
bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -30,27 +29,27 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
srcs = [ srcs = [
(fetchFromGitHub { (fetchFromGitHub {
owner = "dlang"; owner = "dlang";
repo = "dmd"; repo = "dmd";
rev = "v${version}"; rev = "v${version}";
sha256 = dmdSha256; sha256 = dmdSha256;
name = "dmd"; name = "dmd";
}) })
(fetchFromGitHub { (fetchFromGitHub {
owner = "dlang"; owner = "dlang";
repo = "druntime"; repo = "druntime";
rev = "v${version}"; rev = "v${version}";
sha256 = druntimeSha256; sha256 = druntimeSha256;
name = "druntime"; name = "druntime";
}) })
(fetchFromGitHub { (fetchFromGitHub {
owner = "dlang"; owner = "dlang";
repo = "phobos"; repo = "phobos";
rev = "v${version}"; rev = "v${version}";
sha256 = phobosSha256; sha256 = phobosSha256;
name = "phobos"; name = "phobos";
}) })
]; ];
sourceRoot = "."; sourceRoot = ".";
@ -58,61 +57,73 @@ stdenv.mkDerivation rec {
# https://issues.dlang.org/show_bug.cgi?id=19553 # https://issues.dlang.org/show_bug.cgi?id=19553
hardeningDisable = [ "fortify" ]; hardeningDisable = [ "fortify" ];
postUnpack = '' # Not using patches option to make it easy to patch, for example, dmd and
patchShebangs . # Phobos at same time if that's required
patchPhase =
lib.optionalString (builtins.compareVersions version "2.092.1" <= 0) ''
patch -p1 -F3 --directory=druntime -i ${(fetchpatch {
url = "https://github.com/dlang/druntime/commit/438990def7e377ca1f87b6d28246673bb38022ab.patch";
sha256 = "0nxzkrd1rzj44l83j7jj90yz2cv01na8vn9d116ijnm85jl007b4";
})}
'' + postPatch;
postPatch =
''
patchShebangs .
'' + lib.optionalString (version == "2.092.1") ''
rm dmd/test/dshell/test6952.d
'' + lib.optionalString (builtins.compareVersions "2.092.1" version < 0) ''
substituteInPlace dmd/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash"
'' + ''
rm dmd/test/runnable/gdb1.d
rm dmd/test/runnable/gdb10311.d
rm dmd/test/runnable/gdb14225.d
rm dmd/test/runnable/gdb14276.d
rm dmd/test/runnable/gdb14313.d
rm dmd/test/runnable/gdb14330.d
rm dmd/test/runnable/gdb15729.sh
rm dmd/test/runnable/gdb4149.d
rm dmd/test/runnable/gdb4181.d
'' + lib.optionalString stdenv.isLinux ''
substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
'' + lib.optionalString stdenv.isDarwin ''
substituteInPlace phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)"
''; '';
postPatch = '' nativeBuildInputs = [ makeWrapper unzip which git ];
substituteInPlace dmd/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash"
rm dmd/test/runnable/gdb1.d buildInputs = [ gdb curl tzdata ]
rm dmd/test/runnable/gdb10311.d ++ lib.optional stdenv.isDarwin [ Foundation gdb ];
rm dmd/test/runnable/gdb14225.d
rm dmd/test/runnable/gdb14276.d
rm dmd/test/runnable/gdb14313.d
rm dmd/test/runnable/gdb14330.d
rm dmd/test/runnable/gdb15729.sh
rm dmd/test/runnable/gdb4149.d
rm dmd/test/runnable/gdb4181.d
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)"
'';
nativeBuildInputs = [ makeWrapper unzip which gdb git ]
++ lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ osname = if stdenv.isDarwin then
Foundation
]);
buildInputs = [ curl tzdata ];
bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
osname = if stdenv.hostPlatform.isDarwin then
"osx" "osx"
else else
stdenv.hostPlatform.parsed.kernel.name; stdenv.hostPlatform.parsed.kernel.name;
top = "$(echo $NIX_BUILD_TOP)"; top = "$NIX_BUILD_TOP";
pathToDmd = "${top}/dmd/generated/${osname}/release/${bits}/dmd"; pathToDmd = "${top}/dmd/generated/${osname}/release/${bits}/dmd";
# Buid and install are based on http://wiki.dlang.org/Building_DMD # Build and install are based on http://wiki.dlang.org/Building_DMD
buildPhase = '' buildPhase = ''
cd dmd cd dmd
make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=${HOST_DMD} make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=${HOST_DMD}
cd ../druntime cd ../druntime
make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd}
cd ../phobos cd ../phobos
echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile
echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > LibcurlPathFile 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)" 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 .. cd ..
''; '';
doCheck = true; doCheck = true;
# many tests are disbled because they are failing
# NOTE: Purity check is disabled for checkPhase because it doesn't fare well # NOTE: Purity check is disabled for checkPhase because it doesn't fare well
# with the DMD linker. See https://github.com/NixOS/nixpkgs/issues/97420 # with the DMD linker. See https://github.com/NixOS/nixpkgs/issues/97420
checkPhase = '' checkPhase = ''
@ -132,43 +143,42 @@ stdenv.mkDerivation rec {
''; '';
installPhase = '' installPhase = ''
cd dmd cd dmd
mkdir $out mkdir $out
mkdir $out/bin mkdir $out/bin
cp ${pathToDmd} $out/bin cp ${pathToDmd} $out/bin
mkdir -p $out/share/man/man1 mkdir -p $out/share/man/man1
mkdir -p $out/share/man/man5 mkdir -p $out/share/man/man5
cp -r docs/man/man1/* $out/share/man/man1/ cp -r docs/man/man1/* $out/share/man/man1/
cp -r docs/man/man5/* $out/share/man/man5/ cp -r docs/man/man5/* $out/share/man/man5/
cd ../druntime cd ../druntime
mkdir $out/include mkdir $out/include
mkdir $out/include/dmd mkdir $out/include/dmd
cp -r import/* $out/include/dmd cp -r import/* $out/include/dmd
cd ../phobos cd ../phobos
mkdir $out/lib mkdir $out/lib
cp generated/${osname}/release/${bits}/libphobos2.* $out/lib cp generated/${osname}/release/${bits}/libphobos2.* $out/lib
cp -r std $out/include/dmd cp -r std $out/include/dmd
cp -r etc $out/include/dmd cp -r etc $out/include/dmd
wrapProgram $out/bin/dmd \ wrapProgram $out/bin/dmd \
--prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \
--set-default CC "${targetPackages.stdenv.cc}/bin/cc" --set-default CC "${targetPackages.stdenv.cc}/bin/cc"
substitute ${dmdConfFile} "$out/bin/dmd.conf" --subst-var out substitute ${dmdConfFile} "$out/bin/dmd.conf" --subst-var out
''; '';
meta = with lib; { meta = with lib; {
description = "Official reference compiler for the D language"; description = "Official reference compiler for the D language";
homepage = "http://dlang.org/"; homepage = "https://dlang.org/";
# Everything is now Boost licensed, even the backend. # Everything is now Boost licensed, even the backend.
# https://github.com/dlang/dmd/pull/6680 # https://github.com/dlang/dmd/pull/6680
license = licenses.boost; license = licenses.boost;
maintainers = with maintainers; [ ThomasMader lionello ]; maintainers = with maintainers; [ ThomasMader lionello ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
# many tests are failing
}; };
} }

4
pkgs/development/compilers/ldc/default.nix
View file

@ -1,4 +1,4 @@
import ./generic.nix { import ./generic.nix {
version = "1.25.1"; version = "1.27.1";
ldcSha256 = "sha256-DjcW/pknvpEmTR/eXEEHECb2xEJic16evaU4CJthLUA="; ldcSha256 = "1775001ba6n8w46ln530kb5r66vs935ingnppgddq8wqnc0gbj4k";
} }

5
pkgs/development/libraries/gtkd/default.nix
View file

@ -27,6 +27,11 @@ in stdenv.mkDerivation rec {
url = "https://github.com/gtkd-developers/GtkD/commit/a9db09117ab27127ca4c3b8d2f308fae483a9199.patch"; url = "https://github.com/gtkd-developers/GtkD/commit/a9db09117ab27127ca4c3b8d2f308fae483a9199.patch";
sha256 = "0ngyqifw1kandc1vk01kms3z65pcisfd75q7z09rml96glhfzjd6"; sha256 = "0ngyqifw1kandc1vk01kms3z65pcisfd75q7z09rml96glhfzjd6";
}) })
# Fix breakage with dmd ldc 1.26 and newer
(fetchpatch {
url = "https://github.com/gtkd-developers/GtkD/commit/323ff96c648882eaca2faee170bd9e90c6e1e9c3.patch";
sha256 = "1rhyi0isl6fl5i6fgsinvgq6v72xq7c6sajrxcsnmrzpvw91il3d";
})
]; ];
prePatch = '' prePatch = ''

4
pkgs/top-level/all-packages.nix
View file

@ -4342,7 +4342,9 @@ with pkgs;
dleyna-server = callPackage ../development/libraries/dleyna-server { }; dleyna-server = callPackage ../development/libraries/dleyna-server { };
dmd = callPackage ../development/compilers/dmd { }; dmd = callPackage ../development/compilers/dmd {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
dmg2img = callPackage ../tools/misc/dmg2img { }; dmg2img = callPackage ../tools/misc/dmg2img { };