This patch fixes a failing unit test by feeding buildNormalizedPath to the tzdata properly. Three other tests are disabled, one assumes /root and the two others use networking. Not bad out of almost 700 tests! by Pjotr Prins --- a/std/datetime.d.orig 2016-11-24 01:13:52.584495545 +0100 +++ b/std/datetime.d 2016-11-24 01:17:09.655306728 +0100 @@ -28081,22 +28081,24 @@ import std.range : retro; import std.format : format; - name = strip(name); - enforce(tzDatabaseDir.exists(), new DateTimeException(format("Directory %s does not exist.", tzDatabaseDir))); enforce(tzDatabaseDir.isDir, new DateTimeException(format("%s is not a directory.", tzDatabaseDir))); version(Android) { + name = strip(name); auto tzfileOffset = name in tzdataIndex(tzDatabaseDir); enforce(tzfileOffset, new DateTimeException(format("The time zone %s is not listed.", name))); string tzFilename = separate_index ? "zoneinfo.dat" : "tzdata"; immutable file = buildNormalizedPath(tzDatabaseDir, tzFilename); } else - immutable file = buildNormalizedPath(tzDatabaseDir, name); + { + auto filename = "./" ~ strip(name); // make sure the prefix is not stripped + immutable file = buildNormalizedPath(tzDatabaseDir, filename); + } - enforce(file.exists(), new DateTimeException(format("File %s does not exist.", file))); + enforce(file.exists(), new DateTimeException(format("File %s does not exist in %s.", file, tzDatabaseDir))); enforce(file.isFile, new DateTimeException(format("%s is not a file.", file))); auto tzFile = File(file); diff --git a/std/path.d b/std/path.d index 254d8f0..b0fc04d 100644 --- a/std/path.d +++ b/std/path.d @@ -3080,8 +3080,11 @@ unittest } else { + pragma(msg, "test disabled on GNU Guix"); +/* assert(expandTilde("~root") == "/root", expandTilde("~root")); assert(expandTilde("~root/") == "/root/", expandTilde("~root/")); +*/ } assert(expandTilde("~Idontexist/hey") == "~Idontexist/hey"); } diff --git a/std/socket.d b/std/socket.d index b85d1c9..7fbf346 100644 --- a/std/socket.d +++ b/std/socket.d @@ -859,6 +862,8 @@ class InternetHost unittest { + pragma(msg, "test disabled on GNU Guix"); + /* InternetHost ih = new InternetHost; ih.getHostByAddr(0x7F_00_00_01); @@ -889,6 +894,7 @@ unittest // writefln("aliases[%d] = %s", i, s); // } }); + */ } h class='left'>Author 2023-05-11gnu: automake: Fix cross-build....This is a follow-up to commit ea908c1c04804e51dbd156981c21d8397367d40d gnu: automake: Remove input labels. * gnu/packages/autotools.scm (automake)[arguments]: Use "#~" instead of "'". Janneke Nieuwenhuizen 2023-05-11gnu: autoconf: Fix cross-build....This is a follow-up to commit 8fa17cb6d51901b2c8a0e20954c5b19f8057c217 gnu: autoconf: Remove input labels. * gnu/packages/autotools.scm (autoconf-2.69)[arguments]: Use "#~" instead of "'". Janneke Nieuwenhuizen 2023-03-02Merge remote-tracking branch 'savannah/master' into core-updates...Conflicts: gnu/local.mk gnu/packages/autotools.scm gnu/packages/cmake.scm gnu/packages/gnuzilla.scm gnu/packages/haskell.scm gnu/packages/pdf.scm gnu/packages/python-xyz.scm gnu/packages/samba.scm gnu/packages/tex.scm gnu/packages/tls.scm gnu/packages/wxwidgets.scm Christopher Baines 2023-02-05gnu: Rename 'guile-3.0/fixed' to 'guile-3.0/pinned'....* gnu/packages/guile.scm: Rename variable 'guile-3.0/fixed' to 'guile-3.0/pinned', add deprecation. * etc/release-manifest.scm (%packages-to-cross-build): Replace 'guile-3.0/fixed' with 'guile-3.0/pinned'. * gnu/packages/autotools.scm (make-autoconf-wrapper)[inputs]: Likewise. * gnu/packages/commencement.scm (guile-final): Likewise. Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com> Simon Tournier 2022-10-24gnu: autoconf-archive: Update to 2022.09.03....* gnu/packages/autotools.scm (autoconf-archive): Update to 2022.09.03. Efraim Flashner 2022-09-08gnu: grep: Update to 3.8....* gnu/packages/base.scm (grep): Update to 3.8. * gnu/packages/commencement.scm (grep-mesboot)[native-inputs]: Add SED-MESBOOT. * gnu/packages/autotools.scm (libtool)[source](patches): Add patch. * gnu/packages/patches/libtool-grep-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. Marius Bakke 2022-09-01gnu: libtool: Reinstate 2.4.7....This reverts commit 5b6b731c7d8ecbae0ead1600b4cd2f70c66d51ca, which was most likely intended for 'core-updates'; 'libtool-2.4.7' is *not* a duplicate package on the current 'master' branch. Fixes <https://issues.guix.gnu.org/57356>. Reported by Michael Ford <fanquake@gmail.com>. * gnu/packages/autotools.scm (libtool-2.4.7): New variable. Ludovic Courtès