diff options
Diffstat (limited to 'nix-overlays/dmd')
| -rw-r--r-- | nix-overlays/dmd/binary.nix | 19 | ||||
| -rw-r--r-- | nix-overlays/dmd/generic.nix | 21 | ||||
| -rw-r--r-- | nix-overlays/dmd/package.nix | 6 |
3 files changed, 29 insertions, 17 deletions
diff --git a/nix-overlays/dmd/binary.nix b/nix-overlays/dmd/binary.nix index 3a5d6b7..e53ccb4 100644 --- a/nix-overlays/dmd/binary.nix +++ b/nix-overlays/dmd/binary.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, glibc -, version, hashes }: +{ + lib, + stdenv, + fetchurl, + curl, + tzdata, + autoPatchelfHook, + fixDarwinDylibNames, + glibc, + version, + hashes, +}: let inherit (stdenv) hostPlatform; @@ -72,6 +82,9 @@ stdenv.mkDerivation { license = licenses.boost; maintainers = [ maintainers.lionello ]; homepage = "https://dlang.org/"; - platforms = [ "x86_64-darwin" "i686-linux" "x86_64-linux" ]; + platforms = [ + "i686-linux" + "x86_64-linux" + ]; }; } diff --git a/nix-overlays/dmd/generic.nix b/nix-overlays/dmd/generic.nix index 59a781e..bfe24b4 100644 --- a/nix-overlays/dmd/generic.nix +++ b/nix-overlays/dmd/generic.nix @@ -15,7 +15,6 @@ curl, tzdata, gdb, - # Foundation, callPackage, targetPackages, fetchpatch, @@ -32,14 +31,15 @@ let 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"}''; + 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.hostPlatform.isDarwin then "osx" - else stdenv.hostPlatform.parsed.kernel.name; + bits = toString stdenv.hostPlatform.parsed.cpu.bits; + osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; pathToDmd = "\${NIX_BUILD_TOP}/dmd/generated/${osname}/release/${bits}/dmd"; in @@ -96,9 +96,6 @@ stdenv.mkDerivation (finalAttrs: { rm dmd/compiler/test/runnable/gdb4149.d rm dmd/compiler/test/runnable/gdb4181.d rm dmd/compiler/test/compilable/ddocYear.d - rm dmd/compiler/test/compilable/sarif_success_test.d - rm dmd/compiler/test/fail_compilation/sarif_test.d - rm dmd/compiler/test/fail_compilation/sarifmultiple_test.d # Disable tests that rely on objdump whitespace until fixed upstream: # https://issues.dlang.org/show_bug.cgi?id=23317 @@ -125,8 +122,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl tzdata - # ] ++ lib.optionals stdenv.hostPlatform.isDarwin [] - # Foundation ]; nativeCheckInputs = [ @@ -177,6 +172,7 @@ stdenv.mkDerivation (finalAttrs: { NIX_ENFORCE_PURITY= \ make -C phobos unittest -j$checkJobs $checkFlags \ + DISABLED_TESTS=std/datetime/timezone \ DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$PWD" runHook postCheck @@ -223,7 +219,10 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.boost; mainProgram = "dmd"; maintainers = with maintainers; [ lionello dukc jtbx ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; # ld: section __DATA/__thread_bss has type zero-fill but non-zero file offset file '/private/tmp/nix-build-dmd-2.109.1.drv-0/.rdmd-301/rdmd-build.d-A1CF043A7D87C5E88A58F3C0EF5A0DF7/objs/build.o' for architecture x86_64 # clang-16: error: linker command failed with exit code 1 (use -v to see invocation) broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; diff --git a/nix-overlays/dmd/package.nix b/nix-overlays/dmd/package.nix index 3aa1183..1813e46 100644 --- a/nix-overlays/dmd/package.nix +++ b/nix-overlays/dmd/package.nix @@ -1,5 +1,5 @@ import ./generic.nix { - version = "2.111.0"; - dmdHash = "sha256-2bjsGa9nTny818dLRV6LKkes+Ycq8W+PFjwhGVrD5TM="; - phobosHash = "sha256-9jySZbODoL8sULhYKj/l4+c/uiG5xY2dO240k9XQtPk="; + version = "2.112.1"; + dmdHash = "sha256-UqNNUGoGmOV0lGNCGaFk8HbOE01qD55WuJ8NyQzqLJs="; + phobosHash = "sha256-CNvDSlerOXh6Qn060MNaSF1IIcbrcZzljyIxkm+TQQ0="; } |