diff options
author | OPNA2608 <christoph.neidahl@gmail.com> | 2022-08-06 17:07:57 +0200 |
---|---|---|
committer | OPNA2608 <christoph.neidahl@gmail.com> | 2022-10-23 16:12:45 +0200 |
commit | 9695c4ee8d1d6eec93304fd56757b5c0ba46945c (patch) | |
tree | 9b863a7ee88fe5e027a7a6370db43b2e5e12cd4e /pkgs/development/compilers/dmd | |
parent | 808f2ab87b075b56200858e24633436d2b4eacb4 (diff) |
dmd: 2.097.2 -> 2.100.2, refactor, fix on Darwin
Diffstat (limited to 'pkgs/development/compilers/dmd')
-rw-r--r-- | pkgs/development/compilers/dmd/binary.nix | 21 | ||||
-rw-r--r-- | pkgs/development/compilers/dmd/bootstrap.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/dmd/default.nix | 221 | ||||
-rw-r--r-- | pkgs/development/compilers/dmd/generic.nix | 255 |
4 files changed, 281 insertions, 220 deletions
diff --git a/pkgs/development/compilers/dmd/binary.nix b/pkgs/development/compilers/dmd/binary.nix index fdea39db94be1..b7f7755d057e7 100644 --- a/pkgs/development/compilers/dmd/binary.nix +++ b/pkgs/development/compilers/dmd/binary.nix @@ -20,10 +20,19 @@ in stdenv.mkDerivation { nativeBuildInputs = lib.optionals hostPlatform.isLinux [ autoPatchelfHook - ] ++ lib.optional hostPlatform.isDarwin fixDarwinDylibNames; - propagatedBuildInputs = [ curl tzdata ] ++ lib.optional hostPlatform.isLinux glibc; + ] ++ lib.optionals hostPlatform.isDarwin [ + fixDarwinDylibNames + ]; + propagatedBuildInputs = [ + curl + tzdata + ] ++ lib.optionals hostPlatform.isLinux [ + glibc + ]; installPhase = '' + runHook preInstall + mkdir -p $out # try to copy model-specific binaries into bin first @@ -41,8 +50,16 @@ in stdenv.mkDerivation { # fix paths in dmd.conf (one level less) substituteInPlace $out/bin/dmd.conf --replace "/../../" "/../" + + runHook postInstall ''; + # Stripping on Darwin started to break libphobos2.a + # Undefined symbols for architecture x86_64: + # "_rt_envvars_enabled", referenced from: + # __D2rt6config16rt_envvarsOptionFNbNiAyaMDFNbNiQkZQnZQq in libphobos2.a(config_99a_6c3.o) + dontStrip = hostPlatform.isDarwin; + meta = with lib; { description = "Digital Mars D Compiler Package"; # As of 2.075 all sources and binaries use the boost license diff --git a/pkgs/development/compilers/dmd/bootstrap.nix b/pkgs/development/compilers/dmd/bootstrap.nix index 087781ae2ca42..16aa5ed4d4049 100644 --- a/pkgs/development/compilers/dmd/bootstrap.nix +++ b/pkgs/development/compilers/dmd/bootstrap.nix @@ -3,7 +3,7 @@ callPackage ./binary.nix { version = "2.090.1"; hashes = { # Get these from `nix-prefetch-url http://downloads.dlang.org/releases/2.x/2.090.1/dmd.2.090.1.linux.tar.xz` etc.. - osx = "0rbn7j4dr3q0y09fblpj999bi063pi4230rqd5xgd3gwxxa0cz7l"; - linux = "1vk6lsvd6y7ccvffd23yial4ig90azaxf2rxc6yvidqd1qhan807"; + osx = "sha256-9HwGVO/8jfZ6aTiDIUi8w4C4Ukry0uUS8ACP3Ig8dmU="; + linux = "sha256-ByCrIA4Nt7i9YT0L19VXIL1IqIp+iObcZux407amZu4="; }; } diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index b29190b9b8342..35cb0759c5e15 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,217 +1,6 @@ -{ stdenv, lib, fetchFromGitHub -, makeWrapper, unzip, which, writeTextFile -, curl, tzdata, gdb, Foundation, git, callPackage -, targetPackages, fetchpatch, bash -, HOST_DMD? "${callPackage ./bootstrap.nix { }}/bin/dmd" -, version? "2.097.2" -, dmdSha256? "16ldkk32y7ln82n7g2ym5d1xf3vly3i31hf8600cpvimf6yhr6kb" -, druntimeSha256? "1sayg6ia85jln8g28vb4m124c27lgbkd6xzg9gblss8ardb8dsp1" -, phobosSha256? "0czg13h65b6qwhk9ibya21z3iv3fpk3rsjr3zbcrpc2spqjknfw5" -}: - -let - dmdConfFile = writeTextFile { - name = "dmd.conf"; - text = (lib.generators.toINI {} { - Environment = { - 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 - -stdenv.mkDerivation rec { - pname = "dmd"; - inherit version; - - 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"; - }) - ]; - - sourceRoot = "."; - - # https://issues.dlang.org/show_bug.cgi?id=19553 - hardeningDisable = [ "fortify" ]; - - # Not using patches option to make it easy to patch, for example, dmd and - # Phobos at same time if that's required - patchPhase = - - # Migrates D1-style operator overloads in DMD source, to allow building with - # a newer DMD - lib.optionalString (lib.versionOlder version "2.088.0") '' - patch -p1 -F3 --directory=dmd -i ${(fetchpatch { - url = "https://github.com/dlang/dmd/commit/c4d33e5eb46c123761ac501e8c52f33850483a8a.patch"; - sha256 = "0rhl9h3hsi6d0qrz24f4zx960cirad1h8mm383q6n21jzcw71cp5"; - })} - '' - - # Fixes C++ tests that compiled on older C++ but not on the current one - + lib.optionalString (lib.versionOlder version "2.092.2") '' - patch -p1 -F3 --directory=druntime -i ${(fetchpatch { - url = "https://github.com/dlang/druntime/commit/438990def7e377ca1f87b6d28246673bb38022ab.patch"; - sha256 = "0nxzkrd1rzj44l83j7jj90yz2cv01na8vn9d116ijnm85jl007b4"; - })} - '' - - + postPatch; - - - postPatch = - '' - patchShebangs . - - # Disable tests that rely on objdump whitespace until fixed upstream: - # https://issues.dlang.org/show_bug.cgi?id=23317 - rm dmd/test/runnable/cdvecfill.sh - rm dmd/test/compilable/cdcmp.d - '' - - # This one has tested against a hardcoded year, then against a current year on - # and off again. It just isn't worth it to patch all the historical versions - # of it, so just remove it until the most recent change. - + lib.optionalString (lib.versionOlder version "2.091.0") '' - rm dmd/test/compilable/ddocYear.d - '' - - + lib.optionalString (version == "2.092.1") '' - rm dmd/test/dshell/test6952.d - '' + lib.optionalString (lib.versionAtLeast version "2.092.2") '' - 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 - - # Grep'd string changed with gdb 12 - substituteInPlace druntime/test/exceptions/Makefile \ - --replace 'in D main (' 'in _Dmain (' - '' - - + 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)" - ''; - - nativeBuildInputs = [ makeWrapper unzip which git ]; - - buildInputs = [ gdb curl tzdata ] - ++ lib.optionals stdenv.isDarwin [ Foundation gdb ]; - - - osname = if stdenv.isDarwin then - "osx" - else - stdenv.hostPlatform.parsed.kernel.name; - top = "$NIX_BUILD_TOP"; - pathToDmd = "${top}/dmd/generated/${osname}/release/${bits}/dmd"; - - # Build 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=${HOST_DMD} - 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; - - # many tests are disbled because they are failing - - # 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 - checkPhase = '' - cd dmd - NIX_ENFORCE_PURITY= \ - make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHELL=$SHELL - - cd ../druntime - NIX_ENFORCE_PURITY= \ - make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release - - cd ../phobos - NIX_ENFORCE_PURITY= \ - 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 .. - ''; - - 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/dmd - cp -r import/* $out/include/dmd - - cd ../phobos - mkdir $out/lib - cp generated/${osname}/release/${bits}/libphobos2.* $out/lib - - cp -r std $out/include/dmd - cp -r etc $out/include/dmd - - 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 = with lib; { - broken = stdenv.isDarwin; - description = "Official reference compiler for the D language"; - homepage = "https://dlang.org/"; - # Everything is now Boost licensed, even the backend. - # https://github.com/dlang/dmd/pull/6680 - license = licenses.boost; - maintainers = with maintainers; [ ThomasMader lionello dukc ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - }; +import ./generic.nix { + version = "2.100.2"; + dmdSha256 = "sha256-o4+G3ARXIGObYHtHooYZKr+Al6kHpiwpMIog3i4BlDM="; + druntimeSha256 = "sha256-qXvY1ECN4mPwOGgOE1FWwvxoRvlSww3tGLWgBdhzAKo="; + phobosSha256 = "sha256-kTHRaAKG7cAGb4IE/NGHWaZ8t7ZceKj03l6E8wLzJzs="; } diff --git a/pkgs/development/compilers/dmd/generic.nix b/pkgs/development/compilers/dmd/generic.nix new file mode 100644 index 0000000000000..a78ee92d62e96 --- /dev/null +++ b/pkgs/development/compilers/dmd/generic.nix @@ -0,0 +1,255 @@ +{ version +, dmdSha256 +, druntimeSha256 +, phobosSha256 +}: + +{ stdenv +, lib +, fetchFromGitHub +, makeWrapper +, which +, writeTextFile +, curl +, tzdata +, gdb +, Foundation +, callPackage +, targetPackages +, fetchpatch +, bash +, installShellFiles +, git +, unzip +, HOST_DMD ? "${callPackage ./bootstrap.nix { }}/bin/dmd" +}: + +let + dmdConfFile = writeTextFile { + name = "dmd.conf"; + text = (lib.generators.toINI { } { + Environment = { + 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; + osname = + if stdenv.isDarwin then + "osx" + else + stdenv.hostPlatform.parsed.kernel.name; + + pathToDmd = "\${NIX_BUILD_TOP}/dmd/generated/${osname}/release/${bits}/dmd"; +in + +stdenv.mkDerivation rec { + pname = "dmd"; + inherit version; + + 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"; + }) + ]; + + sourceRoot = "."; + + # https://issues.dlang.org/show_bug.cgi?id=19553 + hardeningDisable = [ "fortify" ]; + + # Not using patches option to make it easy to patch, for example, dmd and + # Phobos at same time if that's required + patchPhase = '' + runHook prePatch + + '' + lib.optionalString (lib.versionOlder version "2.088.0") '' + # Migrates D1-style operator overloads in DMD source, to allow building with + # a newer DMD + patch -p1 -F3 --directory=dmd -i ${(fetchpatch { + url = "https://github.com/dlang/dmd/commit/c4d33e5eb46c123761ac501e8c52f33850483a8a.patch"; + sha256 = "0rhl9h3hsi6d0qrz24f4zx960cirad1h8mm383q6n21jzcw71cp5"; + })} + '' + lib.optionalString (lib.versionOlder version "2.092.2") '' + # Fixes C++ tests that compiled on older C++ but not on the current one + patch -p1 -F3 --directory=druntime -i ${(fetchpatch { + url = "https://github.com/dlang/druntime/commit/438990def7e377ca1f87b6d28246673bb38022ab.patch"; + sha256 = "0nxzkrd1rzj44l83j7jj90yz2cv01na8vn9d116ijnm85jl007b4"; + })} + '' + '' + + runHook postPatch + ''; + + + postPatch = '' + patchShebangs dmd/test/{runnable,fail_compilation,compilable,tools}{,/extra-files}/*.sh + + 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 + + # Disable tests that rely on objdump whitespace until fixed upstream: + # https://issues.dlang.org/show_bug.cgi?id=23317 + rm dmd/test/runnable/cdvecfill.sh + rm dmd/test/compilable/cdcmp.d + + # Grep'd string changed with gdb 12 + # https://issues.dlang.org/show_bug.cgi?id=23198 + substituteInPlace druntime/test/exceptions/Makefile \ + --replace 'in D main (' 'in _Dmain (' + + # We're using gnused on all platforms + substituteInPlace druntime/test/coverage/Makefile \ + --replace 'freebsd osx' 'none' + '' + + + lib.optionalString (lib.versionOlder version "2.091.0") '' + # This one has tested against a hardcoded year, then against a current year on + # and off again. It just isn't worth it to patch all the historical versions + # of it, so just remove it until the most recent change. + rm dmd/test/compilable/ddocYear.d + '' + lib.optionalString (lib.versionAtLeast version "2.089.0" && lib.versionOlder version "2.092.2") '' + rm dmd/test/dshell/test6952.d + '' + lib.optionalString (lib.versionAtLeast version "2.092.2") '' + substituteInPlace dmd/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash" + '' + + + 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)" + ''; + + nativeBuildInputs = [ + makeWrapper + which + installShellFiles + ] ++ lib.optionals (lib.versionOlder version "2.088.0") [ + git + ]; + + buildInputs = [ + curl + tzdata + ] ++ lib.optionals stdenv.isDarwin [ + Foundation + ]; + + checkInputs = [ + gdb + ] ++ lib.optionals (lib.versionOlder version "2.089.0") [ + unzip + ]; + + buildFlags = [ + "BUILD=release" + "ENABLE_RELEASE=1" + "PIC=1" + ]; + + # Build and install are based on http://wiki.dlang.org/Building_DMD + buildPhase = '' + runHook preBuild + + export buildJobs=$NIX_BUILD_CORES + if [ -z $enableParallelBuilding ]; then + buildJobs=1 + fi + + make -C dmd -f posix.mak $buildFlags -j$buildJobs HOST_DMD=${HOST_DMD} + make -C druntime -f posix.mak $buildFlags -j$buildJobs DMD=${pathToDmd} + echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile + echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > LibcurlPathFile + make -C phobos -f posix.mak $buildFlags -j$buildJobs DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$PWD" + + runHook postBuild + ''; + + doCheck = true; + + checkFlags = buildFlags; + + # many tests are disbled because they are failing + + # 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 + checkPhase = '' + runHook preCheck + + export checkJobs=$NIX_BUILD_CORES + if [ -z $enableParallelChecking ]; then + checkJobs=1 + fi + + NIX_ENFORCE_PURITY= \ + make -C dmd/test $checkFlags CC=$CXX SHELL=$SHELL -j$checkJobs N=$checkJobs + + NIX_ENFORCE_PURITY= \ + make -C druntime -f posix.mak unittest $checkFlags -j$checkJobs + + NIX_ENFORCE_PURITY= \ + make -C phobos -f posix.mak unittest $checkFlags -j$checkJobs DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$PWD" + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 ${pathToDmd} $out/bin/dmd + + installManPage dmd/docs/man/man*/* + + mkdir -p $out/include/dmd + cp -r {druntime/import/*,phobos/{std,etc}} $out/include/dmd/ + + mkdir $out/lib + cp phobos/generated/${osname}/release/${bits}/libphobos2.* $out/lib/ + + 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 + + runHook postInstall + ''; + + meta = with lib; { + description = "Official reference compiler for the D language"; + homepage = "https://dlang.org/"; + # Everything is now Boost licensed, even the backend. + # https://github.com/dlang/dmd/pull/6680 + license = licenses.boost; + maintainers = with maintainers; [ ThomasMader lionello dukc ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; +} |