GNU bug report logs - #72136
[PATCH 0/2] Guard against producing derivations for platforms with no system

Previous Next

Package: guix-patches;

Reported by: Christopher Baines <mail <at> cbaines.net>

Date: Tue, 16 Jul 2024 08:43:02 UTC

Severity: normal

Tags: patch

Full log


Message #11 received at 72136 <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: 72136 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: bash-minimal: Don't support targets with no system.
Date: Tue, 16 Jul 2024 09:45:09 +0100
Since I believe bash-minimal will fail to build for these targets, this will
catch this early and display a clear message for both this package and
packages using it as an input.

* gnu/packages/base.scm (bash-minimal)[inputs]: Check the target if there is
one.

Change-Id: I3768c7fa05f5375a1227551e2b7ae66a741ef93d
---
 gnu/packages/bash.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index 9ecec0a484..c29400c1e4 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -41,6 +41,7 @@ (define-module (gnu packages bash)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages less)
   #:use-module (guix packages)
+  #:use-module (guix platform)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix utils)
@@ -57,6 +58,8 @@ (define-module (gnu packages bash)
 
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
+  #:use-module (srfi srfi-34)
+  #:use-module (srfi srfi-35)
   #:use-module (ice-9 format))
 
 (define (patch-url seqno)
@@ -226,7 +229,18 @@ (define-public bash-minimal
   ;; A stripped-down Bash for non-interactive use.
   (package (inherit bash)
     (name "bash-minimal")
-    (inputs '())                                ; no readline, no curses
+    (inputs
+     (begin
+       (let ((target (%current-target-system)))
+         (when target
+           (unless (platform-system (lookup-platform-by-target target))
+             (raise
+              (condition
+               (&package-unsupported-target-error
+                (package this-package)
+                (target target)))))))
+
+       '()))                            ; no readline, no curses
 
     ;; No "include" output because there's no support for loadable modules.
     (outputs (delete "include" (package-outputs bash)))
-- 
2.45.2





This bug report was last modified 332 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.