diff options
| -rw-r--r-- | README | 6 | ||||
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | nix-overlays/dmd/default.nix | 6 | ||||
| -rw-r--r-- | nix-overlays/dmd/generic.nix | 69 | ||||
| -rw-r--r-- | org/dlang-nix-flakes.org | 139 |
5 files changed, 134 insertions, 90 deletions
@@ -39,7 +39,7 @@ nix overlays for (updates nixpkgs, more recent versions of): - dub ( 1.23.0 -> 1.36.0 ) [for nix versions 1.31.0 ... 1.33.0 broken] - dtools ( 2.095.1 -> 2.103.1 ) - - dmd ( 2.100.2 -> 2.106.1 ) KO ✗ + - dmd ( 2.100.2 -> 2.108.0 ) - gdc [not yet available] (updates nixpkgs circa 2023-05-12) @@ -85,14 +85,14 @@ search nixpkgs here: - version in nixpkgs: - https://search.nixos.org/packages?channel=unstable&show=ldc&from=0&size=100&sort=relevance&type=packages&query=ldc -*** dmd KO ✗ ( 2.100.2 -> 2.106.1 ) +*** dmd OK ✓ ( 2.100.2 -> 2.108.0 ) - https://dlang.org/ - https://wiki.dlang.org/LDC - https://github.com/dlang/dmd - https://github.com/dlang/dmd/tags - nix-prefetch-url --unpack https://github.com/dlang/dmd/archive/refs/tags/v2.106.1.tar.gz + nix-prefetch-url --unpack https://github.com/dlang/dmd/archive/refs/tags/v2.108.0.tar.gz - https://github.com/dlang/dmd/pulls - version in nixpkgs: @@ -21,7 +21,7 @@ ''; localOverlay = (final: prev: { ldc = prev.callPackage ./nix-overlays/ldc { }; # -> ok 1.37.0 - dmd = prev.callPackage ./nix-overlays/dmd { }; # -> ok 2.106.1 + dmd = prev.callPackage ./nix-overlays/dmd { }; # -> ok 2.108.0 dub = prev.callPackage ./nix-overlays/dub { }; # -> ? 1.36.0 dtools = prev.callPackage ./nix-overlays/dtools { }; # -> ok 2.103.1 #gdc = prev.callPackage ./nix-overlays/gdc { }; # empty @@ -108,7 +108,7 @@ inherit shellHook; }; dsh-overlay-dmd-dub = mkShell { - name = "overlay - dmd-2.106.1 - dub-1.36.0 - broken"; + name = "overlay - dmd-2.108.0 - dub-1.36.0"; inherit shell; inherit devEnv; packages = [ diff --git a/nix-overlays/dmd/default.nix b/nix-overlays/dmd/default.nix index bdc9faf..9f3f5a2 100644 --- a/nix-overlays/dmd/default.nix +++ b/nix-overlays/dmd/default.nix @@ -1,5 +1,5 @@ import ./generic.nix { - version = "2.106.1"; - dmdSha256 = "sha256-vjYa/Pxrz7J2htXT+fa+xaeen/Vxne++lELbHTSXBK8="; - phobosSha256 = "sha256-yRL9ub3u4mREG9PVxBvgQ/LDXD57RadPTZ2h08qyh/s="; + version = "2.108.0"; + dmdHash = "sha256-tlWcFgKtXzfqMMkOq4ezhZHdYCXFckjN5+m6jO4VH0U="; + phobosHash = "sha256-uU8S4rABOfhpKh+MvSbclkbdf0hrsuKF8SIpWMnPpfU="; } diff --git a/nix-overlays/dmd/generic.nix b/nix-overlays/dmd/generic.nix index a2a1b8a..63c2bd1 100644 --- a/nix-overlays/dmd/generic.nix +++ b/nix-overlays/dmd/generic.nix @@ -1,6 +1,6 @@ { version -, dmdSha256 -, phobosSha256 +, dmdHash +, phobosHash }: { stdenv @@ -22,7 +22,7 @@ , git , unzip , dmdBootstrap ? callPackage ./bootstrap.nix { } -, dmd_bin ? "${dmdBootstrap}/bin" +, dmdBin ? "${dmdBootstrap}/bin" }: let @@ -45,7 +45,7 @@ let pathToDmd = "\${NIX_BUILD_TOP}/dmd/generated/${osname}/release/${bits}/dmd"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dmd"; inherit version; @@ -55,15 +55,15 @@ stdenv.mkDerivation rec { (fetchFromGitHub { owner = "dlang"; repo = "dmd"; - rev = "v${version}"; - sha256 = dmdSha256; + rev = "v${finalAttrs.version}"; + hash = dmdHash; name = "dmd"; }) (fetchFromGitHub { owner = "dlang"; repo = "phobos"; - rev = "v${version}"; - sha256 = phobosSha256; + rev = "v${finalAttrs.version}"; + hash = phobosHash; name = "phobos"; }) ]; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { url = "https://github.com/dlang/dmd/commit/c4d33e5eb46c123761ac501e8c52f33850483a8a.patch"; stripLen = 1; extraPrefix = "dmd/"; - sha256 = "sha256-N21mAPfaTo+zGCip4njejasraV5IsWVqlGR5eOdFZZE="; + hash = "sha256-N21mAPfaTo+zGCip4njejasraV5IsWVqlGR5eOdFZZE="; }) ]; @@ -102,18 +102,14 @@ stdenv.mkDerivation rec { # https://issues.dlang.org/show_bug.cgi?id=23317 rm dmd/compiler/test/runnable/cdvecfill.sh rm dmd/compiler/test/compilable/cdcmp.d - '' - - + lib.optionalString (lib.versionAtLeast version "2.089.0" && lib.versionOlder version "2.092.2") '' + '' + 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);" "" + substituteInPlace dmd/compiler/test/dshell/test6952.d --replace-fail "/usr/bin/env bash" "${bash}/bin/bash" + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace phobos/std/socket.d --replace-fail "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)" + substituteInPlace phobos/std/socket.d --replace-fail "foreach (name; names)" "names = []; foreach (name; names)" ''; nativeBuildInputs = [ @@ -148,24 +144,23 @@ stdenv.mkDerivation rec { runHook preBuild export buildJobs=$NIX_BUILD_CORES - if [ -z $enableParallelBuilding ]; then - buildJobs=1 - fi + [ -z "$enableParallelBuilding" ] && buildJobs=1 - ${dmd_bin}/rdmd dmd/compiler/src/build.d -j$buildJobs HOST_DMD=${dmd_bin}/dmd $buildFlags - make -C dmd/druntime -f posix.mak DMD=${pathToDmd} $buildFlags -j$buildJobs + ${dmdBin}/rdmd dmd/compiler/src/build.d -j$buildJobs $buildFlags \ + HOST_DMD=${dmdBin}/dmd + make -C dmd/druntime -j$buildJobs DMD=${pathToDmd} $buildFlags 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" + echo ${lib.getLib curl}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} \ + > LibcurlPathFile + make -C phobos -j$buildJobs $buildFlags \ + DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$PWD" runHook postBuild ''; doCheck = true; - checkFlags = buildFlags; - - # many tests are disbled because they are failing + # many tests are disabled 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 @@ -173,15 +168,14 @@ stdenv.mkDerivation rec { runHook preCheck export checkJobs=$NIX_BUILD_CORES - if [ -z $enableParallelChecking ]; then - checkJobs=1 - fi + [ -z "$enableParallelChecking" ] && checkJobs=1 - NIX_ENFORCE_PURITY= \ - make -C dmd/compiler/test $checkFlags CC=$CXX SHELL=$SHELL -j$checkJobs N=$checkJobs + CC=$CXX HOST_DMD=${pathToDmd} NIX_ENFORCE_PURITY= \ + ${dmdBin}/rdmd dmd/compiler/test/run.d -j$checkJobs NIX_ENFORCE_PURITY= \ - make -C phobos -f posix.mak unittest $checkFlags -j$checkJobs DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$PWD" + make -C phobos unittest -j$checkJobs $checkFlags \ + DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$PWD" runHook postCheck ''; @@ -200,7 +194,7 @@ stdenv.mkDerivation rec { cp phobos/generated/${osname}/release/${bits}/libphobos2.* $out/lib/ wrapProgram $out/bin/dmd \ - --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ + --prefix PATH : "${targetPackages.stdenv.cc}/bin" \ --set-default CC "${targetPackages.stdenv.cc}/bin/cc" substitute ${dmdConfFile} "$out/bin/dmd.conf" --subst-var out @@ -209,7 +203,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - find $out/bin -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${dmd_bin}/dmd '{}' + + find $out/bin -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${dmdBin}/dmd '{}' + ''; disallowedReferences = [ dmdBootstrap ]; @@ -220,7 +214,8 @@ stdenv.mkDerivation rec { # Everything is now Boost licensed, even the backend. # https://github.com/dlang/dmd/pull/6680 license = licenses.boost; + mainProgram = "dmd"; maintainers = with maintainers; [ lionello dukc jtbx ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; -} +}) diff --git a/org/dlang-nix-flakes.org b/org/dlang-nix-flakes.org index b64fdb0..a23efec 100644 --- a/org/dlang-nix-flakes.org +++ b/org/dlang-nix-flakes.org @@ -62,7 +62,7 @@ nix overlays for (updates nixpkgs, more recent versions of): - dub ( 1.23.0 -> <<dub_version>> ) [for nix versions 1.31.0 ... 1.33.0 broken] - dtools ( 2.095.1 -> <<dtools_version>> ) - - dmd ( 2.100.2 -> <<dmd_version>> ) KO ✗ + - dmd ( 2.100.2 -> <<dmd_version>> ) - gdc [not yet available] (updates nixpkgs circa 2023-05-12) @@ -108,7 +108,7 @@ search nixpkgs here: - version in nixpkgs: - https://search.nixos.org/packages?channel=unstable&show=ldc&from=0&size=100&sort=relevance&type=packages&query=ldc -,*** dmd KO ✗ ( 2.100.2 -> <<dmd_version>> ) +,*** dmd OK ✓ ( 2.100.2 -> <<dmd_version>> ) - https://dlang.org/ - https://wiki.dlang.org/LDC @@ -493,7 +493,7 @@ direnv fetchurl https://raw.githubusercontent.com/nix-community/nix-direnv/${Nix inherit shellHook; }; dsh-overlay-dmd-dub = mkShell { - name = "overlay - dmd-<<dmd_version>> - dub-<<dub_version>> - broken"; + name = "overlay - dmd-<<dmd_version>> - dub-<<dub_version>>"; inherit shell; inherit devEnv; packages = [ @@ -1141,11 +1141,24 @@ llvm_14 *** overlays **** default.nix +***** default.nix >=2.108.0) #+HEADER: :tangle "../nix-overlays/dmd/default.nix" #+BEGIN_SRC nix import ./generic.nix { version = "<<dmd_version>>"; + dmdHash = "<<dmd_hash>>"; + phobosHash = "<<phobos_hash>>"; +} +#+END_SRC + +***** default.nix < 2.108.0) + + +#+HEADER: :tangle-NO "../nix-overlays/dmd/default.nix" +#+BEGIN_SRC nix +import ./generic.nix { + version = "<<dmd_version>>"; dmdSha256 = "<<dmd_hash>>"; phobosSha256 = "<<phobos_hash>>"; } @@ -1156,8 +1169,8 @@ import ./generic.nix { #+HEADER: :tangle "../nix-overlays/dmd/generic.nix" #+BEGIN_SRC nix { version -, dmdSha256 -, phobosSha256 +, dmdHash +, phobosHash }: { stdenv @@ -1179,7 +1192,7 @@ import ./generic.nix { , git , unzip , dmdBootstrap ? callPackage ./bootstrap.nix { } -, dmd_bin ? "${dmdBootstrap}/bin" +, dmdBin ? "${dmdBootstrap}/bin" }: let @@ -1202,7 +1215,7 @@ let pathToDmd = "\${NIX_BUILD_TOP}/dmd/generated/${osname}/release/${bits}/dmd"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dmd"; inherit version; @@ -1212,15 +1225,15 @@ stdenv.mkDerivation rec { (fetchFromGitHub { owner = "dlang"; repo = "dmd"; - rev = "v${version}"; - sha256 = dmdSha256; + rev = "v${finalAttrs.version}"; + hash = dmdHash; name = "dmd"; }) (fetchFromGitHub { owner = "dlang"; repo = "phobos"; - rev = "v${version}"; - sha256 = phobosSha256; + rev = "v${finalAttrs.version}"; + hash = phobosHash; name = "phobos"; }) ]; @@ -1237,7 +1250,7 @@ stdenv.mkDerivation rec { url = "https://github.com/dlang/dmd/commit/c4d33e5eb46c123761ac501e8c52f33850483a8a.patch"; stripLen = 1; extraPrefix = "dmd/"; - sha256 = "sha256-N21mAPfaTo+zGCip4njejasraV5IsWVqlGR5eOdFZZE="; + hash = "sha256-N21mAPfaTo+zGCip4njejasraV5IsWVqlGR5eOdFZZE="; }) ]; @@ -1259,18 +1272,14 @@ stdenv.mkDerivation rec { # https://issues.dlang.org/show_bug.cgi?id=23317 rm dmd/compiler/test/runnable/cdvecfill.sh rm dmd/compiler/test/compilable/cdcmp.d - '' - - + lib.optionalString (lib.versionAtLeast version "2.089.0" && lib.versionOlder version "2.092.2") '' + '' + 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);" "" + substituteInPlace dmd/compiler/test/dshell/test6952.d --replace-fail "/usr/bin/env bash" "${bash}/bin/bash" + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace phobos/std/socket.d --replace-fail "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)" + substituteInPlace phobos/std/socket.d --replace-fail "foreach (name; names)" "names = []; foreach (name; names)" ''; nativeBuildInputs = [ @@ -1305,24 +1314,23 @@ stdenv.mkDerivation rec { runHook preBuild export buildJobs=$NIX_BUILD_CORES - if [ -z $enableParallelBuilding ]; then - buildJobs=1 - fi + [ -z "$enableParallelBuilding" ] && buildJobs=1 - ${dmd_bin}/rdmd dmd/compiler/src/build.d -j$buildJobs HOST_DMD=${dmd_bin}/dmd $buildFlags - make -C dmd/druntime -f posix.mak DMD=${pathToDmd} $buildFlags -j$buildJobs + ${dmdBin}/rdmd dmd/compiler/src/build.d -j$buildJobs $buildFlags \ + HOST_DMD=${dmdBin}/dmd + make -C dmd/druntime -j$buildJobs DMD=${pathToDmd} $buildFlags 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" + echo ${lib.getLib curl}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} \ + > LibcurlPathFile + make -C phobos -j$buildJobs $buildFlags \ + DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$PWD" runHook postBuild ''; doCheck = true; - checkFlags = buildFlags; - - # many tests are disbled because they are failing + # many tests are disabled 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 @@ -1330,15 +1338,14 @@ stdenv.mkDerivation rec { runHook preCheck export checkJobs=$NIX_BUILD_CORES - if [ -z $enableParallelChecking ]; then - checkJobs=1 - fi + [ -z "$enableParallelChecking" ] && checkJobs=1 - NIX_ENFORCE_PURITY= \ - make -C dmd/compiler/test $checkFlags CC=$CXX SHELL=$SHELL -j$checkJobs N=$checkJobs + CC=$CXX HOST_DMD=${pathToDmd} NIX_ENFORCE_PURITY= \ + ${dmdBin}/rdmd dmd/compiler/test/run.d -j$checkJobs NIX_ENFORCE_PURITY= \ - make -C phobos -f posix.mak unittest $checkFlags -j$checkJobs DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$PWD" + make -C phobos unittest -j$checkJobs $checkFlags \ + DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$PWD" runHook postCheck ''; @@ -1357,7 +1364,7 @@ stdenv.mkDerivation rec { cp phobos/generated/${osname}/release/${bits}/libphobos2.* $out/lib/ wrapProgram $out/bin/dmd \ - --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ + --prefix PATH : "${targetPackages.stdenv.cc}/bin" \ --set-default CC "${targetPackages.stdenv.cc}/bin/cc" substitute ${dmdConfFile} "$out/bin/dmd.conf" --subst-var out @@ -1366,7 +1373,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - find $out/bin -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${dmd_bin}/dmd '{}' + + find $out/bin -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${dmdBin}/dmd '{}' + ''; disallowedReferences = [ dmdBootstrap ]; @@ -1377,10 +1384,11 @@ stdenv.mkDerivation rec { # Everything is now Boost licensed, even the backend. # https://github.com/dlang/dmd/pull/6680 license = licenses.boost; + mainProgram = "dmd"; maintainers = with maintainers; [ lionello dukc jtbx ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; -} +}) #+END_SRC **** bootstrap.nix @@ -1486,17 +1494,56 @@ stdenv.mkDerivation { #+NAME: dmd_version #+BEGIN_SRC nix -<<dmd_version_2_106_1>> +<<dmd_version_2_108_0>> #+END_SRC #+NAME: dmd_hash #+BEGIN_SRC nix -<<dmd_hash_2_106_1>> +<<dmd_hash_2_108_0>> #+END_SRC #+NAME: phobos_hash #+BEGIN_SRC nix -<<phobos_hash_2_106_1>> +<<phobos_hash_2_108_0>> +#+END_SRC + +**** 2.108.0 OK ✓ + +- nix-prefetch-url --unpack https://github.com/dlang/dmd/archive/refs/tags/v2.108.0.tar.gz +- nix-prefetch-url --unpack https://github.com/dlang/phobos/archive/refs/tags/v2.108.0.tar.gz + +#+NAME: dmd_version_2_108_0 +#+BEGIN_SRC nix +2.108.0 +#+END_SRC + +#+NAME: dmd_hash_2_108_0 +#+BEGIN_SRC nix +sha256-tlWcFgKtXzfqMMkOq4ezhZHdYCXFckjN5+m6jO4VH0U= +#+END_SRC + +#+NAME: phobos_hash_2_108_0 +#+BEGIN_SRC nix +sha256-uU8S4rABOfhpKh+MvSbclkbdf0hrsuKF8SIpWMnPpfU= +#+END_SRC + +**** 2.107.0 - skip (asleep here apparently) + +- asleep apparently + +#+NAME: dmd_version_2_107_0 +#+BEGIN_SRC nix +2.107.0 +#+END_SRC + +#+NAME: dmd_hash_2_107_0 +#+BEGIN_SRC nix +<<sha256-blank>> +#+END_SRC + +#+NAME: phobos_hash_2_107_0 +#+BEGIN_SRC nix +<<sha256-blank>> #+END_SRC **** 2.106.1 OK ✓ @@ -1600,15 +1647,17 @@ sha256-kTHRaAKG7cAGb4IE/NGHWaZ8t7ZceKj03l6E8wLzJzs= **** notes -- OK dub == 1.30.0 OK ✓ +- OK dub == current OK ✓ -- NOTES for dub >= 1.31.0 KO ✗ +- NOTES for dub 1.33.0 >= 1.31.0 KO ✗ - dub builds test tilix which calls in gtkd - ISSUES dub FAILS to build project from local disk that has built without issue since dub v1.23.0 - BROKEN breaks on subproject ends up in nix: Error /homeless-shelter: Permission denied +- OK dub == 1.30.0 OK ✓ + *** overlays **** default.nix OK ✓ |