Package: guix-patches;
Reported by: Thiago Jung Bauermann <bauermann <at> kolabnow.com>
Date: Wed, 21 Jul 2021 00:47:01 UTC
Severity: normal
Tags: patch
View this message in rfc822 format
From: Thiago Jung Bauermann <bauermann <at> kolabnow.com> To: 49672 <at> debbugs.gnu.org Cc: Thiago Jung Bauermann <bauermann <at> kolabnow.com> Subject: [bug#49672] [PATCH 0/9] Target check fixes and cleanups Date: Tue, 20 Jul 2021 21:46:15 -0300
Hello, I recently had a closer look at uses of ‘%current-target-system’ and ‘%current-system’ and noticed a few bugs to fix and also cleanups that can be done. They mostly stem from the fact that ‘%current-system’ holds a Nix system identifier, while ‘%current-target-system’ holds a GNU triplet identifier. A few parts of the code are confused about that and make the wrong check. The individual patch descriptions have the details. The last two patches are just cleanups and not bug fixes. I’m on the fence about the merits of the last patch. It can reasonably be seen as either a worthwhile cleanup or needless code churn. I’m sending it anyway, and I’m fine with either dropping or applying it. The series applies on today’s master branch, as of commit: e644e45aec26 gnu: pipe-viewer: Correct references to youtube-dl program. The only testing I did was running `make` on each patch in the series and checking if there’s any new Guile warnings or errors (there isn’t), and running `make check`. The testsuite results are: ============================================================================ Testsuite summary for GNU Guix UNKNOWN ============================================================================ # TOTAL: 1935 # PASS: 1903 # SKIP: 27 # XFAIL: 2 # FAIL: 3 # XPASS: 0 # ERROR: 0 ============================================================================ See ./test-suite.log Please report to bug-guix <at> gnu.org ============================================================================ The failures are in tests/publish.scm, tests/guix-describe.sh and tests/guix-package.sh. Compared to the master branch, tests/guix-describe.sh is the only new failure. The test is skipped in the master branch. This is because I ran the master branch tests on a git worktree, where ‘.git’ is a file rather than a directory, causing the test to be skipped. If I change the `if [ -d "…/.git" ]` line to `if [ -e "…/.git" ]`, then the test also fails on master and I have the same testsuite results with and without the patches. Thiago Jung Bauermann (9): gnu: Fix check of ‘%current-system’ and ‘%current-target-system’ utils: Add ‘current-target-nix-system’ helper gnu: Query membership in ‘supported-systems’ list with Nix identifier gnu: Use ‘current-target-nix-system’ in pattern matches gnu: Use ‘current-target-nix-system’ in prefix checks gnu: Fix GNU/Linux system detection bootloader: grub: Fix mix of GNU triplet and Nix system identifier gnu: ustr: Don’t pass default argument gnu: Use existing target helpers from ‘(guix utils)’ gnu/bootloader/grub.scm | 5 +---- gnu/packages/algebra.scm | 3 +-- gnu/packages/astronomy.scm | 4 ++-- gnu/packages/bdw-gc.scm | 4 ++-- gnu/packages/boost.scm | 4 ++-- gnu/packages/bootloaders.scm | 22 ++++++---------------- gnu/packages/bootstrap.scm | 6 ++---- gnu/packages/c.scm | 3 +-- gnu/packages/ci.scm | 6 ++---- gnu/packages/compression.scm | 6 ++---- gnu/packages/crypto.scm | 4 ++-- gnu/packages/databases.scm | 3 +-- gnu/packages/debug.scm | 6 ++---- gnu/packages/digest.scm | 3 +-- gnu/packages/firmware.scm | 4 ++-- gnu/packages/gcc.scm | 5 +---- gnu/packages/golang.scm | 6 ++---- gnu/packages/gstreamer.scm | 6 ++---- gnu/packages/java.scm | 16 +++++++--------- gnu/packages/julia.scm | 3 +-- gnu/packages/linux.scm | 4 +--- gnu/packages/lisp.scm | 3 +-- gnu/packages/llvm.scm | 4 +--- gnu/packages/make-bootstrap.scm | 2 +- gnu/packages/mes.scm | 3 +-- gnu/packages/messaging.scm | 12 ++++++------ gnu/packages/multiprecision.scm | 4 +--- gnu/packages/ntp.scm | 4 ++-- gnu/packages/pascal.scm | 6 ++---- gnu/packages/pciutils.scm | 3 +-- gnu/packages/photo.scm | 4 ++-- gnu/packages/php.scm | 3 +-- gnu/packages/python.scm | 26 ++++++++++---------------- gnu/packages/rust.scm | 4 +--- gnu/packages/sdl.scm | 4 ++-- gnu/packages/syncthing.scm | 4 ++-- gnu/packages/telephony.scm | 4 ++-- gnu/packages/textutils.scm | 3 +-- gnu/packages/valgrind.scm | 4 ++-- gnu/packages/video.scm | 7 ++----- gnu/packages/web.scm | 9 +++------ guix/utils.scm | 14 ++++++++++++++ 42 files changed, 101 insertions(+), 149 deletions(-)
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.