From c2c8c56d75374fd3601802fce75d1f82547550e5 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 3 Mar 2024 20:32:58 -0500 Subject: ldc-1.37.0 & dub-1.36.0 --- nix-overlays/README | 14 +++++----- nix-overlays/dub/default.nix | 8 ++++-- nix-overlays/ldc/default.nix | 4 +-- nix-overlays/ldc/generic.nix | 2 +- org/nixpkgs_overlays_d_related.org | 57 ++++++++++++++++++++++++++++++-------- 5 files changed, 61 insertions(+), 24 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);" "" diff --git a/org/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org index a057dff..4937517 100644 --- a/org/nixpkgs_overlays_d_related.org +++ b/org/nixpkgs_overlays_d_related.org @@ -546,7 +546,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);" "" @@ -755,12 +755,28 @@ sha256 = "<>"; #+NAME: ldc_version #+BEGIN_SRC nix -<> +<> #+END_SRC #+NAME: ldc_hash #+BEGIN_SRC nix -<> +<> +#+END_SRC + +**** 1.37 OK ✓ +***** 1.37.0 OK ✓ + +- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.37.0.tar.gz +- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz + +#+NAME: ldc_version_1_37_0 +#+BEGIN_SRC nix +1.37.0 +#+END_SRC + +#+NAME: ldc_hash_1_37_0 +#+BEGIN_SRC nix +sha256-UOgK48Q2yQY3wsPUDzktwotyH3qrOh48o79PnCjboGQ= #+END_SRC **** 1.36 OK ✓ @@ -823,7 +839,8 @@ sha256-MAXG6ceSWFOMg5eXZnZ6WePXTzy5CsLLDc5ddXO+txk= sha256-g0wbCMX1s6mPnvuvhjLw03fRfawcFxDkg8nuaEZYw6g= #+END_SRC -**** 1.32.2 OK ✓ +**** 1.32 +***** 1.32.2 OK ✓ - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.32.1.tar.gz @@ -837,7 +854,7 @@ sha256-g0wbCMX1s6mPnvuvhjLw03fRfawcFxDkg8nuaEZYw6g= sha256-v6Sq7nQyChJohDyI4inzObLfCVOkvLT87VLr4N2hzZU= #+END_SRC -**** 1.32.1 +***** 1.32.1 - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.32.1.tar.gz @@ -851,7 +868,7 @@ sha256-v6Sq7nQyChJohDyI4inzObLfCVOkvLT87VLr4N2hzZU= sha256-s1U7+qiVJDF+zSHrLGPG6g+acIChYnXkb9p+OrNX6g8= #+END_SRC -**** 1.32.0 +***** 1.32.0 - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.32.0.tar.gz @@ -865,7 +882,8 @@ sha256-s1U7+qiVJDF+zSHrLGPG6g+acIChYnXkb9p+OrNX6g8= sha256-xO4L+RtBbdVkE1PZsme2pIYAxJnHgr6xEtLkYOMpvqw= #+END_SRC -**** 1.31.0 +**** 1.31 +***** 1.31.0 - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.31.0.tar.gz @@ -879,7 +897,7 @@ sha256-xO4L+RtBbdVkE1PZsme2pIYAxJnHgr6xEtLkYOMpvqw= sha256-8cjs6eHjWAbDRBvyT75mbN3Y7vN1WSwZzY/uRwHNVFg= #+END_SRC -**** 1.30.0 +***** 1.30.0 - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.30.0.tar.gz @@ -1420,10 +1438,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 ''; @@ -1448,12 +1468,27 @@ stdenv.mkDerivation rec { #+NAME: dub_version #+BEGIN_SRC nix -<> +<> #+END_SRC #+NAME: dub_hash #+BEGIN_SRC nix -<> +<> +#+END_SRC + +**** 1.36 OK ✓ +***** 1.36.0 + +- nix-prefetch-url --unpack https://github.com/dlang/dub/archive/refs/tags/v1.36.0.tar.gz + +#+NAME: dub_version_1_36_0 +#+BEGIN_SRC nix +1.36.0 +#+END_SRC + +#+NAME: dub_hash_1_36_0 +#+BEGIN_SRC nix +sha256-S8pls9zxbGAQTwqYf4bDT2q7Ow12S8bBsJE5UmsACBs= #+END_SRC **** 1.35 OK ✓ -- cgit v1.2.3