diff options
Diffstat (limited to 'nix-overlays')
| -rw-r--r-- | nix-overlays/README | 14 | ||||
| -rw-r--r-- | nix-overlays/dub/default.nix | 8 | ||||
| -rw-r--r-- | nix-overlays/ldc/default.nix | 4 | ||||
| -rw-r--r-- | nix-overlays/ldc/generic.nix | 2 |
4 files changed, 15 insertions, 13 deletions
diff --git a/nix-overlays/README b/nix-overlays/README index d8f42af..0c55f1b 100644 --- a/nix-overlays/README +++ b/nix-overlays/README @@ -16,8 +16,8 @@ compiler and build tools: ldc, dub and dtools, than exist in nixpkgs at the time of publishing, in some cases with additional fixes. nix overlays for (updates nixpkgs, more recent versions of): - - ldc ( 1.30.0 -> 1.36.0 ) - - dub ( 1.23.0 -> 1.35.0 ) [for nix versions 1.31.0 ... 1.33.0 broken] + - ldc ( 1.30.0 -> 1.37.0 ) + - 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.104.0 ) KO ✗ @@ -49,13 +49,13 @@ search nixpkgs here: - https://search.nixos.org/packages?channel=unstable&from=0&size=100&sort=relevance&query= ** compilers -*** ldc OK ✓ ( 1.30.0 -> 1.36.0 ) +*** ldc OK ✓ ( 1.30.0 -> 1.37.0 ) - https://wiki.dlang.org/LDC - https://github.com/ldc-developers/ldc - https://github.com/ldc-developers/ldc/releases - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.36.0.tar.gz + nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.37.0.tar.gz - https://github.com/ldc-developers/ldc/issues - version in nixpkgs: @@ -90,13 +90,13 @@ not yet provided in nixpkgs with gcc12, no attempt made - https://github.com/D-Programming-GDC/gdc ** build tool -*** dub ( 1.23.0 -> 1.35.0 ) +*** dub ( 1.23.0 -> 1.36.0 ) - https://code.dlang.org/packages/dub - https://github.com/dlang/dub - https://github.com/dlang/dub/releases - nix-prefetch-url --unpack https://github.com/dlang/dub/archive/refs/tags/v1.35.0.tar.gz + nix-prefetch-url --unpack https://github.com/dlang/dub/archive/refs/tags/v1.36.0.tar.gz - https://github.com/dlang/dub/issues - version in nixpkgs: @@ -104,7 +104,7 @@ not yet provided in nixpkgs with gcc12, no attempt made - dub nixpkg overlay is updated and runs most dub tests correctly -- dub OK ✓ ( 1.30.0 -> 1.35.0 ) +- dub OK ✓ ( 1.30.0 -> 1.36.0 ) from v1.31.0 requires seeting of pwd in buildPhase else fails to build packages with nix tools that previous version of dub built; diff --git a/nix-overlays/dub/default.nix b/nix-overlays/dub/default.nix index ab9bcea..47e6bf6 100644 --- a/nix-overlays/dub/default.nix +++ b/nix-overlays/dub/default.nix @@ -4,7 +4,7 @@ assert dcompiler != null; stdenv.mkDerivation rec { pname = "dub"; - version = "1.35.0"; + version = "1.36.0"; enableParallelBuilding = true; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "dlang"; repo = "dub"; rev = "v${version}"; - sha256 = "sha256-hC46XKE6lLLMLGMGl4vDnLDBQy6P/Z7o3ayDJj0Sois="; + sha256 = "sha256-S8pls9zxbGAQTwqYf4bDT2q7Ow12S8bBsJE5UmsACBs="; }; #postUnpack = '' @@ -61,10 +61,12 @@ stdenv.mkDerivation rec { rm -rf test/issue502-root-import rm -rf test/dpath-variable - rm test/dpath-variable.sh + #rm test/dpath-variable.sh rm -rf test/git-dependency rm -rf test/use-c-sources # added to build v1.33.0 rm -rf test/pr2642-cache-db # added to build v1.34.0 + rm -rf test/pr2644-describe-artifact-path # added to build v1.36.0 + rm -rf test/pr2647-build-deep # added to build v1.36.0 ./test/run-unittest.sh ''; diff --git a/nix-overlays/ldc/default.nix b/nix-overlays/ldc/default.nix index 6b07612..2e194e4 100644 --- a/nix-overlays/ldc/default.nix +++ b/nix-overlays/ldc/default.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "1.36.0"; - sha256 = "sha256-oAx5BzEjqIfBf0Rsd4KklVajUSo9Natna31Trhu41u8="; + version = "1.37.0"; + sha256 = "sha256-UOgK48Q2yQY3wsPUDzktwotyH3qrOh48o79PnCjboGQ="; } diff --git a/nix-overlays/ldc/generic.nix b/nix-overlays/ldc/generic.nix index f88f448..78a9a0c 100644 --- a/nix-overlays/ldc/generic.nix +++ b/nix-overlays/ldc/generic.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { postPatch = '' # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow - substituteInPlace tests/dmd/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" + #substituteInPlace tests/dmd/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" |