From 446c0feadf7ca4a3289a5a0c9e0bbe0e74801f12 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 4 Jun 2023 18:18:21 -0400 Subject: nix use overlays when convenient --- nix-overlays/dmd/binary.nix | 72 ++++++++++++++ nix-overlays/dmd/bootstrap.nix | 9 ++ nix-overlays/dmd/default.nix | 6 ++ nix-overlays/dmd/generic.nix | 219 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 306 insertions(+) create mode 100644 nix-overlays/dmd/binary.nix create mode 100644 nix-overlays/dmd/bootstrap.nix create mode 100644 nix-overlays/dmd/default.nix create mode 100644 nix-overlays/dmd/generic.nix (limited to 'nix-overlays/dmd') diff --git a/nix-overlays/dmd/binary.nix b/nix-overlays/dmd/binary.nix new file mode 100644 index 0000000..6a99d42 --- /dev/null +++ b/nix-overlays/dmd/binary.nix @@ -0,0 +1,72 @@ +{ lib, stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, glibc +, version, hashes }: + +let + inherit (stdenv) hostPlatform; + OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; + MODEL = toString hostPlatform.parsed.cpu.bits; +in stdenv.mkDerivation { + pname = "dmd-bootstrap"; + inherit version; + + src = fetchurl rec { + name = "dmd.${version}.${OS}.tar.xz"; + url = "http://downloads.dlang.org/releases/2.x/${version}/${name}"; + sha256 = hashes.${OS} or (throw "missing bootstrap sha256 for OS ${OS}"); + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = lib.optionals hostPlatform.isLinux [ + autoPatchelfHook + ] ++ lib.optionals hostPlatform.isDarwin [ + fixDarwinDylibNames + ]; + propagatedBuildInputs = [ + curl + tzdata + ] ++ lib.optionals hostPlatform.isLinux [ + glibc + stdenv.cc.cc.libgcc + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + + # try to copy model-specific binaries into bin first + mv ${OS}/bin${MODEL} $out/bin || true + + mv src license.txt ${OS}/* $out/ + + # move man into place + mkdir -p $out/share + mv man $out/share/ + + # move docs into place + mkdir -p $out/share/doc + mv html/d $out/share/doc/ + + # 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 + license = licenses.boost; + maintainers = [ maintainers.lionello ]; + homepage = "https://dlang.org/"; + platforms = [ "x86_64-darwin" "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/nix-overlays/dmd/bootstrap.nix b/nix-overlays/dmd/bootstrap.nix new file mode 100644 index 0000000..16aa5ed --- /dev/null +++ b/nix-overlays/dmd/bootstrap.nix @@ -0,0 +1,9 @@ +{ callPackage }: +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 = "sha256-9HwGVO/8jfZ6aTiDIUi8w4C4Ukry0uUS8ACP3Ig8dmU="; + linux = "sha256-ByCrIA4Nt7i9YT0L19VXIL1IqIp+iObcZux407amZu4="; + }; +} diff --git a/nix-overlays/dmd/default.nix b/nix-overlays/dmd/default.nix new file mode 100644 index 0000000..7beb9e5 --- /dev/null +++ b/nix-overlays/dmd/default.nix @@ -0,0 +1,6 @@ +import ./generic.nix { + version = "2.104.0"; + dmdSha256 = "sha256-yv+uW6cYAId2HK/YSPxsR9Xt0o3LWa97z8KyzjFik6s="; + #druntimeSha256 = ""; + phobosSha256 = "sha256-cWp36Gd/lh3gy21bf9z0/RqzlJmf6ypmx72aMeakcec="; +} diff --git a/nix-overlays/dmd/generic.nix b/nix-overlays/dmd/generic.nix new file mode 100644 index 0000000..e500385 --- /dev/null +++ b/nix-overlays/dmd/generic.nix @@ -0,0 +1,219 @@ +{ version +, dmdSha256 +, phobosSha256 +}: + +{ stdenv +, lib +, fetchFromGitHub +, makeWrapper +, which +, writeTextFile +, curl +, tzdata +, gdb +, 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 = "phobos"; + rev = "v${version}"; + sha256 = phobosSha256; + name = "phobos"; + }) + ]; + + sourceRoot = "."; + + # https://issues.dlang.org/show_bug.cgi?id=19553 + hardeningDisable = [ "fortify" ]; + + #patches = lib.optionals (lib.versionOlder version "2.088.0") [ + # # Migrates D1-style operator overloads in DMD source, to allow building with + # # a newer DMD + # (fetchpatch { + # url = "https://github.com/dlang/dmd/commit/c4d33e5eb46c123761ac501e8c52f33850483a8a.patch"; + # stripLen = 1; + # extraPrefix = "dmd/"; + # sha256 = "sha256-N21mAPfaTo+zGCip4njejasraV5IsWVqlGR5eOdFZZE="; + # }) + #] ++ lib.optionals (lib.versionOlder version "2.092.2") [ + # # Fixes C++ tests that compiled on older C++ but not on the current one + # (fetchpatch { + # url = "https://github.com/dlang/druntime/commit/438990def7e377ca1f87b6d28246673bb38022ab.patch"; + # stripLen = 1; + # extraPrefix = "druntime/"; + # sha256 = "sha256-/pPKK7ZK9E/mBrxm2MZyBNhYExE8p9jz8JqBdZSE6uY="; + # }) + #]; + + postPatch = '' + patchShebangs dmd/compiler/test/{runnable,fail_compilation,compilable,tools}{,/extra-files}/*.sh + + rm dmd/compiler/test/runnable_cxx/cppa.d + + # Grep'd string changed with gdb 12 + # https://issues.dlang.org/show_bug.cgi?id=23198 + substituteInPlace dmd/druntime/test/exceptions/Makefile \ + --replace 'in D main (' 'in _Dmain (' + + # We're using gnused on all platforms + substituteInPlace dmd/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/compiler/test/compilable/ddocYear.d + '' + lib.optionalString (lib.versionAtLeast version "2.089.0" && lib.versionOlder version "2.092.2") '' + rm dmd/compiler/test/dshell/test6952.d + '' + lib.optionalString (lib.versionAtLeast version "2.092.2") '' + substituteInPlace dmd/compiler/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 + ]; + + nativeCheckInputs = [ + 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} + echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile + echo ${lib.getLib curl}/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/compiler/test $checkFlags CC=$CXX SHELL=$SHELL -j$checkJobs N=$checkJobs + + NIX_ENFORCE_PURITY= \ + make -C phobos -f posix.mak unittest $checkFlags -j$checkJobs DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$PWD" + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 ${pathToDmd} $out/bin/dmd + + installManPage dmd/docs/man/man*/* + + 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" ]; + }; +} -- cgit v1.2.3