From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 4P5sBFDGFGLSawEAgWs5BA (envelope-from ) for ; Tue, 22 Feb 2022 12:17:36 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id SNUTAVDGFGIgJgAAauVa8A (envelope-from ) for ; Tue, 22 Feb 2022 12:17:36 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 758DA3C8C2 for ; Tue, 22 Feb 2022 12:17:35 +0100 (CET) Received: from localhost ([::1]:47032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMTAe-0006dr-5G for larch@yhetil.org; Tue, 22 Feb 2022 06:17:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMT9G-00066N-Lc for guix-patches@gnu.org; Tue, 22 Feb 2022 06:16:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46255) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMT9G-00061n-An for guix-patches@gnu.org; Tue, 22 Feb 2022 06:16:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nMT9F-0005Ms-PS for guix-patches@gnu.org; Tue, 22 Feb 2022 06:16:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54106] [PATCH] guix: packages: Add %32bit-supported-systems, %64bit-supported-systems. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 22 Feb 2022 11:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54106 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54106@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164552852520570 (code B ref -1); Tue, 22 Feb 2022 11:16:01 +0000 Received: (at submit) by debbugs.gnu.org; 22 Feb 2022 11:15:25 +0000 Received: from localhost ([127.0.0.1]:40149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMT8e-0005Li-My for submit@debbugs.gnu.org; Tue, 22 Feb 2022 06:15:25 -0500 Received: from lists.gnu.org ([209.51.188.17]:52300) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMT8c-0005La-Fk for submit@debbugs.gnu.org; Tue, 22 Feb 2022 06:15:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMT8Z-0005Cp-Tz for guix-patches@gnu.org; Tue, 22 Feb 2022 06:15:21 -0500 Received: from flashner.co.il ([178.62.234.194]:38792) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMT8X-0005sS-DM for guix-patches@gnu.org; Tue, 22 Feb 2022 06:15:19 -0500 Received: from localhost (unknown [31.210.181.166]) by flashner.co.il (Postfix) with ESMTPSA id 0D56B402D4; Tue, 22 Feb 2022 11:15:15 +0000 (UTC) From: Efraim Flashner Date: Tue, 22 Feb 2022 13:14:43 +0200 Message-Id: <6d2a5c7f72606293bb76ebb3e80d0b42634db21e.1645528396.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.62.234.194; envelope-from=efraim@flashner.co.il; helo=flashner.co.il X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1645528655; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=40nMBiCxlGgpk3HOpKifs7dTkENeaGlqCgaHytosxuY=; b=EX3TzLJFHrCN1RWqpRAr0Y6WZYmfuqDpEStOYgxPrGloKtzoBdCh89Q4pDGK1xA4OnC8IL +9ap7KkCUoD3p1yJW27GDHGL3lRhfvzs4kJBIpgKfiZ7hJvbpr7qUPY/lEqKs81uyo+yBI UPjx2hpQjaT3p4NUMSfABDlaysAd2AgVq/hQ3CQB7ReTu11vNcLlh4WjpldEfcSpnMOjj7 cVMInT8P6PmNVTrPAJzjRudcDFPzKBF01p1KGE8f3FieMTV6Xk7qk+iZy7AAcaqcE0bWTo W+oZRx+9O7juFaqAJeKuFka7+O//h1yEaahOKRNwhZGR0bvSMChkupSkX1oNlg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1645528655; a=rsa-sha256; cv=none; b=f2ilQb1f43YbE0E7FBqcKnxg5gCm0BVgWwDzuntpvuI0dV56gesCRMAIG2hBGUOw2KM0TV bDFJq7JhuWTQdB7Cv/sSUhCCDdWY1Zzah6SY5fIlFhWGlAzjYAEs3mJkHnyGZN3Y/6BQJQ Y0tnViYyuW4/w43X9jhtNGf7qDKE4L1ZImd5YFc221iyR3ltkgDy4jnghViGeci1mOJVmo lZHGwjPRRWpzbmuVriansAfvaJwDrotwQGDSAej0WZEqiQngowOCFDP2rXaRMl/QMD7w+J djubLelvesAN0dY6nnxTDp+w24ybau9hN3eRSNR1kaQK5n9tYI3ZfeV9VdDr4w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.63 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 758DA3C8C2 X-Spam-Score: -3.63 X-Migadu-Scanner: scn0.migadu.com X-TUID: EJN/tykDYaHy * guix/packages.scm (%32bit-supported-systems, %64bit-supported-systems): New variables. (%supported-systems): Rewrite using %32bit-supported-systems, %64bit-supported-systems. --- This allows us to do things like declare a package only supports 64-bit architectures, by adding: (supported-systems %64bit-supported-systems) instead of enumerating them specifically or removing them specifically. guix/packages.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index 3f0262602d..e2a5a58b8d 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015, 2017, 2018, 2019 Mark H Weaver ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2016 Alex Kost -;;; Copyright © 2017, 2019, 2020 Efraim Flashner +;;; Copyright © 2017, 2019, 2020, 2022 Efraim Flashner ;;; Copyright © 2019 Marius Bakke ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2021 Chris Marusich @@ -148,6 +148,8 @@ (define-module (guix packages) transitive-input-references + %32bit-supported-systems + %64bit-supported-systems %supported-systems %hurd-systems %cuirass-supported-systems @@ -391,11 +393,19 @@ (define* (computed-origin-method gexp-promise hash-algo hash #:guile-for-build guile))) +(define %32bit-supported-systems + ;; This is the list of 32-bit system types that are supported. + '("i686-linux" "armhf-linux" "i586-gnu" "powerpc-linux")) + +(define %64bit-supported-systems + ;; This is the list of 64-bit system types that are supported. + '("x86_64-linux" "mips64el-linux" "aarch64-lixux" "powerpc64le-linux" + "riscv64-linux")) + (define %supported-systems ;; This is the list of system types that are supported. By default, we ;; expect all packages to build successfully here. - '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "mips64el-linux" "i586-gnu" - "powerpc64le-linux" "powerpc-linux" "riscv64-linux")) + (append %32bit-supported-systems %64bit-supported-systems)) (define %hurd-systems ;; The GNU/Hurd systems for which support is being developed. base-commit: e4779e061056b1a3a3ab56ef817353d86c482611 -- 2.34.0