X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] [PATCH 0/4] Patches towards a release Resent-From: Efraim Flashner <efraim@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 06 Feb 2025 14:35:02 +0000 Resent-Message-ID: <handler.76098.B.173885248722011 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76098 <at> debbugs.gnu.org Cc: Efraim Flashner <efraim@HIDDEN> X-Debbugs-Original-To: guix-patches@HIDDEN Received: via spool by submit <at> debbugs.gnu.org id=B.173885248722011 (code B ref -1); Thu, 06 Feb 2025 14:35:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Feb 2025 14:34:47 +0000 Received: from localhost ([127.0.0.1]:55048 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tg2xq-0005iw-Ne for submit <at> debbugs.gnu.org; Thu, 06 Feb 2025 09:34:47 -0500 Received: from lists.gnu.org ([2001:470:142::17]:57984) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <efraim.flashner@HIDDEN>) id 1tg2xn-0005ih-Iy for submit <at> debbugs.gnu.org; Thu, 06 Feb 2025 09:34:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <efraim.flashner@HIDDEN>) id 1tg2xh-00017t-PY for guix-patches@HIDDEN; Thu, 06 Feb 2025 09:34:37 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <efraim.flashner@HIDDEN>) id 1tg2xf-0002yt-RX for guix-patches@HIDDEN; Thu, 06 Feb 2025 09:34:37 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4361e89b6daso6431535e9.3 for <guix-patches@HIDDEN>; Thu, 06 Feb 2025 06:34:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738852474; x=1739457274; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=88VZo+83AAwLkK/lTFauRG49kmdQcONJB2zKbU+R57M=; b=nqDLUSBrsZE8/0xO4HYBji0vYOeP07uSP8dGJWiIqHBb/AFqTkXWwofq7vaTFLSkNI JQJpkw64Ig4b09pMAbsm+O8F200nrHQWpnKbCHvZEmN7vsElCAraiODglzOFhItH605F 0KfbVZ5Rq4tM72P0pUqagTkw8JvfBmViGbFYbgmSqHU65WYW861dLpXkbaBDG6QSQF+B rnanr/FmpTqQRXMt1VZbMavfKgKb7vz/Jpvxe8fEIpUu7Q9hHD4D4EGaLWOVlaKFEv2V u0VRjpjPLvPwNbWVfXNDzPgUWsUUTTsw8RfkjyOXJ3PzcuPUD/AIdS+atczThP5+0IyS qYPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738852474; x=1739457274; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=88VZo+83AAwLkK/lTFauRG49kmdQcONJB2zKbU+R57M=; b=dsgT5ZtoNfrCA1GgQ8kdyrhdn9q+jQNh/jcyf9HM4/jcLiL6XkiKFhc522Pw+KYqmI CZE2Qz1tzmulmdkbLu++rFI0y/GOXzhkTrF6lhAdvNZ+OQIg83NzHC5YMMF2/05S2XgD Iak331pV2/p1huHr24Qk1v3vc49aBzuSLJNgMB9epbCWRtevtjE8vxs68z8DWf/trylA Lkmd1efXodqL4zMP8EbyeT93+X71i998h6J3YIxLZo0hgH9XJDXFYuUSD6VRDX81dZ7u R5vweWbLoNL1H4RIX6sIHoINIMDA0ukbHrRXyK6rKI3Cjny+9t/TFsDEKXk9VvBybY1e IW1A== X-Gm-Message-State: AOJu0YwUV7quCU5NEg9tHC0sx660N7O087Yqe+gSvD09Vq4VRO8k3s4E rDwDVJtn9AYAGahRCThL/DdILQCFNn6MNOYr24LNIpgLUAIQzSia3Yg87MIm X-Gm-Gg: ASbGncvOb8SaVpUCusYEntQV/KrwE+ZE0HuxTbKXTOo+/ERP+Jh/h9ktpGRSADn9jjA aVp4uFYCUR/nindjYhsbzo2j3TlZGkGJg15DRt8FEcU1QYDa9fcphVvwMnLD6cfbE5BIhCwyxih yWAc82BjldLCp7zhAX09hQPjm//k9EnmN37z015K5izJ9+/i2777u4Q9gD/XvbyuVy+hCh8kzeG f5FiIdNwEn9Lb9abRNye2ZMKd1Eyvp44E0LPxOTsygf7WGQPxAmEfCF5xcij667GwXoZMQJTbxO mNSsdLyXUK+PFC+FeBS3 X-Google-Smtp-Source: AGHT+IFD9vTPCUmLKhnn0+j3UotBXU9mZ3tD9Si+29Vsri469fx1gChFoXFSN9qBNipJUiQPTGcDIg== X-Received: by 2002:a05:600c:3b11:b0:434:a7b6:10e9 with SMTP id 5b1f17b1804b1-4390d43f76emr55869575e9.17.1738852473230; Thu, 06 Feb 2025 06:34:33 -0800 (PST) Received: from localhost ([141.226.10.168]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4390db1150csm57532205e9.39.2025.02.06.06.34.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2025 06:34:32 -0800 (PST) From: Efraim Flashner <efraim@HIDDEN> Date: Thu, 6 Feb 2025 16:34:11 +0200 Message-ID: <cover.1738851574.git.efraim@HIDDEN> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=efraim.flashner@HIDDEN; helo=mail-wm1-x32f.google.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.07, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: 0.0 (/) In the process toward a new release I took a look at the 'release' make target and the release.scm manifest to start. In the Makefile: * Added riscv64-linux as a supported system * switch the assert-binaries-available make target we've used previously to make sure we have substitutes for a base set of packages to point to the installer manifest. If the purpose of the installer is to install and then everyone expected to run `guix pull` then we need the packages from the installer. release.scm: I don't have a real good use for this manifest currently, but I've made some changes anyway: * %base-packages already existed in (gnu system), and that seemed like a good list of packages that we would need. * %system-packages: The note mentioned the installer, so I copied the work I did on the installer.scm to this list. installer.scm: A manifest which only checks that we have substitutes for what can be installed using the TUI installer (assuming no extra added items). It differs from the GUIX_SYSTEM_INSTALLER_SYSTEM variable in the Makefile by including aarch64 as an architecture. Ideally all the packages should compile, which would allow someone to run the installer successfully for x86_64-linux, i686-linux or aarch64-linux. cross-compile.scm: Ideally all the packages one would need to produce an OS image for another architecture we support, or the same %base-packages for other architectures we have. Currently it only tests from x86_64-linux. Ideally I'd like to see the installer.scm and cross-compile.scm manifests added to cuirass. I'd hope we could keep 100% build on installer.scm so we can actually offer all the options in the installer, and the cross-compile.scm manifest might need to be split so we can focus on cross-compiling an OS config vs cross-compiling binaries for another architecture. Efraim Flashner (4): Makefile.am: Add riscv64-linux as a supported-system. etc: manifests/release: Adjust for changes in Guix. etc: Add installer manifest. etc: Add cross-compile manifest. Makefile.am | 15 +-- etc/manifests/cross-compile.scm | 167 ++++++++++++++++++++++++++++++++ etc/manifests/installer.scm | 112 +++++++++++++++++++++ etc/manifests/release.scm | 51 +++++----- 4 files changed, 312 insertions(+), 33 deletions(-) create mode 100644 etc/manifests/cross-compile.scm create mode 100644 etc/manifests/installer.scm base-commit: 782cc91970a795a58d10391f387cc12e4bfd1c90 -- Efraim Flashner <efraim@HIDDEN> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Efraim Flashner <efraim@HIDDEN> Subject: bug#76098: Acknowledgement ([PATCH 0/4] Patches towards a release) Message-ID: <handler.76098.B.173885248722011.ack <at> debbugs.gnu.org> References: <cover.1738851574.git.efraim@HIDDEN> X-Gnu-PR-Message: ack 76098 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 76098 <at> debbugs.gnu.org Date: Thu, 06 Feb 2025 14:35:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 76098 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 76098: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D76098 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] [PATCH 1/4] Makefile.am: Add riscv64-linux as a supported-system. Resent-From: Efraim Flashner <efraim@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 06 Feb 2025 14:37:02 +0000 Resent-Message-ID: <handler.76098.B76098.173885261822877 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76098 <at> debbugs.gnu.org Cc: Efraim Flashner <efraim@HIDDEN> Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.173885261822877 (code B ref 76098); Thu, 06 Feb 2025 14:37:02 +0000 Received: (at 76098) by debbugs.gnu.org; 6 Feb 2025 14:36:58 +0000 Received: from localhost ([127.0.0.1]:55062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tg2zx-0005wu-K4 for submit <at> debbugs.gnu.org; Thu, 06 Feb 2025 09:36:58 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:51575) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <efraim.flashner@HIDDEN>) id 1tg2zu-0005wS-E2 for 76098 <at> debbugs.gnu.org; Thu, 06 Feb 2025 09:36:55 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-436249df846so6680765e9.3 for <76098 <at> debbugs.gnu.org>; Thu, 06 Feb 2025 06:36:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738852608; x=1739457408; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=5tHtbVIk5Izlr6TjfopNjldJhJ43W+pK2BUqRAz6/Z8=; b=gmtHjxcN0im059br8Tim5cPVev4vMwd2tJmGkpziBw5lQP/kLJytTtgAQyfgAK1mPl WWIfrCAnaRKzL5IkFgT4lu2dToOz8OfWQjNl8lRp4tiNJxcXLJt7ZwJ6WhU6ppP5MmID RsGw/G6CUmKLxvh30KrfvMQmcgRNez7Od6C9bwKh0OAt4kubK+cuALX2ofTATQvJwQz3 cQncNftsOp9uH5Ol0SEnmA9fIMHCa6fZ6fyvoJ7wxlIKAUwUl/BlDYBsQOzIGuwQlAPP xPPufVtFk89RGLo2KNN1TkboLVsIOKzxRlgB24cIa6R4cbb07kwAKHmYD1krcWkes3Hz d7CQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738852608; x=1739457408; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=5tHtbVIk5Izlr6TjfopNjldJhJ43W+pK2BUqRAz6/Z8=; b=rZLfelTUc0WSYNBet/MlSO4ARx8tYUUvu+OYQiJY4v2iKFQOOkFDMuQcR8i4CqQC10 Y/OLB4TyrpeE0jVYx9uSq+2GvM2g0hPIiALGyxB9n27au+5QSDVIrw6w6QKWThzA/yO2 svokrEzXaCoyVTyt6u0wgIk8ZM+KWj2pwO6I6/OuvsV3Gb3RME/BBeZGJTkHwzDguzRK jhp4aVmGkhwHhRpyEUDsRPokFQ75l5caWTIAXXRWuf1cVlO8Sbgv2nmC6sWvhMcLULMw D/Z0uNulp5LtwH0mZUg4YbwHf6CH1u5SBTrkpDmyayGaH94iMHGUdSF7wWMSe+Xidrc3 xgNA== X-Gm-Message-State: AOJu0Yy/xFMPTo1bUVqbxpWR3qykMBBEgsX+3itAwBh8RAY7Wp64uplb FPBdeqRQiA2LM+YZmTQpYKYmR0fcF77Q4MKU+rBB4avDjVT6AU2cFsoalPMt X-Gm-Gg: ASbGnctW3PAh+yxuaRsDZUFRkyM29gW1Jg8oXMVNrxL5GiVYKaK2UhTR9TF2d73cbHX B+IkNQsmInSSqfTAamdJpSAELHGG8md5wt/t//l2VrMsy2lX+KSHBwtwebf75KCArTCZpjQy+D3 W9cwfwM7I8SNIrHGemqxPjNh660sEv0ihVdsdzPwRRdQJrl+yycywiT9BXr5bEYlymSOSsgZ9h5 M8IerazCsyj5DhzJQ8wXvV+tQ0kHH5n5a7Nl8FSp3hn0XEaEh2MIrukNZ1wfytbrSgmSOapYfnP f8bzxh4OxGza9WUPTTDv X-Google-Smtp-Source: AGHT+IGaZrOJ9lJHsoKlqfDbxXEPMEQAWUBObPQKuY7YseS8yXI7aWdIAOpJWtKU2JAL9mKweRGS+g== X-Received: by 2002:a05:600c:3111:b0:431:5aea:95f with SMTP id 5b1f17b1804b1-4390d43ddddmr72035195e9.16.1738852607464; Thu, 06 Feb 2025 06:36:47 -0800 (PST) Received: from localhost ([141.226.10.168]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38dbde0fb31sm1900430f8f.65.2025.02.06.06.36.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2025 06:36:47 -0800 (PST) From: Efraim Flashner <efraim@HIDDEN> Date: Thu, 6 Feb 2025 16:36:32 +0200 Message-ID: <c3cdfd2fb8c176d49a125a89ab8d27e7357f44db.1738851574.git.efraim@HIDDEN> X-Mailer: git-send-email 2.47.1 In-Reply-To: <cover.1738851574.git.efraim@HIDDEN> References: <cover.1738851574.git.efraim@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.1 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.9 (/) * Makefile.am (SUPPORTED_SYSTEMS): Add riscv64-linux. Change-Id: Ie8a18500b73b39f0702af64a5c9cb988ffd77250 --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index de884548188..ad8bb907515 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1070,7 +1070,7 @@ SOURCE_TARBALLS = \ # Systems supported by Guix. SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux armhf-linux aarch64-linux \ - powerpc64le-linux + powerpc64le-linux riscv64-linux # Guix binary tarballs. BINARY_TARBALLS = \ -- Efraim Flashner <efraim@HIDDEN> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] [PATCH 2/4] etc: manifests/release: Adjust for changes in Guix. Resent-From: Efraim Flashner <efraim@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 06 Feb 2025 14:37:03 +0000 Resent-Message-ID: <handler.76098.B76098.173885262122893 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76098 <at> debbugs.gnu.org Cc: Efraim Flashner <efraim@HIDDEN> Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.173885262122893 (code B ref 76098); Thu, 06 Feb 2025 14:37:03 +0000 Received: (at 76098) by debbugs.gnu.org; 6 Feb 2025 14:37:01 +0000 Received: from localhost ([127.0.0.1]:55065 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tg300-0005x9-6v for submit <at> debbugs.gnu.org; Thu, 06 Feb 2025 09:37:01 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:59791) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <efraim.flashner@HIDDEN>) id 1tg2zw-0005wZ-BZ for 76098 <at> debbugs.gnu.org; Thu, 06 Feb 2025 09:36:57 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-38db0146117so453263f8f.3 for <76098 <at> debbugs.gnu.org>; Thu, 06 Feb 2025 06:36:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738852610; x=1739457410; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=xNPusilf4pIxukM9UEIM6/SOVhzlFhpc/QMlVAkhKKg=; b=Ew/Wt1ly2COtCGu08S3HgeBC4AnE9OQUEJfbIx2S1gFVZcqt6AdTGT5j/1hLYtWS3e fEJPOP2qieZ17O0u0+eLKd8mto9XCrtDoVi2OAfaQLtmmTjogb8z6ZNkdHqo5twVgn8c VjwnFH9+fD0U3GzHiBs8y2Z5ytxHCR97GPJqzhbpy2+7QOQp+RcUsi416yreynBrI1Hk jQC0lL2l2RfwCPVS5c8ysz27BAtLIa6dKpL0XaRkbXulXQ2KEUk4agbO/N9GcPF3pjhk vzzOYkXyf2U5NE7ASdrakfaiu4xGqEjrObfVx7GK5H6fH4OgynTCPbdXwCiWnI2AMbOM xx1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738852610; x=1739457410; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=xNPusilf4pIxukM9UEIM6/SOVhzlFhpc/QMlVAkhKKg=; b=p8LVHablLkMOr7TdYoZfUZD2FzS5aVRc/zRXjHyLiIre/0pJ4vz2f3LTuixOMLg6P8 1fN3CjgSJZrhQSxk3QMHSYQckjK30TjdrLA/vNlo8ZISJRv2HYmPIcJzYX0aRw8nV6i1 tn3MT/PRHWgGDTDhPZMUy+MaPa8pvP0sndpfNWJUl65pl6cpRbRffEtS7NgmNQphHn+7 +URGHbGZo8rNjjKX7YiU9Zt9U1eDC7xcAIPPczIwzIbIS1WslFIU6tANoOF3JEZS23xr qJRFmh/gKuUiiERBZQLkxr+YgJPxe2FAQPog9pjqHoEHD/83Q45iKoEXB1uAvar+GRWp RSQA== X-Gm-Message-State: AOJu0YzsRlM7Y9bZfwRrB38gmHm+nhywbzae6BIyUYBTwbDvnYDSK1Ce viOegJ6Vv9TnGCKmX8SVeh4t6ZCZixWST/ja3rly5rzSTJ5NoBS7jHSKNcVF X-Gm-Gg: ASbGncv9HNIIr3LMNXLpDNdokchsxfvdwo7H004RQkl17BW2H9P50lHVRI2DN5RdCd9 RfzLEDjZ/SNBpbLdWE2HkWbjfXFKII12LdA5nGa3OBN5LHxbHGzjBJgXAkCYaUpDWs1NgyzcC8E F2s+dUWwXYjKth0p01AwAv3HGIKgJCM1Y6uS4h5i5VcjR79LItfWF7wsFsbhCxafunsmoIVuffa tJggnIp0yn2Bz0MXNvyPU0UPJWuxAVt508J9Mc/N/jQ5a5bGhTCGMr+nTseDMUjfHaf7Ack33Ej IeaME4KfyirXs9GHjSEV X-Google-Smtp-Source: AGHT+IG/6oufWDECBGQLQ31jLruTEo5Xc/1cpWPk/NIRrAGneb7a4fO6vulV0XPQLNLq9ti/QSK+ZA== X-Received: by 2002:a5d:47a8:0:b0:38a:88a0:2234 with SMTP id ffacd0b85a97d-38db4860dd7mr4378101f8f.4.1738852609832; Thu, 06 Feb 2025 06:36:49 -0800 (PST) Received: from localhost ([141.226.10.168]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38dbde1dcc7sm1866405f8f.88.2025.02.06.06.36.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2025 06:36:49 -0800 (PST) From: Efraim Flashner <efraim@HIDDEN> Date: Thu, 6 Feb 2025 16:36:33 +0200 Message-ID: <ea80b4f1e6eed0d2e6cab4b3fb14294dbc864fe2.1738851574.git.efraim@HIDDEN> X-Mailer: git-send-email 2.47.1 In-Reply-To: <cover.1738851574.git.efraim@HIDDEN> References: <cover.1738851574.git.efraim@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.1 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.9 (/) * etc/manifests/release.scm (%base-packages): Replace with %base-packages from (gnu system). (%system-packages): Adjust the packages which are depended upon by the installer. Add a set of extra packages which we expect to have available. (%packages-to-cross-build): Add zstd and git-minimal. (%cross-manifest): Add riscv64-linux-gnu as a target. Change-Id: I5806fff6bc38d14859f6d7163719841620e28d09 --- etc/manifests/release.scm | 51 +++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/etc/manifests/release.scm b/etc/manifests/release.scm index b003f216fff..d5d86d273e7 100644 --- a/etc/manifests/release.scm +++ b/etc/manifests/release.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2020-2022, 2024 Ludovic Courtès <ludo@HIDDEN> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@HIDDEN> ;;; Copyright © 2023 Andreas Enge <andreas@HIDDEN> +;;; Copyright © 2025 Efraim Flashner <efraim@HIDDEN> ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ (guix profiles) ((guix platform) #:select (targets)) ((gnu services xorg) #:select (%default-xorg-modules)) + ((gnu system) #:prefix gnu-system: #:select (%base-packages)) (guix utils) (guix gexp) (srfi srfi-1) @@ -47,9 +49,9 @@ (define* (package->manifest-entry* package system (define %base-packages ;; Packages that must be substitutable on all the platforms Guix supports. - (map specification->package - '("bootstrap-tarballs" "gcc-toolchain" "nss-certs" - "openssh" "emacs" "vim" "python" "guile" "guix"))) + ;; Use the %base-packages from (gnu system) since they are included by default + ;; in the packages field of the operating system configuration. + gnu-system:%base-packages) (define %base-packages/armhf ;; The guix package doesn't build natively on armhf due to Guile memory @@ -67,14 +69,17 @@ (define %base-packages/hurd (define %system-packages ;; Key packages proposed by the Guix System installer. (append (map specification->package - '("xorg-server" "xfce" "gnome" "mate" "enlightenment" - "openbox" "awesome" "i3-wm" "ratpoison" + '("gnome" "xfce" "mate" "enlightenment" + "openbox" "awesome" + "i3-wm" "i3status" "dmenu" "st" + "ratpoison" "xterm" "emacs" "emacs-exwm" "emacs-desktop-environment" - "xlockmore" "slock" "libreoffice" - "connman" "network-manager" "network-manager-applet" - "openssh" "ntp" "tor" - "linux-libre" "grub-hybrid" - "icecat")) + "openssh" "tor" "ntp" "gpm" + "connman" "network-manager" "wpa-supplicant" "isc-dhcp" "cups" + "linux-libre" "grub-hybrid")) + ;; Additional key packages we want to make sure are available + (map specification->package + '("emacs" "icecat" "libreoffice" "vim")) %default-xorg-modules)) (define %packages-to-cross-build @@ -84,11 +89,12 @@ (define %packages-to-cross-build (append (list (@ (gnu packages guile) guile-3.0/pinned)) (map specification->package '("coreutils" "grep" "sed" "findutils" "diffutils" "patch" - "gawk" "gettext" "gzip" "xz" + "gawk" "gettext" "gzip" "xz" "zstd" "git-minimal" "hello" "zlib")))) (define %packages-to-cross-build-for-mingw - ;; Many things don't build for MinGW. Restrict to what's known to work. + ;; Many things don't build for MinGW. Restrict to what's known to work + ;; to test that the cross-compiler itself works. (map specification->package '("hello"))) (define %cross-bootstrap-targets @@ -107,14 +113,10 @@ (define %base-manifest (manifest (append-map (lambda (system) (map (cut package->manifest-entry* <> system) - (cond ((string=? system "i586-gnu") + (cond ((target-hurd? system) %base-packages/hurd) - ((string=? system "armhf-linux") + ((target-arm32? system) %base-packages/armhf) - ((string=? system "powerpc64le-linux") - ;; FIXME: Drop 'bootstrap-tarballs' until - ;; <https://bugs.gnu.org/48055> is fixed. - (drop %base-packages 1)) (else %base-packages)))) %cuirass-supported-systems))) @@ -123,7 +125,7 @@ (define %system-manifest (manifest (append-map (lambda (system) ;; Some of %SYSTEM-PACKAGES are currently unsupported on some - ;; systems--e.g., GNOME on non-x86_64, due to Rust. Filter + ;; systems--e.g., GNOME on 32-bit, due to Rust. Filter ;; them out. (filter-map (lambda (package) (and (supported-package? package system) @@ -131,6 +133,8 @@ (define %system-manifest %system-packages)) '("x86_64-linux" "i686-linux")))) ;Guix System +;; As per the Guix Survey of 2024 we only worry about cross compiling from +;; x86_64-linux (98% of users) and not from others (aarch64 with 19%). (define %cross-manifest (manifest (append-map (lambda (target) @@ -153,12 +157,7 @@ (define %cross-manifest ;; Ignore bare-metal targets. "avr" "or1k-elf" - "xtensa-ath9k-elf" - - ;; XXX: Important bits like libsigsegv and libffi don't - ;; support RISCV at the moment, so don't require RISCV - ;; support. - "riscv64-linux-gnu"))))) + "xtensa-ath9k-elf"))))) (define %cross-bootstrap-manifest (manifest @@ -168,7 +167,7 @@ (define %cross-bootstrap-manifest "x86_64-linux" #:target target)) %cross-bootstrap-targets))) -;; Return the union of all three manifests. +;; Return the union of all four manifests. (concatenate-manifests (list %base-manifest %system-manifest %cross-manifest -- Efraim Flashner <efraim@HIDDEN> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] [PATCH 3/4] etc: Add installer manifest. Resent-From: Efraim Flashner <efraim@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 06 Feb 2025 14:38:02 +0000 Resent-Message-ID: <handler.76098.B76098.173885262522931 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76098 <at> debbugs.gnu.org Cc: Efraim Flashner <efraim@HIDDEN> Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.173885262522931 (code B ref 76098); Thu, 06 Feb 2025 14:38:02 +0000 Received: (at 76098) by debbugs.gnu.org; 6 Feb 2025 14:37:05 +0000 Received: from localhost ([127.0.0.1]:55070 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tg304-0005xl-DU for submit <at> debbugs.gnu.org; Thu, 06 Feb 2025 09:37:05 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:48544) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <efraim.flashner@HIDDEN>) id 1tg2zz-0005wc-3u for 76098 <at> debbugs.gnu.org; Thu, 06 Feb 2025 09:36:59 -0500 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-436ce2ab251so6520975e9.1 for <76098 <at> debbugs.gnu.org>; Thu, 06 Feb 2025 06:36:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738852613; x=1739457413; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=yOyeH1DM3H8omt7buJ7p70Hz0Wxi2Yh5TURHjKi2Xd0=; b=I+TxbBvHNdImFkDhzvvDCbI4vgjo+EoI6OqrtFQgwGHDnRbcqZz4HzXIyf+SIAQKR+ gADMJFy1s0OAJiWO3ly/YlyYKktB618gj4WuJKMXRRa3lB/9malVmR+YUZeua+h5eYGs 7PShClEWFA7zKYKxWsWG9smAYqWZO0TB/s4vJm1z2F5kFw/9fDdR8AZi1zs2Zno+dOQq J1tfpLSLaICLju6Ai8ThvqbVt32gN4whRb+Abax0wI0eV1f7x1GbvuiTjJvXSuQGhteC HpN1aIRiu3jSxiDIMzvG5NqIGnRK7Q9/6Skov0FXJI2Lq1swPzrba7rNEQ/OkogcX61T cBng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738852613; x=1739457413; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=yOyeH1DM3H8omt7buJ7p70Hz0Wxi2Yh5TURHjKi2Xd0=; b=VdSwXb9RDCqOaAcNT3qeI2A+zjUFWZE0BhY9FfeRKybCU8v1fLq4rhuH8flcxUM2Ud ga5NqvLyIEPH9E6U1/8u2DR8jv4tFS8vhMxbDwNpzFUs58oSSyu2GGAB35c8YBqBXC3k noUL0TyGhfQRp5wgfKU6d+BqvFI00K1mwN86lLsocRNmp2izN1dZsfuG5izLmwaH/db8 xirenTkDNi9tilSMxVbHr/RTWCy89fLMVSZHb2G24ZGy2OE+AEgegdFe1BI+jE198cod xMPO/lDiuwM2ySTb+rMVf/Jum+4lDLCFCE5zu52XLA32OxWe+KWXnZM/tz0Bd4ZWaLVr dQcw== X-Gm-Message-State: AOJu0YxQTWDpUMZ+C4sHBb+vgtRsdQ4vTXIcodRewiCDSe1yR/aN7WFP mRtrnUiIJaCRrMyhKEUwI/no4Um+jlXnhNBV0Rhhm+ID6l00xtHFoed9Qwet X-Gm-Gg: ASbGncvVSHP20ZmsMhr0yJED1fktcIVRaykxlbXGtm4QCCY+iFQQ0AKsuAFdl0YJut5 6Sk/VS/7HqNPsP3hLR/FCBlzG5ynpyEW/nxdL76RkNNwzgM4Ic7pDOGBW4BHhS2va0qBUllj9xt OaBo5zn/jGmWDV9Y6qkVbQeFQZbnRoJRyx/2glGeTac7JLvIH4L3st+mQwIqcZsk+8vpHq3Rt9B lbPzO2wdqAGjuRhgs0KgZtnA75DqzbSRpKF3KcqJOMPydLOqOSZgwzClMozz7kcUsauAZxktrYj S2DF+RgmQxniQ1eCTztG X-Google-Smtp-Source: AGHT+IHZ86JnwyPIyFRIzd8FtqxCz8RHWSNu2+vyK3wTw0Q2PUHuwE89/2awiE34on/z+LSghos08A== X-Received: by 2002:a05:600c:1c91:b0:434:fbda:1f44 with SMTP id 5b1f17b1804b1-4390d56141dmr52023105e9.19.1738852612665; Thu, 06 Feb 2025 06:36:52 -0800 (PST) Received: from localhost ([141.226.10.168]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4391dcae84csm20957185e9.19.2025.02.06.06.36.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2025 06:36:51 -0800 (PST) From: Efraim Flashner <efraim@HIDDEN> Date: Thu, 6 Feb 2025 16:36:34 +0200 Message-ID: <136a425368c9707e3097f7c57adb809d24a6689c.1738851574.git.efraim@HIDDEN> X-Mailer: git-send-email 2.47.1 In-Reply-To: <cover.1738851574.git.efraim@HIDDEN> References: <cover.1738851574.git.efraim@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.1 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.9 (/) * etc/manifests/installer.scm: New file. * Makefile.am (GUIX_SYSTEM_SUPPORTED_SYSTEMS): Rename to GUIX_SYSTEM_INSTALLER_SYSTEMS. (assert-binaries-available): Check for substitutes using the installer manifest. Change-Id: I5c15e6916583bcd56e535733f284f3a735d7600b --- Makefile.am | 13 +++-- etc/manifests/installer.scm | 112 ++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 6 deletions(-) create mode 100644 etc/manifests/installer.scm diff --git a/Makefile.am b/Makefile.am index ad8bb907515..f2a5bcf5f7b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1076,8 +1076,9 @@ SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux armhf-linux aarch64-linux \ BINARY_TARBALLS = \ $(foreach system,$(SUPPORTED_SYSTEMS),guix-binary.$(system).tar.xz) -# Systems supported by Guix System. -GUIX_SYSTEM_SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux +# Systems supported by the Guix System installer. +# A Hurd install happens from a Linux installer image. +GUIX_SYSTEM_INSTALLER_SYSTEMS ?= x86_64-linux i686-linux # Systems for which we build Guix VMs. GUIX_SYSTEM_VM_SYSTEMS ?= x86_64-linux @@ -1138,10 +1139,10 @@ release: dist-with-updated-version all # Build 'current-guix' to speed things up for the next step. $(top_builddir)/pre-inst-env guix build \ -e '((@ (gnu packages package-management) current-guix))' \ - $(call system_flags,$(GUIX_SYSTEM_SUPPORTED_SYSTEMS)) \ + $(call system_flags,$(GUIX_SYSTEM_INSTALLER_SYSTEMS)) \ -v1 --no-grafts --fallback # Generate the ISO installation images. - for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do \ + for system in $(GUIX_SYSTEM_INSTALLER_SYSTEMS) ; do \ GUIX_DISPLAYED_VERSION="`git describe --match=v* | sed -'es/^v//'`" ; \ image=`$(top_builddir)/pre-inst-env \ guix system image -t iso9660 \ @@ -1205,11 +1206,11 @@ assert-no-store-file-names: exit 1 ; \ fi -# Make sure important substitutes are available. Check only the primary +# Make sure installer substitutes are available. Check only the primary # server so that '--display-missing' doesn't print two lists. assert-binaries-available: $(GOBJECTS) $(AM_V_at)$(top_builddir)/pre-inst-env \ - guix weather -m "$(top_srcdir)/etc/manifests/release.scm" \ + guix weather -m "$(top_srcdir)/etc/manifests/installer.scm" \ --substitute-urls="https://ci.guix.gnu.org" \ --display-missing diff --git a/etc/manifests/installer.scm b/etc/manifests/installer.scm new file mode 100644 index 00000000000..264cb4bab8e --- /dev/null +++ b/etc/manifests/installer.scm @@ -0,0 +1,112 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020, 2021 Ludovic Courtès <ludo@HIDDEN> +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@HIDDEN> +;;; Copyright © 2025 Efraim Flashner <efraim@HIDDEN> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. + +;;; This file returns a manifest containing packages which are needed by the +;;; installer. + +(use-modules (gnu packages) + (guix packages) + (guix profiles) + ((guix platform) #:select (targets)) + ((gnu services xorg) #:select (%default-xorg-modules)) + ((gnu system) #:select (%base-packages %base-packages-linux)) + (guix utils) + (guix gexp) + (srfi srfi-1) + (srfi srfi-26)) + +(define* (package->manifest-entry* package system + #:key target) + "Return a manifest entry for PACKAGE on SYSTEM, optionally cross-compiled to +TARGET." + (manifest-entry + (inherit (package->manifest-entry package)) + (name (string-append (package-name package) "." system + (if target + (string-append "." target) + "'"))) + (item (with-parameters ((%current-system system) + (%current-target-system target)) + package)))) + +(define %guix-system-installer-systems + ;; Only the systems listed in GUIX_SYSTEM_INSTALLER_SYSTEMS + '("x86_64-linux" "i686-linux" + ;; These would be installed from their Linux counterparts: + ;"x86_64-gnu" "i586-gnu" + ;; Not actually for the installer, but needs the same packages anyway. + "aarch64-linux")) + +(define %base-packages/hurd + ;; Remove the packages from %base-packages-linux and some of the packages + ;; from the other package sets. + (fold delete %base-packages + (append (map specification->package + '("e2fsprogs" "kbd" "iproute2" "iw" "wireless-tools")) + %base-packages-linux))) + +(define %system-packages + ;; Key packages proposed by the Guix System installer. + (append (map specification->package + '("gnome" "xfce" "mate" "enlightenment" + "openbox" "awesome" + "i3-wm" "i3status" "dmenu" "st" + "ratpoison" "xterm" + "emacs" "emacs-exwm" "emacs-desktop-environment" + "openssh" "tor" "ntp" "gpm" + "connman" "network-manager" "wpa-supplicant" "isc-dhcp" "cups" + "linux-libre" "grub-hybrid")) + %default-xorg-modules)) + + +;;; +;;; Manifests. +;;; + +(define %base-manifest + (manifest + (append-map (lambda (system) + (map (cut package->manifest-entry* <> system) + (cond ((target-hurd? system) + %base-packages/hurd) + (else + %base-packages)))) + %guix-system-installer-systems))) + +(define %system-manifest + (manifest + (cons + ;; linux-libre-arm64-generic is the commonly used kernel on aarch64-linux. + (package->manifest-entry* (@ (gnu packages linux) + linux-libre-arm64-generic) + "aarch64-linux") + (append-map (lambda (system) + ;; Some of %SYSTEM-PACKAGES are currently unsupported on some + ;; systems--e.g., GNOME on 32-bit, due to Rust. Filter + ;; them out. + (filter-map (lambda (package) + (and (supported-package? package system) + (package->manifest-entry* package system))) + %system-packages)) + %guix-system-installer-systems)))) + +;; Return the union of all installer manifests. +(concatenate-manifests (list %base-manifest + %system-manifest)) -- Efraim Flashner <efraim@HIDDEN> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] [PATCH 4/4] etc: Add cross-compile manifest. Resent-From: Efraim Flashner <efraim@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 06 Feb 2025 14:38:02 +0000 Resent-Message-ID: <handler.76098.B76098.173885262622940 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76098 <at> debbugs.gnu.org Cc: Efraim Flashner <efraim@HIDDEN> Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.173885262622940 (code B ref 76098); Thu, 06 Feb 2025 14:38:02 +0000 Received: (at 76098) by debbugs.gnu.org; 6 Feb 2025 14:37:06 +0000 Received: from localhost ([127.0.0.1]:55072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tg305-0005xo-9U for submit <at> debbugs.gnu.org; Thu, 06 Feb 2025 09:37:06 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:48393) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <efraim.flashner@HIDDEN>) id 1tg301-0005wk-7k for 76098 <at> debbugs.gnu.org; Thu, 06 Feb 2025 09:37:02 -0500 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-38db8f8786fso508278f8f.1 for <76098 <at> debbugs.gnu.org>; Thu, 06 Feb 2025 06:37:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738852615; x=1739457415; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=1Be5NKkEplXq1/YenNSxxTkmCZmurvySSlgHAEb9cOs=; b=ddxYAexgufuzxFIEWsoB4cdRbEkzYQuMtaJ0y/2jOKB4kt/MxK+BCjqZco8Ia6FjzU w6t7tVgnKv51XYh6LU2S+aupUjcG1wLqv8X8nfhaqXoiwtPEJYVH+79NSzhQvOI9hZ3y +8Ne4NENvgKCStjKQOcc2r773Vol9JKWnnO6nR6ZWXcoGxMGal4zXlMWPfzhmyscVlVU oYK5i57SLejmvKUPuqab3itR6MHJH0IldV/NMrt3i7D+5VcCpZ5UjApy/svmIpuCpPu4 NTF5UmTbmSGWi+NTz75Bn2SsU0IntHGmZDQkyQpuk5duSCD/kMmTQwmaMHWKqZsEU6Uw boVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738852615; x=1739457415; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=1Be5NKkEplXq1/YenNSxxTkmCZmurvySSlgHAEb9cOs=; b=TdAtNNm8BpHYuEc1KWRdKkgR2oZbu9dclGyvKW1J5SgNCpJSzooRK2Uwr3CSJXNeFD qU5KaOxhpjlNEvHCBGsjXY/APjus0Nn+D3YatghqytwsyXdPhbGnDVGcqqxK8XN4M4tD j1lu5f7gsskwsUVP9UkChpVPS54/feg2IZ3PNUAxwGCr8Pt/1owr9yAFNNtFo8EItAC0 ocj//P8OFnwhBknhYce8buYj2MRvFS3GrLn3kFKdvjj6osmy0FO7OfZssmfHmc51Zgwz H68Fq2fYX9Z/J//K3ZEdX4Q4pMyVJnTQf7JpJR2xdL5yJi3XeUqZ/E+f6PpFq15MxLWB /XIw== X-Gm-Message-State: AOJu0YxO6/O+hpN21Oods2DAiMYFau/lcxUsRuxr6mKJw0td73LZTP5O RYpgNfCyYVz66lHyxU5Ec+5LCsxmQqg9v9wXtsk2NI4ljXtq7IlLZtTOhgYg X-Gm-Gg: ASbGncs7YqOdRU1jDlPq899FEA+pdXdiOw7ZPjJtHSF83MKgh6qMkgzvbl4Sbkk7jNI Jh+7YQcUqsvvkZije+3vH25gdDzJQIhYO+4RYvUceSwPPrl72ik6KFQ8Vw274uxdBblZP/prmIY AFijdJWR2c007TfsIeJYnSGwa9HjACAdnCAZE/PlDt/moMsysrdHUUKE2EWwjMNxL/efF4O2y0q /03BlK0fVS1aFzejfCSld9zU9gSUMXmNbc370aq3Z3Dc5phWxxJDG4zklDx1TsrqbPSPKgVNkaY xYcywZx3ZfEPgXqex9Gn X-Google-Smtp-Source: AGHT+IEaYQlfbV+sukLxZZ4bOYiOCrNUfgxI3vn4rc2llGbV/rJcGrnKi6FJCImj+feOThiRa3PpUw== X-Received: by 2002:a5d:59af:0:b0:385:fa20:658b with SMTP id ffacd0b85a97d-38db4880938mr5573832f8f.24.1738852614652; Thu, 06 Feb 2025 06:36:54 -0800 (PST) Received: from localhost ([141.226.10.168]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4391dfc8917sm20645435e9.30.2025.02.06.06.36.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2025 06:36:54 -0800 (PST) From: Efraim Flashner <efraim@HIDDEN> Date: Thu, 6 Feb 2025 16:36:35 +0200 Message-ID: <1a5c694d0b22eaf82b823d7264fae1c6c2ecfb60.1738851574.git.efraim@HIDDEN> X-Mailer: git-send-email 2.47.1 In-Reply-To: <cover.1738851574.git.efraim@HIDDEN> References: <cover.1738851574.git.efraim@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.1 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.9 (/) * etc/manifests/cross-compile.scm: New file. Change-Id: I63ac4014617e8d716c508a04c6da553e36a99fec --- etc/manifests/cross-compile.scm | 167 ++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) create mode 100644 etc/manifests/cross-compile.scm diff --git a/etc/manifests/cross-compile.scm b/etc/manifests/cross-compile.scm new file mode 100644 index 00000000000..8754f325564 --- /dev/null +++ b/etc/manifests/cross-compile.scm @@ -0,0 +1,167 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020-2022, 2024 Ludovic Courtès <ludo@HIDDEN> +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@HIDDEN> +;;; Copyright © 2023 Andreas Enge <andreas@HIDDEN> +;;; Copyright © 2025 Efraim Flashner <efraim@HIDDEN> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. + +;;; This file returns a manifest containing packages which should all cross-compile. +;;; We use the packages included by default in an OS configuration since that is +;;; (probably) the most likely install method for some architectures. + +(use-modules (gnu packages) + (guix packages) + (guix profiles) + (guix platform) + ((gnu services xorg) #:select (%default-xorg-modules)) + ((gnu system) #:prefix gnu-system: + #:select (%base-packages %base-packages-linux)) + (guix utils) + (guix gexp) + (srfi srfi-1) + (srfi srfi-26)) + +(define* (package->manifest-entry* package system + #:key target) + "Return a manifest entry for PACKAGE on SYSTEM, optionally cross-compiled to +TARGET." + (manifest-entry + (inherit (package->manifest-entry package)) + (name (string-append (package-name package) "." system + (if target + (string-append "." target) + "'"))) + (item (with-parameters ((%current-system system) + (%current-target-system target)) + package)))) + +(define %base-packages + ;; Packages that must be substitutable on all the platforms Guix supports. + ;; Use the %base-packages from (gnu system) since they are included by default + ;; in the packages field of the operating system configuration. + gnu-system:%base-packages) + +(define %base-packages/hurd + ;; Remove the packages from %base-packages-linux and some of the packages + ;; from the other package sets. + (fold delete %base-packages + (append (map specification->package + '("e2fsprogs" "kbd" "iproute2" "iw" "wireless-tools")) + %base-packages-linux))) + +(define %system-packages + ;; Key packages proposed by the Guix System installer. + (map specification->package + '("guix" "openssh" "tor" "ntp" "gpm" + "connman" "network-manager" "wpa-supplicant" "isc-dhcp" "cups" + "linux-libre" "grub-hybrid"))) + +(define %system-gui-packages + ;; Key packages proposed by the Guix System installer. + (append (map specification->package + '("enlightenment" + ;; build system `python' does not support cross builds + ;"gnome" "xfce" "mate" "openbox" + "awesome" + "i3-wm" "i3status" "dmenu" "st" + "ratpoison" "xterm" + ;; build system `emacs' does not support cross builds + ;"emacs-exwm" "emacs-desktop-environment" + "emacs")) + %default-xorg-modules)) + +(define %packages-to-cross-build + ;; Packages that must be cross-buildable from x86_64-linux. + ;; FIXME: Add (@ (gnu packages gcc) gcc) when <https://bugs.gnu.org/40463> + ;; is fixed. + (append (list (@ (gnu packages guile) guile-3.0/pinned)) + (map specification->package + '("coreutils" "grep" "sed" "findutils" "diffutils" "patch" + "gawk" "gettext" "gzip" "xz" "zstd" + "hello" "zlib")))) + +(define %packages-to-cross-build-for-mingw + ;; Many things don't build for MinGW. Restrict to what's known to work + ;; to test that the cross-compiler itself works. + (map specification->package '("hello"))) + + +;;; +;;; Manifests. +;;; + +;; As per the Guix Survey of 2024 we only worry about cross compiling from +;; x86_64-linux (98% of users) and not from others (aarch64 with 19%). +(define %cross-manifest + (manifest + (append-map (lambda (target) + (map (cut package->manifest-entry* <> "x86_64-linux" + #:target target) + (if (target-mingw? target) + %packages-to-cross-build-for-mingw + %packages-to-cross-build))) + (fold delete (targets) + '(;; Disable cross-compilation to self: + "x86_64-linux-gnu" + + ;; mips64el commonly targets a different architecture + ;; revision than we targeted in Guix. + "mips64el-linux-gnu" + + ;; Ignore bare-metal targets. + "avr" + "or1k-elf" + "xtensa-ath9k-elf"))))) + +(define %cross-system + (manifest + (cons* + ;; Include a couple of extra kernels that are commonly used: + (package->manifest-entry* (@ (gnu packages linux) + linux-libre-arm64-generic) + "x86_64-linux" + #:target "aarch64-linux-gnu") + (package->manifest-entry* (@ (gnu packages linux) + linux-libre-arm-generic) + "x86_64-linux" + #:target "arm-linux-gnueabihf") + (package->manifest-entry* (@ (gnu packages linux) + linux-libre-riscv64-generic) + "x86_64-linux" + #:target "riscv64-linux-gnu") + (append-map (lambda (target) + (map (cut package->manifest-entry* <> "x86_64-linux" + #:target target) + (cond + ;; With a graphical environment: + ((or (target-x86-32? target) + (target-aarch64? target)) + (append %base-packages + %system-packages + %system-gui-packages)) + (else (append %base-packages %system-packages))))) + (fold delete (map platform-system->target (systems)) + '(;; Disable cross-compilation to self: + "x86_64-linux-gnu" + + ;; Ignore obsolete systems, as in (gnu ci). + "mips64el-linux-gnu" + "powerpc-linux-gnu")))))) + +;; Return the union of all the manifests. +(concatenate-manifests (list %cross-manifest + %cross-system)) -- Efraim Flashner <efraim@HIDDEN> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] The next release References: <cover.1738851574.git.efraim@HIDDEN> In-Reply-To: <cover.1738851574.git.efraim@HIDDEN> Resent-From: Efraim Flashner <efraim@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Tue, 11 Feb 2025 11:56:01 +0000 Resent-Message-ID: <handler.76098.B76098.17392749399916 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: guix-devel@HIDDEN Cc: 76098 <at> debbugs.gnu.org Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.17392749399916 (code B ref 76098); Tue, 11 Feb 2025 11:56:01 +0000 Received: (at 76098) by debbugs.gnu.org; 11 Feb 2025 11:55:39 +0000 Received: from localhost ([127.0.0.1]:54681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1thora-0002Zq-05 for submit <at> debbugs.gnu.org; Tue, 11 Feb 2025 06:55:39 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:51641) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <efraim.flashner@HIDDEN>) id 1thorU-0002ZT-Vq for 76098 <at> debbugs.gnu.org; Tue, 11 Feb 2025 06:55:35 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-439566c991dso1317105e9.3 for <76098 <at> debbugs.gnu.org>; Tue, 11 Feb 2025 03:55:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739274926; x=1739879726; darn=debbugs.gnu.org; h=content-disposition:mime-version:mail-followup-to:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=uPqn5PHYmaPiOZLsezBDmpBdSdPgHlXO2Klk7KUVY2w=; b=TUI+rCGoJmLIvq54Duz5IZYvRR43BLD07a/QvZLXAhbvf/auH9yU0COTpQAWe/K4b7 TdnsK/7Yffd4mDkjzmIdiR0Uz9Lkjhw8s/gvCDsRyRzv61VnAIsRp3u8s40z1mria6xi DMJf3UKj9bGhQTlAvvOVyBBryWQIjHoFVYsZJwk2SrT07tmiBW7B7GARV82tvlvxjB65 g1u/LZwyVxfJBLELeL+pB20tt4CR/vw5McbUg907W+yG2R11a8eofx/Cxv8CWnfv959K 6p7xN+Ac3et/Kr/cXZd2PdhEX1PPbIAtlV8MddEXXt7BTqdRXyU1Y0eZS/7zkAkqUMv4 Z89w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739274926; x=1739879726; h=content-disposition:mime-version:mail-followup-to:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uPqn5PHYmaPiOZLsezBDmpBdSdPgHlXO2Klk7KUVY2w=; b=fr3UXBHP4N7k33jtHKCk5flBqIfVSp1OzJYgRgRt6tJQBlMLPSQcjlHf3f+WKQe2wg iNoUEIB2NSLyh2OVrpizIlwvT9T7tpz4YNU4tf74KnB+0hInd5lyRcFT0KUJBCeGlxGs LN+EobVKlvxpebAPbFwsJ8rBdY9MvuxJoaeVVsP/7vLx2AMFnzAE//AZbAcspZHooDcj JmVXbfOs8rYDJuorNnPbp5dESz2+mdFbPbkMFG3NxnUgw/apraxp3b6hg2WZusDCxKN9 bwApObJQbBbwSc8saISaAE3njwQCcfQlXbI+6WcRSLht0SsHLydQqVLzpgJ3lqmtMA9D dZsw== X-Gm-Message-State: AOJu0YzUkR52CZTaH3q2VkHy7DHEzgZFIIP2mqzOEmbJ3UC64Hdivc3a G+YT/p0c4M3v1iHBZBHJIEuhdF+b3RmazNulxAr6QqrQpxG2BcWG X-Gm-Gg: ASbGncv9Sc2risJYVUiqjDJqhvwUj/ejXtP4PgNXCHBaqFkPzyO1pQo8BxgemufFuzi DCqZRAUn88f7jG8pRSRb3wmY0sDK5r2+DMkbLfx5M3Jwh8yJAowdaCXKGjAu4LLbQ6nJT87YigD de3rCFepq8EQz7s3tQE88x+ygfsbpMLDiyp33dlLevq0B++b98jWC8nlacT6XHJyIyj1mVbWoU8 ZrcxpUEErRGA6E7hdvzAoCEi35rFa5WjFi5Vg8kjVFly0zYgmqfpzML/Cb4IvDa5n8m8e+zoIQn yewHYla30vZrn40= X-Google-Smtp-Source: AGHT+IFbXH1XJ0ImqKzz6lDKfiEeJ4aHo2QEPAWHCfwHKZCV0WEhTCuaWAmxx7uMtPUZAOr+NtzUWg== X-Received: by 2002:a05:600c:1c07:b0:434:ff9d:a3a1 with SMTP id 5b1f17b1804b1-4392497d81bmr140873085e9.2.1739274925866; Tue, 11 Feb 2025 03:55:25 -0800 (PST) Received: from localhost ([141.226.10.168]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43935c4f4aasm102473205e9.22.2025.02.11.03.55.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 03:55:25 -0800 (PST) Date: Tue, 11 Feb 2025 13:55:23 +0200 From: Efraim Flashner <efraim@HIDDEN> Message-ID: <Z6s6qzMesCT7kuyS@3900XT> Mail-Followup-To: guix-devel@HIDDEN, 76098 <at> debbugs.gnu.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="E9+8/CgW8JTZ7rXl" Content-Disposition: inline X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) --E9+8/CgW8JTZ7rXl Content-Type: multipart/mixed; boundary="oRm+CSHuT8T/Uo6D" Content-Disposition: inline --oRm+CSHuT8T/Uo6D Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable We discussed the next release during Guix Days and I volunteered to lead the effort. The short version: * We need a tagged release so we can update the version in Debian and other distros, in CI systems, etc. * We need a newer point-in-time for the installer. * A new release increases interest in the project. I've opened bug #76098 with a couple of patches but I figured it would be better if I wrote here instead. In the process toward a new release I took a look at the 'release' make target and the release.scm manifest to start. In the Makefile: * Added riscv64-linux as a supported system * switch the assert-binaries-available make target we've used previously to make sure we have substitutes for a base set of packages to point to the installer manifest. If the purpose of the installer is to install and then everyone expected to run `guix pull` then we need the packages from the installer. release.scm: I don't have a real good use for this manifest currently, but I've made some changes anyway: * %base-packages already existed in (gnu system), and that seemed like a good list of packages that we would need. This increased the list of packages. * %system-packages: The note mentioned the installer, so I copied the work I did on the installer.scm to this list. This also increased the list of packages. installer.scm: A manifest which only checks that we have substitutes for what can be installed using the TUI installer (assuming no extra added items). It differs from the GUIX_SYSTEM_INSTALLER_SYSTEM variable in the Makefile by including aarch64 as an architecture. Ideally all the packages should compile, which would allow someone to run the installer successfully for x86_64-linux, i686-linux or aarch64-linux. Currently everything is in one big manifest, but I think it would be better if we didn't do that, which would allow anyone to try to build the manifest only on architectures they are interested in/able to fix. Then we could (using the cuirass interface) set which architectures to try to build the manifest. cross-compile.scm: Ideally all the packages one would need to produce an OS image for another architecture we support, or the same %base-packages for other architectures we have. Currently it only tests from x86_64-linux. Ideally I'd like to see the installer.scm and cross-compile.scm manifests added to Cuirass. I'd hope we could keep 100% build on installer.scm so we can actually offer all the options in the installer, and the cross-compile.scm manifest might need to be split so we can focus on cross-compiling an OS config vs cross-compiling binaries for another architecture. --=20 Efraim Flashner <efraim@HIDDEN> =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --oRm+CSHuT8T/Uo6D Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-Makefile.am-Add-riscv64-linux-as-a-supported-system.patch" Content-Transfer-Encoding: quoted-printable =46rom c3cdfd2fb8c176d49a125a89ab8d27e7357f44db Mon Sep 17 00:00:00 2001 Message-ID: <c3cdfd2fb8c176d49a125a89ab8d27e7357f44db.1738851574.git.efraim= @flashner.co.il> In-Reply-To: <cover.1738851574.git.efraim@HIDDEN> References: <cover.1738851574.git.efraim@HIDDEN> =46rom: Efraim Flashner <efraim@HIDDEN> Date: Thu, 6 Feb 2025 16:06:27 +0200 Subject: [PATCH 1/4] Makefile.am: Add riscv64-linux as a supported-system. * Makefile.am (SUPPORTED_SYSTEMS): Add riscv64-linux. Change-Id: Ie8a18500b73b39f0702af64a5c9cb988ffd77250 --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index de884548188..ad8bb907515 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1070,7 +1070,7 @@ SOURCE_TARBALLS =3D \ =20 # Systems supported by Guix. SUPPORTED_SYSTEMS ?=3D x86_64-linux i686-linux armhf-linux aarch64-linux \ - powerpc64le-linux + powerpc64le-linux riscv64-linux =20 # Guix binary tarballs. BINARY_TARBALLS =3D \ --=20 Efraim Flashner <efraim@HIDDEN> =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --oRm+CSHuT8T/Uo6D Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0002-etc-manifests-release-Adjust-for-changes-in-Guix.patch" Content-Transfer-Encoding: quoted-printable =46rom ea80b4f1e6eed0d2e6cab4b3fb14294dbc864fe2 Mon Sep 17 00:00:00 2001 Message-ID: <ea80b4f1e6eed0d2e6cab4b3fb14294dbc864fe2.1738851574.git.efraim= @flashner.co.il> In-Reply-To: <cover.1738851574.git.efraim@HIDDEN> References: <cover.1738851574.git.efraim@HIDDEN> =46rom: Efraim Flashner <efraim@HIDDEN> Date: Thu, 6 Feb 2025 16:08:00 +0200 Subject: [PATCH 2/4] etc: manifests/release: Adjust for changes in Guix. * etc/manifests/release.scm (%base-packages): Replace with %base-packages from (gnu system). (%system-packages): Adjust the packages which are depended upon by the installer. Add a set of extra packages which we expect to have available. (%packages-to-cross-build): Add zstd and git-minimal. (%cross-manifest): Add riscv64-linux-gnu as a target. Change-Id: I5806fff6bc38d14859f6d7163719841620e28d09 --- etc/manifests/release.scm | 51 +++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/etc/manifests/release.scm b/etc/manifests/release.scm index b003f216fff..d5d86d273e7 100644 --- a/etc/manifests/release.scm +++ b/etc/manifests/release.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2020-2022, 2024 Ludovic Court=C3=A8s <ludo@HIDDEN> ;;; Copyright =C2=A9 2020 Jan (janneke) Nieuwenhuizen <janneke@HIDDEN> ;;; Copyright =C2=A9 2023 Andreas Enge <andreas@HIDDEN> +;;; Copyright =C2=A9 2025 Efraim Flashner <efraim@HIDDEN> ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ (guix profiles) ((guix platform) #:select (targets)) ((gnu services xorg) #:select (%default-xorg-modules)) + ((gnu system) #:prefix gnu-system: #:select (%base-packages)) (guix utils) (guix gexp) (srfi srfi-1) @@ -47,9 +49,9 @@ (define* (package->manifest-entry* package system =20 (define %base-packages ;; Packages that must be substitutable on all the platforms Guix support= s. - (map specification->package - '("bootstrap-tarballs" "gcc-toolchain" "nss-certs" - "openssh" "emacs" "vim" "python" "guile" "guix"))) + ;; Use the %base-packages from (gnu system) since they are included by d= efault + ;; in the packages field of the operating system configuration. + gnu-system:%base-packages) =20 (define %base-packages/armhf ;; The guix package doesn't build natively on armhf due to Guile memory @@ -67,14 +69,17 @@ (define %base-packages/hurd (define %system-packages ;; Key packages proposed by the Guix System installer. (append (map specification->package - '("xorg-server" "xfce" "gnome" "mate" "enlightenment" - "openbox" "awesome" "i3-wm" "ratpoison" + '("gnome" "xfce" "mate" "enlightenment" + "openbox" "awesome" + "i3-wm" "i3status" "dmenu" "st" + "ratpoison" "xterm" "emacs" "emacs-exwm" "emacs-desktop-environment" - "xlockmore" "slock" "libreoffice" - "connman" "network-manager" "network-manager-applet" - "openssh" "ntp" "tor" - "linux-libre" "grub-hybrid" - "icecat")) + "openssh" "tor" "ntp" "gpm" + "connman" "network-manager" "wpa-supplicant" "isc-dhcp" "= cups" + "linux-libre" "grub-hybrid")) + ;; Additional key packages we want to make sure are available + (map specification->package + '("emacs" "icecat" "libreoffice" "vim")) %default-xorg-modules)) =20 (define %packages-to-cross-build @@ -84,11 +89,12 @@ (define %packages-to-cross-build (append (list (@ (gnu packages guile) guile-3.0/pinned)) (map specification->package '("coreutils" "grep" "sed" "findutils" "diffutils" "patch" - "gawk" "gettext" "gzip" "xz" + "gawk" "gettext" "gzip" "xz" "zstd" "git-minimal" "hello" "zlib")))) =20 (define %packages-to-cross-build-for-mingw - ;; Many things don't build for MinGW. Restrict to what's known to work. + ;; Many things don't build for MinGW. Restrict to what's known to work + ;; to test that the cross-compiler itself works. (map specification->package '("hello"))) =20 (define %cross-bootstrap-targets @@ -107,14 +113,10 @@ (define %base-manifest (manifest (append-map (lambda (system) (map (cut package->manifest-entry* <> system) - (cond ((string=3D? system "i586-gnu") + (cond ((target-hurd? system) %base-packages/hurd) - ((string=3D? system "armhf-linux") + ((target-arm32? system) %base-packages/armhf) - ((string=3D? system "powerpc64le-linux") - ;; FIXME: Drop 'bootstrap-tarballs' until - ;; <https://bugs.gnu.org/48055> is fixed. - (drop %base-packages 1)) (else %base-packages)))) %cuirass-supported-systems))) @@ -123,7 +125,7 @@ (define %system-manifest (manifest (append-map (lambda (system) ;; Some of %SYSTEM-PACKAGES are currently unsupported on = some - ;; systems--e.g., GNOME on non-x86_64, due to Rust. Filt= er + ;; systems--e.g., GNOME on 32-bit, due to Rust. Filter ;; them out. (filter-map (lambda (package) (and (supported-package? package system) @@ -131,6 +133,8 @@ (define %system-manifest %system-packages)) '("x86_64-linux" "i686-linux")))) ;Guix System =20 +;; As per the Guix Survey of 2024 we only worry about cross compiling from +;; x86_64-linux (98% of users) and not from others (aarch64 with 19%). (define %cross-manifest (manifest (append-map (lambda (target) @@ -153,12 +157,7 @@ (define %cross-manifest ;; Ignore bare-metal targets. "avr" "or1k-elf" - "xtensa-ath9k-elf" - - ;; XXX: Important bits like libsigsegv and libffi d= on't - ;; support RISCV at the moment, so don't require RI= SCV - ;; support. - "riscv64-linux-gnu"))))) + "xtensa-ath9k-elf"))))) =20 (define %cross-bootstrap-manifest (manifest @@ -168,7 +167,7 @@ (define %cross-bootstrap-manifest "x86_64-linux" #:target target)) %cross-bootstrap-targets))) =20 -;; Return the union of all three manifests. +;; Return the union of all four manifests. (concatenate-manifests (list %base-manifest %system-manifest %cross-manifest --=20 Efraim Flashner <efraim@HIDDEN> =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --oRm+CSHuT8T/Uo6D Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0003-etc-Add-installer-manifest.patch" Content-Transfer-Encoding: quoted-printable =46rom 136a425368c9707e3097f7c57adb809d24a6689c Mon Sep 17 00:00:00 2001 Message-ID: <136a425368c9707e3097f7c57adb809d24a6689c.1738851574.git.efraim= @flashner.co.il> In-Reply-To: <cover.1738851574.git.efraim@HIDDEN> References: <cover.1738851574.git.efraim@HIDDEN> =46rom: Efraim Flashner <efraim@HIDDEN> Date: Thu, 6 Feb 2025 16:12:16 +0200 Subject: [PATCH 3/4] etc: Add installer manifest. * etc/manifests/installer.scm: New file. * Makefile.am (GUIX_SYSTEM_SUPPORTED_SYSTEMS): Rename to GUIX_SYSTEM_INSTALLER_SYSTEMS. (assert-binaries-available): Check for substitutes using the installer manifest. Change-Id: I5c15e6916583bcd56e535733f284f3a735d7600b --- Makefile.am | 13 +++-- etc/manifests/installer.scm | 112 ++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 6 deletions(-) create mode 100644 etc/manifests/installer.scm diff --git a/Makefile.am b/Makefile.am index ad8bb907515..f2a5bcf5f7b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1076,8 +1076,9 @@ SUPPORTED_SYSTEMS ?=3D x86_64-linux i686-linux armhf-= linux aarch64-linux \ BINARY_TARBALLS =3D \ $(foreach system,$(SUPPORTED_SYSTEMS),guix-binary.$(system).tar.xz) =20 -# Systems supported by Guix System. -GUIX_SYSTEM_SUPPORTED_SYSTEMS ?=3D x86_64-linux i686-linux +# Systems supported by the Guix System installer. +# A Hurd install happens from a Linux installer image. +GUIX_SYSTEM_INSTALLER_SYSTEMS ?=3D x86_64-linux i686-linux =20 # Systems for which we build Guix VMs. GUIX_SYSTEM_VM_SYSTEMS ?=3D x86_64-linux @@ -1138,10 +1139,10 @@ release: dist-with-updated-version all # Build 'current-guix' to speed things up for the next step. $(top_builddir)/pre-inst-env guix build \ -e '((@ (gnu packages package-management) current-guix))' \ - $(call system_flags,$(GUIX_SYSTEM_SUPPORTED_SYSTEMS)) \ + $(call system_flags,$(GUIX_SYSTEM_INSTALLER_SYSTEMS)) \ -v1 --no-grafts --fallback # Generate the ISO installation images. - for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do \ + for system in $(GUIX_SYSTEM_INSTALLER_SYSTEMS) ; do \ GUIX_DISPLAYED_VERSION=3D"`git describe --match=3Dv* | sed -'es/^v//'`"= ; \ image=3D`$(top_builddir)/pre-inst-env \ guix system image -t iso9660 \ @@ -1205,11 +1206,11 @@ assert-no-store-file-names: exit 1 ; \ fi =20 -# Make sure important substitutes are available. Check only the primary +# Make sure installer substitutes are available. Check only the primary # server so that '--display-missing' doesn't print two lists. assert-binaries-available: $(GOBJECTS) $(AM_V_at)$(top_builddir)/pre-inst-env \ - guix weather -m "$(top_srcdir)/etc/manifests/release.scm" \ + guix weather -m "$(top_srcdir)/etc/manifests/installer.scm" \ --substitute-urls=3D"https://ci.guix.gnu.org" \ --display-missing =20 diff --git a/etc/manifests/installer.scm b/etc/manifests/installer.scm new file mode 100644 index 00000000000..264cb4bab8e --- /dev/null +++ b/etc/manifests/installer.scm @@ -0,0 +1,112 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2020, 2021 Ludovic Court=C3=A8s <ludo@HIDDEN> +;;; Copyright =C2=A9 2020 Jan (janneke) Nieuwenhuizen <janneke@HIDDEN> +;;; Copyright =C2=A9 2025 Efraim Flashner <efraim@HIDDEN> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. + +;;; This file returns a manifest containing packages which are needed by t= he +;;; installer. + +(use-modules (gnu packages) + (guix packages) + (guix profiles) + ((guix platform) #:select (targets)) + ((gnu services xorg) #:select (%default-xorg-modules)) + ((gnu system) #:select (%base-packages %base-packages-linux)) + (guix utils) + (guix gexp) + (srfi srfi-1) + (srfi srfi-26)) + +(define* (package->manifest-entry* package system + #:key target) + "Return a manifest entry for PACKAGE on SYSTEM, optionally cross-compile= d to +TARGET." + (manifest-entry + (inherit (package->manifest-entry package)) + (name (string-append (package-name package) "." system + (if target + (string-append "." target) + "'"))) + (item (with-parameters ((%current-system system) + (%current-target-system target)) + package)))) + +(define %guix-system-installer-systems + ;; Only the systems listed in GUIX_SYSTEM_INSTALLER_SYSTEMS + '("x86_64-linux" "i686-linux" + ;; These would be installed from their Linux counterparts: + ;"x86_64-gnu" "i586-gnu" + ;; Not actually for the installer, but needs the same packages anyway. + "aarch64-linux")) + +(define %base-packages/hurd + ;; Remove the packages from %base-packages-linux and some of the packages + ;; from the other package sets. + (fold delete %base-packages + (append (map specification->package + '("e2fsprogs" "kbd" "iproute2" "iw" "wireless-tools")) + %base-packages-linux))) + +(define %system-packages + ;; Key packages proposed by the Guix System installer. + (append (map specification->package + '("gnome" "xfce" "mate" "enlightenment" + "openbox" "awesome" + "i3-wm" "i3status" "dmenu" "st" + "ratpoison" "xterm" + "emacs" "emacs-exwm" "emacs-desktop-environment" + "openssh" "tor" "ntp" "gpm" + "connman" "network-manager" "wpa-supplicant" "isc-dhcp" "= cups" + "linux-libre" "grub-hybrid")) + %default-xorg-modules)) + +=0C +;;; +;;; Manifests. +;;; + +(define %base-manifest + (manifest + (append-map (lambda (system) + (map (cut package->manifest-entry* <> system) + (cond ((target-hurd? system) + %base-packages/hurd) + (else + %base-packages)))) + %guix-system-installer-systems))) + +(define %system-manifest + (manifest + (cons + ;; linux-libre-arm64-generic is the commonly used kernel on aarch64-= linux. + (package->manifest-entry* (@ (gnu packages linux) + linux-libre-arm64-generic) + "aarch64-linux") + (append-map (lambda (system) + ;; Some of %SYSTEM-PACKAGES are currently unsupported = on some + ;; systems--e.g., GNOME on 32-bit, due to Rust. Filter + ;; them out. + (filter-map (lambda (package) + (and (supported-package? package system) + (package->manifest-entry* package s= ystem))) + %system-packages)) + %guix-system-installer-systems)))) + +;; Return the union of all installer manifests. +(concatenate-manifests (list %base-manifest + %system-manifest)) --=20 Efraim Flashner <efraim@HIDDEN> =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --oRm+CSHuT8T/Uo6D Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0004-etc-Add-cross-compile-manifest.patch" Content-Transfer-Encoding: quoted-printable =46rom 1a5c694d0b22eaf82b823d7264fae1c6c2ecfb60 Mon Sep 17 00:00:00 2001 Message-ID: <1a5c694d0b22eaf82b823d7264fae1c6c2ecfb60.1738851574.git.efraim= @flashner.co.il> In-Reply-To: <cover.1738851574.git.efraim@HIDDEN> References: <cover.1738851574.git.efraim@HIDDEN> =46rom: Efraim Flashner <efraim@HIDDEN> Date: Thu, 6 Feb 2025 16:14:31 +0200 Subject: [PATCH 4/4] etc: Add cross-compile manifest. * etc/manifests/cross-compile.scm: New file. Change-Id: I63ac4014617e8d716c508a04c6da553e36a99fec --- etc/manifests/cross-compile.scm | 167 ++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) create mode 100644 etc/manifests/cross-compile.scm diff --git a/etc/manifests/cross-compile.scm b/etc/manifests/cross-compile.= scm new file mode 100644 index 00000000000..8754f325564 --- /dev/null +++ b/etc/manifests/cross-compile.scm @@ -0,0 +1,167 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2020-2022, 2024 Ludovic Court=C3=A8s <ludo@HIDDEN> +;;; Copyright =C2=A9 2020 Jan (janneke) Nieuwenhuizen <janneke@HIDDEN> +;;; Copyright =C2=A9 2023 Andreas Enge <andreas@HIDDEN> +;;; Copyright =C2=A9 2025 Efraim Flashner <efraim@HIDDEN> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. + +;;; This file returns a manifest containing packages which should all cros= s-compile. +;;; We use the packages included by default in an OS configuration since t= hat is +;;; (probably) the most likely install method for some architectures. + +(use-modules (gnu packages) + (guix packages) + (guix profiles) + (guix platform) + ((gnu services xorg) #:select (%default-xorg-modules)) + ((gnu system) #:prefix gnu-system: + #:select (%base-packages %base-packages-linux)) + (guix utils) + (guix gexp) + (srfi srfi-1) + (srfi srfi-26)) + +(define* (package->manifest-entry* package system + #:key target) + "Return a manifest entry for PACKAGE on SYSTEM, optionally cross-compile= d to +TARGET." + (manifest-entry + (inherit (package->manifest-entry package)) + (name (string-append (package-name package) "." system + (if target + (string-append "." target) + "'"))) + (item (with-parameters ((%current-system system) + (%current-target-system target)) + package)))) + +(define %base-packages + ;; Packages that must be substitutable on all the platforms Guix support= s. + ;; Use the %base-packages from (gnu system) since they are included by d= efault + ;; in the packages field of the operating system configuration. + gnu-system:%base-packages) + +(define %base-packages/hurd + ;; Remove the packages from %base-packages-linux and some of the packages + ;; from the other package sets. + (fold delete %base-packages + (append (map specification->package + '("e2fsprogs" "kbd" "iproute2" "iw" "wireless-tools")) + %base-packages-linux))) + +(define %system-packages + ;; Key packages proposed by the Guix System installer. + (map specification->package + '("guix" "openssh" "tor" "ntp" "gpm" + "connman" "network-manager" "wpa-supplicant" "isc-dhcp" "cups" + "linux-libre" "grub-hybrid"))) + +(define %system-gui-packages + ;; Key packages proposed by the Guix System installer. + (append (map specification->package + '("enlightenment" + ;; build system `python' does not support cross builds + ;"gnome" "xfce" "mate" "openbox" + "awesome" + "i3-wm" "i3status" "dmenu" "st" + "ratpoison" "xterm" + ;; build system `emacs' does not support cross builds + ;"emacs-exwm" "emacs-desktop-environment" + "emacs")) + %default-xorg-modules)) + +(define %packages-to-cross-build + ;; Packages that must be cross-buildable from x86_64-linux. + ;; FIXME: Add (@ (gnu packages gcc) gcc) when <https://bugs.gnu.org/4046= 3> + ;; is fixed. + (append (list (@ (gnu packages guile) guile-3.0/pinned)) + (map specification->package + '("coreutils" "grep" "sed" "findutils" "diffutils" "patch" + "gawk" "gettext" "gzip" "xz" "zstd" + "hello" "zlib")))) + +(define %packages-to-cross-build-for-mingw + ;; Many things don't build for MinGW. Restrict to what's known to work + ;; to test that the cross-compiler itself works. + (map specification->package '("hello"))) + +=0C +;;; +;;; Manifests. +;;; + +;; As per the Guix Survey of 2024 we only worry about cross compiling from +;; x86_64-linux (98% of users) and not from others (aarch64 with 19%). +(define %cross-manifest + (manifest + (append-map (lambda (target) + (map (cut package->manifest-entry* <> "x86_64-linux" + #:target target) + (if (target-mingw? target) + %packages-to-cross-build-for-mingw + %packages-to-cross-build))) + (fold delete (targets) + '(;; Disable cross-compilation to self: + "x86_64-linux-gnu" + + ;; mips64el commonly targets a different architect= ure + ;; revision than we targeted in Guix. + "mips64el-linux-gnu" + + ;; Ignore bare-metal targets. + "avr" + "or1k-elf" + "xtensa-ath9k-elf"))))) + +(define %cross-system + (manifest + (cons* + ;; Include a couple of extra kernels that are commonly used: + (package->manifest-entry* (@ (gnu packages linux) + linux-libre-arm64-generic) + "x86_64-linux" + #:target "aarch64-linux-gnu") + (package->manifest-entry* (@ (gnu packages linux) + linux-libre-arm-generic) + "x86_64-linux" + #:target "arm-linux-gnueabihf") + (package->manifest-entry* (@ (gnu packages linux) + linux-libre-riscv64-generic) + "x86_64-linux" + #:target "riscv64-linux-gnu") + (append-map (lambda (target) + (map (cut package->manifest-entry* <> "x86_64-linux" + #:target target) + (cond + ;; With a graphical environment: + ((or (target-x86-32? target) + (target-aarch64? target)) + (append %base-packages + %system-packages + %system-gui-packages)) + (else (append %base-packages %system-packages))= ))) + (fold delete (map platform-system->target (systems)) + '(;; Disable cross-compilation to self: + "x86_64-linux-gnu" + + ;; Ignore obsolete systems, as in (gnu ci). + "mips64el-linux-gnu" + "powerpc-linux-gnu")))))) + +;; Return the union of all the manifests. +(concatenate-manifests (list %cross-manifest + %cross-system)) --=20 Efraim Flashner <efraim@HIDDEN> =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --oRm+CSHuT8T/Uo6D-- --E9+8/CgW8JTZ7rXl Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmerOqcACgkQQarn3Mo9 g1EwCQ//VR1JQLrE0YvvuBSwLjK35bjlzjyxDFXUPFg5JNjCl4QESFKUlkccVHx5 LrPn2Wsuupwyz3iDFEY5DkgN1G9MXrsbQ543c0PON+Qmc06S/zzM17X4dXuDAd2G 3F3CPZKtrmXPvM0hC8F/3yjag0IYdQD9coBpJySlSTwx2wnEEnyCAqb/f4TVtl+R ithoic89z6W2p3JdpbOKmas/cJZSjiASdxP9eBOAudZLTjprn7chs1ZtmI1VQaPo Zpu2p4PiJtOPDn4mYJzMqjAQ6JNkb1SYjSL3zTQ90Fja0aaKoWIbkabJ1LtldYE8 ghkFW0q2OvVf1zn4bE+1Zx0PaJ8xjfwGy1uvbDywgzd6nCkZwke13BUr8ns7nui2 iCNWEMQTCsIVqeQ9jL6NCKaZBP8s4+ci69vWsT2dvkifTDJwmo9bOLrz30eH2Ft6 zhvap9rETkDbTAg1tDm8XwpT20ST/zv8yJpBGpxoOGfVs3P6g+uwaKZKRhq9lY4c vkeyn3hpBdy/ug8ZcVFlS6LnbvOeBR7bj8Q+zDDjCXvBqTVlYuhbks7ckHnrm7c8 eg0FhrWieau8ehBO/BvYO5N1AbNHRVIxkpPzvvUn0/sm80ybVGpsoy30gFM/+UEJ OrdQSs4cgZC1Fth03JFiYmkY7dMPYPnvOA07/PIeO8thkiEhXNE= =IMh0 -----END PGP SIGNATURE----- --E9+8/CgW8JTZ7rXl--
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] [PATCH 0/4] Patches towards a release Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Wed, 12 Feb 2025 09:39:02 +0000 Resent-Message-ID: <handler.76098.B76098.173935310031689 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Efraim Flashner <efraim@HIDDEN> Cc: 76098 <at> debbugs.gnu.org Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.173935310031689 (code B ref 76098); Wed, 12 Feb 2025 09:39:02 +0000 Received: (at 76098) by debbugs.gnu.org; 12 Feb 2025 09:38:20 +0000 Received: from localhost ([127.0.0.1]:60936 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1ti9CG-0008F3-8t for submit <at> debbugs.gnu.org; Wed, 12 Feb 2025 04:38:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53750) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1ti9CC-0008Em-Jo for 76098 <at> debbugs.gnu.org; Wed, 12 Feb 2025 04:38:18 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1ti9C6-00038B-Ng; Wed, 12 Feb 2025 04:38:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=ChAUexNMdCu1AYP3ZcR4So5tsh6FCHhxPL8P0HeH01I=; b=EQx9PbFG5vfo+H/ginj6 cT0nXD8KSXWy/jxFft0V+E2te/AzSaAr9yVNXks+9hDpa8MyKGXEHllr2xTRcc+e/2o7RmrRANJVG x2zm+wIMvs2T8O9M/lzgaS6JoxlUPKXrUhS/pGXP3raZ97XmsizliEWTX5S5hMdUUx4oeZO99TLAX F7LHfVPgie5Cg/3Q214a4De0od4xdNSr8bSO5+sgVQP6WmnWUZn8RU4Hoj5/DwE7CbJllDC9dPcPw 3anoSHr7vD5JCGBDue18xuRzTnbbIOPXFCamAT/FihPdcyV10gZTH+eDPbFonBrgTtDBJeoN4lSyY XCaeXKFeAxpwNg==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN> In-Reply-To: <cover.1738851574.git.efraim@HIDDEN> (Efraim Flashner's message of "Thu, 6 Feb 2025 16:34:11 +0200") References: <cover.1738851574.git.efraim@HIDDEN> Date: Wed, 12 Feb 2025 10:38:06 +0100 Message-ID: <878qqb8pvl.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hello Efraim, Thanks for leading this effort! Efraim Flashner <efraim@HIDDEN> skribis: > In the Makefile: > * Added riscv64-linux as a supported system One issue is that ci.guix, which is responsible for building release artifacts (tarballs and ISOs), doesn=E2=80=99t build for riscv64-linux nor = for armhf-linux actually. One way would be to add riscv64 and aarch64/armv7 hardware behind ci.guix; another way would be to get bordeaux.guix to build these. > * switch the assert-binaries-available make target we've used previously > to make sure we have substitutes for a base set of packages to point > to the installer manifest. If the purpose of the installer is to > install and then everyone expected to run `guix pull` then we need the > packages from the installer. That was the purpose of =E2=80=98release.scm=E2=80=99. Perhaps instead of = having an unused =E2=80=98release.scm=E2=80=99, just make it what you currently have = in =E2=80=98installer.scm=E2=80=99? > installer.scm: > A manifest which only checks that we have substitutes for what can be > installed using the TUI installer (assuming no extra added items). It > differs from the GUIX_SYSTEM_INSTALLER_SYSTEM variable in the Makefile > by including aarch64 as an architecture. Ideally all the packages > should compile, which would allow someone to run the installer > successfully for x86_64-linux, i686-linux or aarch64-linux. > > cross-compile.scm: > Ideally all the packages one would need to produce an OS image for > another architecture we support, or the same %base-packages for other > architectures we have. Currently it only tests from x86_64-linux. =E2=80=98release.scm=E2=80=99 was lumping all that together, but maybe it= =E2=80=99s more convenient to separate it as you did, indeed. > Ideally I'd like to see the installer.scm and cross-compile.scm > manifests added to cuirass. I'd hope we could keep 100% build on > installer.scm so we can actually offer all the options in the installer, > and the cross-compile.scm manifest might need to be split so we can > focus on cross-compiling an OS config vs cross-compiling binaries for > another architecture. We can definitely add them to Cuirass. Thanks, Ludo=E2=80=99.
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] The next release Resent-From: Vagrant Cascadian <vagrant@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sun, 16 Feb 2025 00:37:01 +0000 Resent-Message-ID: <handler.76098.B76098.173966617515159 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Efraim Flashner <efraim@HIDDEN>, guix-devel@HIDDEN Cc: 76098 <at> debbugs.gnu.org Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.173966617515159 (code B ref 76098); Sun, 16 Feb 2025 00:37:01 +0000 Received: (at 76098) by debbugs.gnu.org; 16 Feb 2025 00:36:15 +0000 Received: from localhost ([127.0.0.1]:58658 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tjSdq-0003wR-Ok for submit <at> debbugs.gnu.org; Sat, 15 Feb 2025 19:36:14 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:50818) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <vagrant@HIDDEN>) id 1tjSdm-0003va-Fm for 76098 <at> debbugs.gnu.org; Sat, 15 Feb 2025 19:36:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1739666164; bh=Eof4JCNRj3I1Luy+TXYReSDuxmfL9b404A9hYXPZTtE=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=O8FNw0XDZlecW46S8DZMuHjmbPxvozT49/7/vurh26hm1q2FI04wG+Z67KxY4WewZ wYlG1wnuYYW0onSyxPlgFxNHziY9uc3Ftxql4+1tVkqRPLhmHju9VCUZ7CGDTzy0sy 0XkgKpmAC4ptR6KzBv4j10YAXadwwuDkBJG1UnjBcwhDNHnY2Oy95ETWtq2CmUwDxc uiEqTj3feSBE7heahMDQhs6TY2qXNBy6RD6hIVeZNzAIqFICujHlNQzXbsj3WYGItk LlLXTQ3FhqhNQUurUyE532U9IszrsyDDEfIQbm7/MePY7qDHKHtnxTGPQvOB/zIGc7 5TBD5AV6HViDw== Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) by cascadia.aikidev.net (Postfix) with ESMTPSA id 707CB2F46; Sat, 15 Feb 2025 16:36:04 -0800 (PST) From: Vagrant Cascadian <vagrant@HIDDEN> In-Reply-To: <Z6s6qzMesCT7kuyS@3900XT> References: <Z6s6qzMesCT7kuyS@3900XT> Date: Sat, 15 Feb 2025 16:35:40 -0800 Message-ID: <87o6z2afqb.fsf@wireframe> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain On 2025-02-11, Efraim Flashner wrote: > We discussed the next release during Guix Days and I volunteered to lead > the effort. Thanks for working on it! > The short version: > > * We need a tagged release so we can update the version in Debian and > other distros, in CI systems, etc. Unless this happens very, very quickly(e.g. a week or two?), I am not sure we will have this in time for Debian, which is about to enter freeze for preparing the next release of Debian... I may just make an attempt at making a git snapshot or something, which I did once in the distant past... any recommendations on a particular commit to aim at? Even an alpha or release candidate or whatever tag would be nice... live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZ7Ey3AAKCRDcUY/If5cW qiQ/AQCHNh7SikEz1QtMZCWX2ABt1CYN5wsc9CdHS5CbSfeWKAD/aIQ9366awxkX ROVE0Nmm9hP105pX0Xvc+62G9l9bcw0= =AiVJ -----END PGP SIGNATURE----- --=-=-=--
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] The next release Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sun, 16 Feb 2025 15:58:01 +0000 Resent-Message-ID: <handler.76098.B76098.173972145323249 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: guix-devel@HIDDEN Cc: 76098 <at> debbugs.gnu.org Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.173972145323249 (code B ref 76098); Sun, 16 Feb 2025 15:58:01 +0000 Received: (at 76098) by debbugs.gnu.org; 16 Feb 2025 15:57:33 +0000 Received: from localhost ([127.0.0.1]:36452 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tjh1R-00062v-0O for submit <at> debbugs.gnu.org; Sun, 16 Feb 2025 10:57:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55854) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1tjh1O-00062h-7W for 76098 <at> debbugs.gnu.org; Sun, 16 Feb 2025 10:57:30 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1tjh1I-0002js-Sr; Sun, 16 Feb 2025 10:57:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=6lxc/NPOP+Z56TLZUQpWi6O/+wthNtp9g2HG5NyNAZM=; b=leHJbLtig6r8yPgTnh51 tbKGGyTA+qI0WURnTTmUMRJDg675/3ifG2dvLo57NUupX6fTTzwS5uDvs2lFdBxWwyseaaSdb7i5N XcAG1BXX1t+PFdrik+QZOy8wjADHflgplPdRNC3/AmiwlmQ5uJzDASJfnEr+hMgHCI72P9fD+tsLC mSJsPHfS+T2uYEuxEsVuMTmNGjdDUl0EAQoOEzMbAg4uXShVpzD/REqBuTsDXeG3DcakMmy56o9SA BPV6rEoaoAanaedamc+TRE74GG7I/irI3QaTxEBARA4t5jSaWjzZae7AEt0Ds0pYwAlek2hoSsto8 7j/fSwGrFlxapw==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN> In-Reply-To: <Z6s6qzMesCT7kuyS@3900XT> (Efraim Flashner's message of "Tue, 11 Feb 2025 13:55:23 +0200") References: <Z6s6qzMesCT7kuyS@3900XT> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Octidi 28 =?UTF-8?Q?Pluvi=C3=B4se?= an 233 de la =?UTF-8?Q?R=C3=A9volution,?= jour du Cyclamen X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sun, 16 Feb 2025 16:57:19 +0100 Message-ID: <874j0tvq5c.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hi Efraim, Efraim Flashner <efraim@HIDDEN> skribis: > The short version: > > * We need a tagged release so we can update the version in Debian and > other distros, in CI systems, etc. > * We need a newer point-in-time for the installer. > * A new release increases interest in the project. Thanks a lot for getting the ball rolling! One thing we discussed in Brussels is the need for more automation so that pretty much anyone can make a release without having special privileges and without spending an entire day building release artifacts. The main blocker is the two-step process with the =E2=80=98guix=E2=80=99 pa= ckage update. We briefly discussed the use of =E2=80=98current-guix=E2=80=99 as a way to = bypass that. (gnu services install) already uses it for the installer itself; the next step would be to use it in the installed image and thus, possibly, unconditionally. The main reason why this is not done currently is that it=E2=80=99s too expensive (equivalent to =E2=80=98guix pull=E2=80=99), but= we could probably address that. I=E2=80=99m willing to give a hand in this area over the coming weeks. Thanks, Ludo=E2=80=99.
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] The next release Resent-From: Andreas Enge <andreas@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Mon, 17 Feb 2025 13:50:02 +0000 Resent-Message-ID: <handler.76098.B76098.173980015823714 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: guix-devel@HIDDEN, 76098 <at> debbugs.gnu.org Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.173980015823714 (code B ref 76098); Mon, 17 Feb 2025 13:50:02 +0000 Received: (at 76098) by debbugs.gnu.org; 17 Feb 2025 13:49:18 +0000 Received: from localhost ([127.0.0.1]:44739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tk1Us-0006AQ-5g for submit <at> debbugs.gnu.org; Mon, 17 Feb 2025 08:49:18 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:43978) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <andreas@HIDDEN>) id 1tk1Up-00069u-SJ for 76098 <at> debbugs.gnu.org; Mon, 17 Feb 2025 08:49:16 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id DA3A9647; Mon, 17 Feb 2025 14:49:09 +0100 (CET) Authentication-Results: hera.aquilenet.fr; none X-Virus-Scanned: Debian amavis at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavis, port 10024) with ESMTP id uqVYXQHiSWKc; Mon, 17 Feb 2025 14:49:09 +0100 (CET) Received: from jurong (176-179-191-150.abo.bbox.fr [176.179.191.150]) by hera.aquilenet.fr (Postfix) with ESMTPSA id D6CF0602; Mon, 17 Feb 2025 14:49:06 +0100 (CET) Date: Mon, 17 Feb 2025 14:48:59 +0100 From: Andreas Enge <andreas@HIDDEN> Message-ID: <Z7M-S6dbrPFKYhWj@jurong> References: <Z6s6qzMesCT7kuyS@3900XT> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <Z6s6qzMesCT7kuyS@3900XT> X-Rspamd-Server: hera X-Spamd-Bar: ++++++++ X-Rspamd-Queue-Id: DA3A9647 X-Spamd-Result: default: False [8.38 / 15.00]; SPAM_FLAG(5.00)[]; NEURAL_SPAM(3.00)[1.000]; MID_RHS_NOT_FQDN(0.50)[]; MIME_GOOD(-0.10)[text/plain]; BAYES_HAM(-0.02)[54.66%]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; TO_DN_NONE(0.00)[]; ARC_NA(0.00)[] X-Spam-Level: ******** X-Rspamd-Action: add header X-Spam: Yes X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hello, I think something we need to do urgently is to run an ungrafting process - grafting takes a considerable amount of time when updating my system now, and I suppose it will also waste a bit of space. We should not burden the installation process with it. Did we not have a jobset on ci to automate this? As said in Brussels, I would be happy to test a new installation image on a further x86_64 I would like to get running Guix. Andreas
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] make dist and related fun (was: The next release) Resent-From: Vagrant Cascadian <vagrant@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Wed, 19 Feb 2025 22:08:02 +0000 Resent-Message-ID: <handler.76098.B76098.174000282711304 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Efraim Flashner <efraim@HIDDEN>, guix-devel@HIDDEN Cc: 76098 <at> debbugs.gnu.org Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.174000282711304 (code B ref 76098); Wed, 19 Feb 2025 22:08:02 +0000 Received: (at 76098) by debbugs.gnu.org; 19 Feb 2025 22:07:07 +0000 Received: from localhost ([127.0.0.1]:53754 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tksDi-0002wG-F1 for submit <at> debbugs.gnu.org; Wed, 19 Feb 2025 17:07:06 -0500 Received: from cascadia.aikidev.net ([2600:3c01:e000:267:0:a171:de7:c]:47702) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <vagrant@HIDDEN>) id 1tksDd-0002un-2G for 76098 <at> debbugs.gnu.org; Wed, 19 Feb 2025 17:07:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1740002813; bh=A8kMOJMX3hocaubzkJjXzkV0uTCx2HVCTNFSNWPWjgk=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=Zd1DCM02tucwXbXRLqBCIMWu6b/AScBWG7J+F+hYkA3jsdDhpMO4jGfyVSihTnOHW /YcvvFoK7wi9sxSaiWDLBHuk1DpmAruYEr5HbGA9EtunOX5ykoFXNDpG0aLKUOwcR7 wHil9B9E3wCRnWA/fhniZrnEMi+gbVDE2bLhPNT0gRxtp+dWMH7QqIBACftuvWi8N+ n5V/d0vxvAQszHAts5IyYTu/NU/vduodp54fvm2kJ1Gw4M6efOuhc4Biv+X1jJjJfs YHPGcy75EGrtd3y9E7p8CQeL6hFkV8TDqvbP2dW8Y+Js1nuZ8MWNS+jIXsOn983rSa sqAf/KtxVtgBQ== Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) by cascadia.aikidev.net (Postfix) with ESMTPSA id 55E8D57A9; Wed, 19 Feb 2025 14:06:53 -0800 (PST) From: Vagrant Cascadian <vagrant@HIDDEN> In-Reply-To: <87o6z2afqb.fsf@wireframe> References: <Z6s6qzMesCT7kuyS@3900XT> <87o6z2afqb.fsf@wireframe> Date: Wed, 19 Feb 2025 14:06:43 -0800 Message-ID: <878qq1a8ss.fsf@wireframe> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain On 2025-02-15, Vagrant Cascadian wrote: > On 2025-02-11, Efraim Flashner wrote: >> We discussed the next release during Guix Days and I volunteered to lead >> the effort. ... > I may just make an attempt at making a git snapshot or something, which > I did once in the distant past... any recommendations on a particular > commit to aim at? Even an alpha or release candidate or whatever tag > would be nice... So, in order to try this, the first thing I needed to do was remember how to run "make dist" to generate the tarball... Basically from a clean git checkout: guix git tag v1.4.0+XYZ HEAD # I used f7cd085f4a36e118aa05af5524e74830a30b3dca guix git authenticate && \ guix shell --container --pure --development guix guix git imagemagick perl graphviz less -- ./bootstrap && \ guix shell --container --pure --development guix guix git imagemagick perl graphviz less -- ./configure && \ guix shell --container --pure --development guix guix git imagemagick perl graphviz less -- make -j1 dist Not sure if that is the "right" way or if there is better documentation... ? Running "make -j5 dist" failed in various ways... so there are probably some undefined dependencies. graphviz was needed otherwise the bootstrap-graph.pdf failed to build (graphviz-minimal gets pulled in by "--development guix" but does not support .pdf generation). The other inputs, well, they're just from the last times I tried running "make dist"! maybe they are no longer needed, maybe the are! The generated tarball also appears to be missing a few files, some of which seem fine (e.g. .gitignore) but some which actually cause problems (e.g. missing po4a.cfg, tests/*.scm, gnu/patches/*.patch), some of which probably should be added to dist_patch_DATA in gnu/local.mk or other relevent values: Only in ../guix-master/build-aux: cuirass Only in ../guix-master/build-aux: gitlog-to-changelog Only in ../guix-master: .editorconfig Only in ../guix-master/etc: copyright.el Only in ../guix-master/etc: git Only in ../guix-master/etc: snippets Only in ../guix-master/etc: teams Only in ../guix-master/etc: teams.scm Only in ../guix-master: .gitattributes Only in ../guix-master: .gitignore Only in ../guix-master/gnu/packages/patches: cyrus-sasl-ac-try-run-fix.patch Only in ../guix-master/gnu/packages/patches: gcc-10-tree-sra-union-handling.patch Only in ../guix-master/gnu/packages/patches: gegl-compatibility-old-librsvg.patch Only in ../guix-master/gnu/packages/patches: go-github-com-skip2-go-qrcode-fix-tests.patch Only in ../guix-master/gnu/packages/patches: librewolf-neuter-locale-download.patch Only in ../guix-master/gnu/packages/patches: openjdk-15-jtask-reproducibility.patch Only in ../guix-master/gnu/packages/patches: python-pytorch-for-r-torch-fix-codegen.patch Only in ../guix-master/gnu/packages/patches: python-pytorch-for-r-torch-system-libraries.patch Only in ../guix-master/gnu/packages/patches: rdkit-unbundle-external-dependencies.patch Only in ../guix-master/gnu/packages/patches: tinydir-fix-cbehave-test.patch Only in ../guix-master/gnu/system/examples: bare-hurd64.tmpl Only in ../guix-master/gnu/system/examples: devel-hurd64.tmpl Only in ../guix-master/gnu/system/examples: devel-hurd.tmpl Only in ../guix-master/gnu/tests: lightdm.scm Only in ../guix-master/gnu/tests: sddm.scm Only in ../guix-master: .mailmap Only in ../guix-master: .mumi Only in ../guix-master/nix: .gitignore Only in ../guix-master/nix/libstore: .gitignore Only in ../guix-master: .patman Only in ../guix-master/po/doc: po4a.cfg Only in ../guix-master/tests: hexpm.scm Only in ../guix-master/tests: ipfs.scm I also fixed a bunch of typos, spelling, grammar, etc. that my workflow building Guix in Debian detects in various package synopsis/descriptions, and seem to have inspired others to do the same! :) In this process I also found a bug that caused "make dist" to fail due to embedded store paths, and pushed a fix to guix.git as 0626f567378cf549fd097f3c3372fa498000a8a3. Also, in reviewing the copyright and license headers while packaging for Debian, this raised a broader question about translating license headers in files such as doc/guix.de.info: https://salsa.debian.org/debian/guix/-/blob/debian/latest/doc/guix.de.info#L93 With my limited german, it is clearly a header to declare the file is released under the GFDL in some form, but I wonder if that is a good idea to translate the license headers ... as at least in the US, in order to ship that file I would maybe need to at least consult with a lawyer (the US only recognizes English for legal documents), and I suspect various other countries might need something similar for arbitrary languages... having to get a lawyer involved kind of kills the joy of free software and the goal of free distribution... This of course touches on some awful issues around language imperialism. :/ live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZ7ZV8wAKCRDcUY/If5cW qlI6AQCP0EKn38zBHzS6VACM8s8/xLhV8pCBvG0eCT39S5q7OAEAyE1wMfl+XPZJ wFVLGIhz1qCkl1Jwxw6A4xm9oai7sgk= =vl/Q -----END PGP SIGNATURE----- --=-=-=--
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] make dist and related fun Resent-From: Ian Eure <ian@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 20 Feb 2025 03:43:01 +0000 Resent-Message-ID: <handler.76098.B76098.174002293227915 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Vagrant Cascadian <vagrant@HIDDEN> Cc: guix-devel@HIDDEN, 76098 <at> debbugs.gnu.org, Efraim Flashner <efraim@HIDDEN> Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.174002293227915 (code B ref 76098); Thu, 20 Feb 2025 03:43:01 +0000 Received: (at 76098) by debbugs.gnu.org; 20 Feb 2025 03:42:12 +0000 Received: from localhost ([127.0.0.1]:57092 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tkxRz-0007G8-Db for submit <at> debbugs.gnu.org; Wed, 19 Feb 2025 22:42:11 -0500 Received: from fhigh-a6-smtp.messagingengine.com ([103.168.172.157]:44121) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <ian@HIDDEN>) id 1tkxRu-0007FA-QX for 76098 <at> debbugs.gnu.org; Wed, 19 Feb 2025 22:42:09 -0500 Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfhigh.phl.internal (Postfix) with ESMTP id 93D1A11401BA; Wed, 19 Feb 2025 22:42:01 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-06.internal (MEProxy); Wed, 19 Feb 2025 22:42:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1740022921; x=1740109321; bh=TW9sLNql/DseCYZaXktsiCYIJJnmgDX4P1EJlTXxe24=; b= Wrsro3DC4+0lttrCRRcOxCnR1/EdHPz3NEmOXw21lhZlk/3qD9pFjmL1qq0ORlqp vkMcUzFiD2rrObSqg6JCf6VmJRZhE3DKY/D+D3nUmYG9t+hYJwi+0RB3ttCVl79Q p/aQwwoRxUHMn9mwbS4JqR//d4tdjABh7ljai8tgnGiGS3YDjUAMu3xppN8PVvHD YxzZNrngIlNxvoCh+2Bk8y+Xal/6WZFlUXcD8umGHTdZYAGPKyVH472KlftnZ1uo YNn5WjGtq0pTrVMZ6BqifNB0D4qe4owfH6xUchdVg1a3DuCpkX9zZ5tJjc2HKhtl 2HWJt455xda9rDpMDVfYJQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1740022921; x= 1740109321; bh=TW9sLNql/DseCYZaXktsiCYIJJnmgDX4P1EJlTXxe24=; b=y UVUMr9givoJJ5DA80KIuPhYLxCNmrvO9g1/Ylq/dD0QvWyVJjsce9YIEYidgu0Jy SAj+yfEhSylhd5VkQ2P6K2d6edK5CtnKALDKbkcWXJLE7kMjUPyse4I74yfJSxrh mAxcPcqp0AhhH05RvdCK/yTRPVJHCkbegOazU8+ybesDzaekd9kiq+tx2RifCUtE IcBpWhUlRQOa7JcA31jxCfTxT799a/sagRc4UwK8QB4cRTzP75ZziM5q3QOqadUg Wf96Np4MgVvmDtuTKCYkCHWH7giXwxKBGKtNkyap48lMtSEho+eptXprvXtA+RYm zCvc0Jb1ziJeOnNv6ZkYw== X-ME-Sender: <xms:iaS2Z6sMvysbEo4U2mzaEGrjTYI94Q57Wh5_mAykei6m3VsrJRMK_A> <xme:iaS2Z_ciVIU5gZtYS9g-DZ7z0VfaN2V0qrA4yGdpClHFoyRokmNZnMYHM1rZJaolx HjE8uVO3i1vjXYn9g> X-ME-Received: <xmr:iaS2Z1wlUcFeYt3g7qfU-OknixLOk-ya_bhQbK88houm6wTMJmN3dCkUBuGgcnpIqW5Kcvx8rXTUsm1emdvJx6HFfCjlFcFfI4e6WGWQRw> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeiieduudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivg hnthhsucdlqddutddtmdenucfjughrpefhvfevufgjfhgffffkgggtgfesthhqredttder jeenucfhrhhomhepkfgrnhcugfhurhgvuceoihgrnhesrhgvthhrohhsphgvtgdrthhvqe enucggtffrrghtthgvrhhnpeevueelueegudejueekhffhhfelgfejheefffehgfffleek veekuedtgeekleegffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpehirghnsehrvghtrhhoshhpvggtrdhtvhdpnhgspghrtghpthhtohepgedp mhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepjeeitdelkeesuggvsggsuhhgshdrgh hnuhdrohhrghdprhgtphhtthhopehguhhigidquggvvhgvlhesghhnuhdrohhrghdprhgt phhtthhopegvfhhrrghimhesfhhlrghshhhnvghrrdgtohdrihhlpdhrtghpthhtohepvh grghhrrghnthesuggvsghirghnrdhorhhg X-ME-Proxy: <xmx:iaS2Z1P80LTY5SVmnuHCTdYwI7sZpFJHNkKn8rX8ae7_r3Ve3D3_Jw> <xmx:iaS2Z6_FdZI5z_ygpQG5CNHK8y6aTwDoyOI6cTy4wk--HKZNppBfug> <xmx:iaS2Z9UB-6tRXAw4ZE6UGlaSa4SWMp3HKhuc79_Iw0bIBF9phphJug> <xmx:iaS2Zze3fpZdUkg9uSMdEOGc06X7xsrxi7EsGve_wVhEmsl_sS5h7w> <xmx:iaS2Z-ZVBROuTuLoIJ5R7y3vcqZue0ZyPPmZvpAADSXo8TqIIzLEYBTh> Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 19 Feb 2025 22:42:00 -0500 (EST) From: Ian Eure <ian@HIDDEN> In-Reply-To: <878qq1a8ss.fsf@wireframe> (Vagrant Cascadian's message of "Wed, 19 Feb 2025 14:06:43 -0800") References: <Z6s6qzMesCT7kuyS@3900XT> <87o6z2afqb.fsf@wireframe> <878qq1a8ss.fsf@wireframe> User-Agent: mu4e 1.12.8; emacs 29.4 Date: Wed, 19 Feb 2025 19:41:58 -0800 Message-ID: <87pljdgu49.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Hi Vagrant, Vagrant Cascadian <vagrant@HIDDEN> writes: > On 2025-02-15, Vagrant Cascadian wrote: > > The generated tarball also appears to be missing a few files,=20 > some of > which seem fine (e.g. .gitignore) but some which actually cause=20 > problems > (e.g. missing po4a.cfg, tests/*.scm, gnu/patches/*.patch), some=20 > of which > probably should be added to dist_patch_DATA in gnu/local.mk or=20 > other > relevent values: > > Only in ../guix-master/gnu/packages/patches:=20 > librewolf-neuter-locale-download.patch > 135.0.1-1 released today and I=E2=80=99m prepping patches for it, I can=20 include this fix if nobody beats me to it. Can we glob so everything in gnu/packages/patches gets pulled in?=20 It feels odd to maintain a separate list, presumably the patches=20 wouldn=E2=80=99t be in there if something didn=E2=80=99t need them. Thanks, -- Ian
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] make dist and related fun Resent-From: Ian Eure <ian@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 20 Feb 2025 04:04:02 +0000 Resent-Message-ID: <handler.76098.B76098.17400242052032 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Vagrant Cascadian <vagrant@HIDDEN> Cc: guix-devel@HIDDEN, 76098 <at> debbugs.gnu.org, Efraim Flashner <efraim@HIDDEN> Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.17400242052032 (code B ref 76098); Thu, 20 Feb 2025 04:04:02 +0000 Received: (at 76098) by debbugs.gnu.org; 20 Feb 2025 04:03:25 +0000 Received: from localhost ([127.0.0.1]:57192 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tkxmW-0000Wg-VL for submit <at> debbugs.gnu.org; Wed, 19 Feb 2025 23:03:25 -0500 Received: from fhigh-a6-smtp.messagingengine.com ([103.168.172.157]:59245) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <ian@HIDDEN>) id 1tkxmU-0000WM-EC for 76098 <at> debbugs.gnu.org; Wed, 19 Feb 2025 23:03:23 -0500 Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailfhigh.phl.internal (Postfix) with ESMTP id 36C4511401CB; Wed, 19 Feb 2025 23:03:17 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-04.internal (MEProxy); Wed, 19 Feb 2025 23:03:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm2; t=1740024197; x=1740110597; bh=18iCvsKV6X Egy29H/qGWmjzk4hJURlAHF6ulExUkYr8=; b=HYgLLuvBB4gmjX0FY3UUiT4o7r 0kKQziI2K1RfLQWXmdBeE17lbnTfaCWHySFQ8aCpbAKfxdNKCNjLkMMqa4f03Ndr kIDgkjd9EaJVQA1OIGKqI8FVfUMjTJl5arISeAOhpJvZlmCysfDHY6K3VtOreqlT OGSiAzTSGFzcFwrmuq6yFohGVDl4z0LydzRkLbjKpe6NJ4iuvIS1K9Ywiv29j1ye BUQmnwxj08o32n459PT1tURJaaV0bb8Etcnv2SXyKWzZ/51DO01/HZtaFXIPs74+ LyFR4I8eOIc67r2lRAvsRPvTkxXuohQcb1I87x6l+g5j3JiXN436EKuf+NFQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1740024197; x=1740110597; bh=18iCvsKV6XEgy29H/qGWmjzk4hJURlAHF6u lExUkYr8=; b=gVzHDFhUK/gNj402cj5PtpkfmwaWBT8xjGADPz27n6+/TcbHsXx 2UbbXDmor0UV7v0ZdRA9Hfhx8FiSVnZsHEibv04OgCDOaRVzDITz6ivTbuNG8Sdw J7ooHCKVT4CC2dYXGuwtnzBs68n/NcqooCpT6ipcBhemfsSlCNFEw2wztUa8DFHo CGghbndTumFBoiTYfbF6UUHM2JjRan9cFnaDFvHMkVypclFkgeJyJaO06g9fNAYV IavQmH+aCuo9Zw30EGmImUmRqGb6hO367MW7u9RfQRr169qVWtgEsQIU1aD9y20w W3myulRZcGjD7L1qK6f4xzrQwioTKpZENGQ== X-ME-Sender: <xms:hKm2Z2F2I8g0T1p3ZiG-xdZdUF28-HioEGuk4mxAwhdYdzCciF-iLA> <xme:hKm2Z3Wp1poUS2DJAabPpkYjHwN9CA7KXqX92oGgjzAIi0mTnd-US-0jWBlsYjRsT C8YnFaGS13hK4tlxA> X-ME-Received: <xmr:hKm2ZwKd4W5NMEEjI38r-aB6rZLqm5T3XKiHgWpC8QAb0LI59jF8iQv-_EaKBEAX-V_D5H_4syrJbMS_qVPzsS1sGBtBEqSxZwP1UAe7PQ> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeiieduiecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivg hnthhsucdlqddutddtmdenucfjughrpefhvfevufgjfhgffffkgggtsehttdertddtredt necuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrhhoshhpvggtrdhtvheqne cuggftrfgrthhtvghrnhepkeeiudffjeelueeggeelfeehfeeufffgteegvdevtdfgheeh heetheelkeeikeffnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhvpdhnsggprhgtphhtthhopeegpdhm ohguvgepshhmthhpohhuthdprhgtphhtthhopeejiedtleekseguvggssghughhsrdhgnh hurdhorhhgpdhrtghpthhtohepghhuihigqdguvghvvghlsehgnhhurdhorhhgpdhrtghp thhtohepvghfrhgrihhmsehflhgrshhhnhgvrhdrtghordhilhdprhgtphhtthhopehvrg hgrhgrnhhtseguvggsihgrnhdrohhrgh X-ME-Proxy: <xmx:hKm2ZwES26cPs6Xe6JuLtjNawuvxIQCWm5yFoliSNuiPn1zVDL_u5g> <xmx:hKm2Z8VUo_31cPo5fWSKJUO_59WzQYdkv-sKhO-aAYzBk9X3E3EOew> <xmx:hKm2ZzOyNjkCLEek9m94c3m9GrGDqEAQkY3P0H7xfHKdvTrYatdnMA> <xmx:hKm2Zz1DBXRwboMp7i7Sk3Tua4-PqKwS31irTvoVXdD8jENLpbmRkQ> <xmx:ham2Z6wcMyk-V-3sp6ilArzaGbBkl1ojqCJtFanbB-uO5dO7_6nPyPno> Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 19 Feb 2025 23:03:15 -0500 (EST) From: Ian Eure <ian@HIDDEN> In-Reply-To: <878qq1a8ss.fsf@wireframe> (Vagrant Cascadian's message of "Wed, 19 Feb 2025 14:06:43 -0800") References: <Z6s6qzMesCT7kuyS@3900XT> <87o6z2afqb.fsf@wireframe> <878qq1a8ss.fsf@wireframe> User-Agent: mu4e 1.12.8; emacs 29.4 Date: Wed, 19 Feb 2025 20:03:15 -0800 Message-ID: <87jz9lgt4s.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Also, thank you for tackling this! -- Ian
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] [PATCH v2 0/5] Patches towards a release References: <cover.1738851574.git.efraim@HIDDEN> In-Reply-To: <cover.1738851574.git.efraim@HIDDEN> Resent-From: Efraim Flashner <efraim@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 20 Feb 2025 12:42:02 +0000 Resent-Message-ID: <handler.76098.B76098.174005527129764 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76098 <at> debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Efraim Flashner <efraim@HIDDEN> Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.174005527129764 (code B ref 76098); Thu, 20 Feb 2025 12:42:02 +0000 Received: (at 76098) by debbugs.gnu.org; 20 Feb 2025 12:41:11 +0000 Received: from localhost ([127.0.0.1]:33885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tl5ra-0007jz-M2 for submit <at> debbugs.gnu.org; Thu, 20 Feb 2025 07:41:11 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:46392) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <efraim.flashner@HIDDEN>) id 1tl5rX-0007iq-TP for 76098 <at> debbugs.gnu.org; Thu, 20 Feb 2025 07:41:08 -0500 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-38f325ddbc2so624886f8f.1 for <76098 <at> debbugs.gnu.org>; Thu, 20 Feb 2025 04:41:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740055262; x=1740660062; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=DIg+pxzZNeRuLVvWigRFTxl6Wdlv42uy9oR/NnW64Eo=; b=Clo3QVUafEeMsv/iaLCjhjVoeUsIva+zGKdvKVU5PNOmcxcMgUMj0XyDFHtneCDwcl 6ikv2udONV9XHbaLZ+vjA+zSemcUPesFnN9xpB9fp7lNG8yKPexLxYV6MkqVxY5atG6B aHd5Guk5Ap0uMFfs2rqVZ31C4CgIew0OCZyA8DYtbzOkU+LR85mf/gh3gorTkQryZvDK QLq9htppmg/PVil3mJlSSW5K1eZke5cW/B2sZYNXcM3Qs0km1vMSdYkChMorVk4dZRZa jFy7L0TKhKwfFchwdWShkmvUrzNZIFPR7n6VMEPkLv64KNOHhoAQASWIpTnVCIEvYgsd xjSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740055262; x=1740660062; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=DIg+pxzZNeRuLVvWigRFTxl6Wdlv42uy9oR/NnW64Eo=; b=OSoDe0FI1jJ/53VydGa6d4O923o+rYl5KHZXe87MqpHj+UxnJaNvQNnU7IBnc/0YuU IcdrUNX5kn6+ZbH3ClybwPuyE2fAjOOroH4ArtzTeN8UZsg9FEoZaKVKvTgkSyz9Xjf7 r0+RnOE+kKJQBQpodq6Pbi1nM0cPXxbAG/G0ov8zsNup86mNW5O7KttUmG+VZRPHebnL ddabhEHUxX28ZErAFATACyPRTLnGfdn5hQqP9AsWulYxxZQsDQxamHMai87fd9tpjTtY FJQ+r3zbgjroGjKXw8ycAmXwGudWrn0UEmUNHw/5xVwuM+cjIvbN5k8WKD/suUK7lCxZ InoA== X-Gm-Message-State: AOJu0YyG0vqpTvYecdx1UJby+JkcAjG8W3JHg6SXY7QZnVV96L1cqFIy zx+UYaHWyynyQIgxFgloSrwfp2Vs4cQwPyuiPuaEwrubAcPCjbvSHgon3MLB X-Gm-Gg: ASbGncvvlAJqCtxEhKh5EtVHFj6Ppv5K31IlrV5TNfxJKAHd0XSndDfLZ1a8FQXAU9D GzFOG0wAeOmsPEv4PZC5wfgc8JCflKP1qL53JeN/CCSR90kznD0XcJ3mFIgO2RFBPGCtm3tWnqm Axxf6NkL+Mw77AD2J/bWpMu0Bx9haj5mojF4I70HtNBjhylEqtW/kMNccTcRcRG0RPMjTj16+lD XM317DGjKdtFQ/RMgOBz/+qLM1hUSpfKbNPqwizQqWY/aBPvQdxUuZPg2+33nA1XFgpI8BfJIKY 1+lPvLrfVhaKAV33p8o= X-Google-Smtp-Source: AGHT+IF4PifKiCtvIV36vwFataPbN5brfbpJX3Gg2dFo1OdAdM01niJsr5cNcfXb+9MXkOlYnic7Pw== X-Received: by 2002:a05:6000:1f87:b0:38f:2c10:da07 with SMTP id ffacd0b85a97d-38f340735d8mr21276568f8f.45.1740055261416; Thu, 20 Feb 2025 04:41:01 -0800 (PST) Received: from localhost ([31.210.180.71]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4399ac3c151sm52604555e9.30.2025.02.20.04.40.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 04:40:59 -0800 (PST) From: Efraim Flashner <efraim@HIDDEN> Date: Thu, 20 Feb 2025 14:39:49 +0200 Message-ID: <cover.1740054626.git.efraim@HIDDEN> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Changes from the previous set of patches: The first patch is new, it fixes a longstanding bug (TODO: which one?) where `guix build --manifest` didn't honor the `--system` flag. Second patch is unchanged. Third patch removes the installer.scm manifest and only makes changes to the Makefile.am. Fourth patch keeps the changes from the installer.scm manifest but keeps it in release.scm. In addition it only produces a manifest for one architecture, making it easier to test per-architecture. It also removes a bunch of now unused code. The fifth patch moved the 'guix' package from %system-packages to %base-packages and redid the logic for appending lists of packages per-architecture. Efraim Flashner (5): guix build: Honor '--system' with '--manifest'. Makefile.am: Add riscv64-linux as a supported-system. Makefile.am: Clarify the label for systems supported by the installer. etc: manifests/release: Only check for packages needed in the installer. etc: Add cross-compile manifest. Makefile.am | 13 +-- etc/manifests/cross-compile.scm | 167 ++++++++++++++++++++++++++++++++ etc/manifests/release.scm | 155 +++++++---------------------- guix/scripts/build.scm | 22 +++-- 4 files changed, 220 insertions(+), 137 deletions(-) create mode 100644 etc/manifests/cross-compile.scm base-commit: 65efd0c33511727987c90bebaf5c50a84e0e6182 -- Efraim Flashner <efraim@HIDDEN> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] [PATCH v2 1/5] guix build: Honor '--system' with '--manifest'. Resent-From: Efraim Flashner <efraim@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN Resent-Date: Thu, 20 Feb 2025 12:42:03 +0000 Resent-Message-ID: <handler.76098.B76098.174005527829821 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76098 <at> debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Efraim Flashner <efraim@HIDDEN>, Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN> X-Debbugs-Original-Xcc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN> Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.174005527829821 (code B ref 76098); Thu, 20 Feb 2025 12:42:03 +0000 Received: (at 76098) by debbugs.gnu.org; 20 Feb 2025 12:41:18 +0000 Received: from localhost ([127.0.0.1]:33891 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tl5rh-0007kl-8X for submit <at> debbugs.gnu.org; Thu, 20 Feb 2025 07:41:17 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:53608) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <efraim.flashner@HIDDEN>) id 1tl5rZ-0007ix-QE for 76098 <at> debbugs.gnu.org; Thu, 20 Feb 2025 07:41:10 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-439a4fc2d65so5981875e9.3 for <76098 <at> debbugs.gnu.org>; Thu, 20 Feb 2025 04:41:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740055263; x=1740660063; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=9yEBwWENjVtlGAi9HUWrR/HhdiTn0xhI75pfGZwELSM=; b=XTQdMEIGwDusEkoCOB3De6xFgjr0t2WdSHNJ9JZ/T4D1dp5eUv3km/C6Nxz+19+qEL cBZcA7wEdErv7hsROYhy3eK0oaEmacIBnTueGt4xWDkhzbFsYNL/9hLQYuPr10EXwr7U CjgCe9YwUP71YweiwVKZpvYtOX7t9rWy3RHueQAnJf4JxiZZDdxCUDGo9/naDiyn/rbJ XTdV+xGZbqUH6hCU7VSqSJryZPHQE0kwfysD0Avpwe5L21P+6DS0YNy3DzNI28c7iGBA ptRIpwmqDIIR4t4wTmK6kDk3ZzudOlhlJHtRZ17qsgj3AtFgRy/zjGEGitRUFHd1IaRP ZSvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740055263; x=1740660063; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=9yEBwWENjVtlGAi9HUWrR/HhdiTn0xhI75pfGZwELSM=; b=tI6o8ng3kfseRA1TXdh/oGUX/7IBlzMtz39bDIZeBlxYvkHahRkhqAKHrSBEZ3ryIe J0eHzuutNKRoaDsKjeWOFUIlhxDPfMrqlR4SNTSgJ3qOh+2cMao4dcrlxm+XWv63BmmZ csyLaYds5/pgJKn4tR+MmtYTYP6UzU1YlrkDxOIuXKUrg11HNwVjWDMOMfgO9dkAuUu7 9lg5TGqkpdZRDcDwyDlkJoiAbvWDL2H+3rNZTSE4Yjmjq0JcVxvzb0Ykgg2zbDS5Owbb AbZRnLE9+2idfctBFCbRi+6tiXFTnTAQ4OXk2LWKFVwsRAX9e1ZkBOf03KZY6Upp/bCd +qNg== X-Gm-Message-State: AOJu0Yws+6/3fdAgxjerC/XqMtW+2DlGGf9A3a24wvuKl4mAW1Jc8GjH NxPmvVMgajfpwQMfXRu+A+hAwwmjkTpmlhARH801c5cS6j4r8zDmWkek3TgE X-Gm-Gg: ASbGncsxJi5NwLPHs4Y4TdZInNPF8sixBJcjKI2ewk4hQxgm+I+bqdtDTV8JJNzUNdg xcPlN/ExbkMd6383ZrMZDamqEeyltFTruVUElqL/Wdyq4RcTMgURwH+SfFm+vU2UVTZHwc0Dl6a dgeIPVVDgcFQb/uujzX52fi6w5064FKd8qo7vwyELVXHWYuoTq/leXgVuEWNb2xzhUPP6+60Lqi RKoRF3X1pRdQB385sjewwAxt4+bqi9t7jhKdz94kYy9rqbnHsNOro1LkdD2gxlR4uquXZVC7EMl 2a9IE+rEBPKgxoJRe/c= X-Google-Smtp-Source: AGHT+IEi2dPmJznsEVwm2ezeadrwh4eqabsWDMcrtCEXj8f6cAm3+sUtUr1hSEnNFTpzWXhYhDdxhA== X-Received: by 2002:a05:600c:468f:b0:439:9424:1b70 with SMTP id 5b1f17b1804b1-43994241ea8mr124352955e9.30.1740055263433; Thu, 20 Feb 2025 04:41:03 -0800 (PST) Received: from localhost ([31.210.180.71]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-439a0cc11c6sm31404415e9.16.2025.02.20.04.41.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 04:41:03 -0800 (PST) From: Efraim Flashner <efraim@HIDDEN> Date: Thu, 20 Feb 2025 14:39:50 +0200 Message-ID: <dd27306511ece011c352fbb06454674dc419e29d.1740054626.git.efraim@HIDDEN> X-Mailer: git-send-email 2.48.1 In-Reply-To: <cover.1740054626.git.efraim@HIDDEN> References: <cover.1740054626.git.efraim@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * guix/scripts/build.scm (options->things-to-build): Wrap the manifest build option with the result of the '--system' option. Change-Id: I1c3ff93af56bb659ddc00e1872c769cfc5e7a0d5 --- guix/scripts/build.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index f0a637a2ef5..dfc37d01d85 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -706,15 +706,19 @@ (define-public my-package (ensure-list (load* file (make-user-module '())))) result)))) (('manifest . manifest) - (loop tail 'regular - (append (map manifest-entry-item - (manifest-entries - (ensure-manifest - (load* manifest - (make-user-module '((guix profiles) - (gnu)))) - manifest))) - result))) + ;; Otherwise '--system' is ignored. + ;; Wrap the loop instead of adjusting each item so that manifest + ;; items can individually be for different systems. + (parameterize ((%current-system system)) + (loop tail 'regular + (append (map manifest-entry-item + (manifest-entries + (ensure-manifest + (load* manifest + (make-user-module '((guix profiles) + (gnu)))) + manifest))) + result)))) (('expression . str) (loop tail 'regular (append (append-map for-type (ensure-list (read/eval str))) -- Efraim Flashner <efraim@HIDDEN> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] [PATCH v2 2/5] Makefile.am: Add riscv64-linux as a supported-system. Resent-From: Efraim Flashner <efraim@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 20 Feb 2025 12:42:03 +0000 Resent-Message-ID: <handler.76098.B76098.174005527829833 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76098 <at> debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Efraim Flashner <efraim@HIDDEN> Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.174005527829833 (code B ref 76098); Thu, 20 Feb 2025 12:42:03 +0000 Received: (at 76098) by debbugs.gnu.org; 20 Feb 2025 12:41:18 +0000 Received: from localhost ([127.0.0.1]:33893 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tl5rh-0007kw-RZ for submit <at> debbugs.gnu.org; Thu, 20 Feb 2025 07:41:18 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:50268) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <efraim.flashner@HIDDEN>) id 1tl5rb-0007jF-Nx for 76098 <at> debbugs.gnu.org; Thu, 20 Feb 2025 07:41:12 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43690d4605dso5381435e9.0 for <76098 <at> debbugs.gnu.org>; Thu, 20 Feb 2025 04:41:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740055265; x=1740660065; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=SSF4jLYZLq9XgMcCqnov3TDXu2Gh3JlGm7CXnTziqjc=; b=YY5aUCRydAaqRNATFBacN6vO/GduFsMUmHgZQ/+pcW8zcUR4nujv6MlWzLtrhetx2K xt4orYMsYf7NYqSZSHC+LarBk5JFY/IzRbt190bdEWPtzx9+BHw7PzQesyMiVv6U4rxM cUh6FiXLg8glZ5lhj/iDz72oyOi7yHSP57cpbf7jGTi2N2Et3PdOoqat1fOBO6pIT1+3 RXnzEpQ6A8xSrRoHAo2nXe4zJFNSDXjEpKPBLnTYE4iGUEYYqMrJRnGdsWRkac6M2oiU UJkp3UYcSyD8YBqo92mtZBMAxAIpD0XHMcAWk89dBaKJ203pw5XVBpy0283wgRLTm0XP 5UIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740055265; x=1740660065; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=SSF4jLYZLq9XgMcCqnov3TDXu2Gh3JlGm7CXnTziqjc=; b=WZGw2xEN4a6Ps2xshl1IIXlQvsyX6+3eSE1vdt5jUbix4L5Yr1J251wK3uMs4tusbE OnQAZ37Dj4O98t4moz+uY/524J2SF81LD0EIF/HaDlMDvUxwUb1vJcskbAFYeIf5rROt bxaOHz1FGUiSLRMt/ocqV7PvLl6qB4Iaa969exxNVhTv8h1f20po7Dq6HTK57lwVeq7p klGG671QA8Mo6WW7x/i6voQVFJJrkrbHRFOxci7zFxbf291bvdSqK4GleTx/57AE0J3Y QkOa08K4QzuCo6tcOXEDDSlsaKEX1jhdM8ssesDt18L1Rn3499kAx8y+L6+LDdG/BwaT lNJw== X-Gm-Message-State: AOJu0YxTTizN1TDdYjmw8YlfKBDWHqSum/uMIkakma7RdN/W/WNRL0nO EXhGux1AzkgZYaCbGHTpYlT6gvsHhK1kyaKSYWZDZbLe491eX6KXTLt7lMxy X-Gm-Gg: ASbGncsN+2Oj2I4MCg+fHRqO4tRa9pU9rrxkU9Ht/4ghkjCMBxjoDlo/ghkZU+zL1m1 N/HysiP05l2/4cV9o/dnSkjWud250YdQFWO3M8jB8P9zttbg0VrJTvBKCaT/gR1XAqgk/WmOx3r WEMajTE1UOrBB/1WIxA9DujosXuOfHe/QYLOCs4kvVzxAByIJov9Qj2uCv2nyF+cmLYYRpn+dZ9 G2L2y4lbf/asPju1Vih12WNbzCaBKQA0ctbJ0zI2d4KwDzFok8+o7SYNn8wHowrz2BqTON8JSxm 1NTLdAZ2arrTRP8o3XM= X-Google-Smtp-Source: AGHT+IERaXKN7iXDSKAe/Z2m1Uz0o5STQVQ9xlBq9wFcmVPXMeyt/Mwog7hxzOVQ8/1/WevW8w9Fvw== X-Received: by 2002:a05:600c:3b1b:b0:439:9496:180a with SMTP id 5b1f17b1804b1-43994961ad2mr95390995e9.3.1740055265464; Thu, 20 Feb 2025 04:41:05 -0800 (PST) Received: from localhost ([31.210.180.71]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4399600257asm73985365e9.4.2025.02.20.04.41.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 04:41:05 -0800 (PST) From: Efraim Flashner <efraim@HIDDEN> Date: Thu, 20 Feb 2025 14:39:51 +0200 Message-ID: <a599c26342f3a33eef9a135d93e257d902252110.1740054626.git.efraim@HIDDEN> X-Mailer: git-send-email 2.48.1 In-Reply-To: <cover.1740054626.git.efraim@HIDDEN> References: <cover.1740054626.git.efraim@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * Makefile.am (SUPPORTED_SYSTEMS): Add riscv64-linux. Change-Id: Ie8a18500b73b39f0702af64a5c9cb988ffd77250 --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index edcc392492b..d5b33570532 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1072,7 +1072,7 @@ SOURCE_TARBALLS = \ # Systems supported by Guix. SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux armhf-linux aarch64-linux \ - powerpc64le-linux + powerpc64le-linux riscv64-linux # Guix binary tarballs. BINARY_TARBALLS = \ -- Efraim Flashner <efraim@HIDDEN> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] [PATCH v2 3/5] Makefile.am: Clarify the label for systems supported by the installer. Resent-From: Efraim Flashner <efraim@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 20 Feb 2025 12:42:04 +0000 Resent-Message-ID: <handler.76098.B76098.174005528029848 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76098 <at> debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Efraim Flashner <efraim@HIDDEN> Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.174005528029848 (code B ref 76098); Thu, 20 Feb 2025 12:42:04 +0000 Received: (at 76098) by debbugs.gnu.org; 20 Feb 2025 12:41:20 +0000 Received: from localhost ([127.0.0.1]:33896 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tl5ri-0007l8-O0 for submit <at> debbugs.gnu.org; Thu, 20 Feb 2025 07:41:19 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:48153) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <efraim.flashner@HIDDEN>) id 1tl5rd-0007jX-RM for 76098 <at> debbugs.gnu.org; Thu, 20 Feb 2025 07:41:14 -0500 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-38f3ee8a119so442592f8f.0 for <76098 <at> debbugs.gnu.org>; Thu, 20 Feb 2025 04:41:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740055268; x=1740660068; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=rojGcxEAwtmI6wSkfdaNKuICgxz9AybhX0BUtDdGoxs=; b=THfa/Zg3t/JMoj987d4gckNEsVqrqrZGAtLEj5fyCZ3rxufll3+d3q/q++7Ct0QQ5O Ds34y1duiNvrCThKC/ORWf9mQroAvnNKLRwBPp7035Fz4/+0l34QHxK0TUCGv5wwBDi4 g+Qiw4ZNyHFsnf/hE3c254WDQw7e290WqrWp0CNIDLI/A8P7iOK91yd8idml+rSrHZFv 4yK1Xew5YP+0uCHo8Se863an/lftQxDwOB705MhxgNGA6pTwDw6VT9HKSOQPIEsC18Od D22Y97MQH7K6v1zkAeNnduRzvA2ljLM1ZBsTfWYF7KL9Xl+o/55BEWW43UmBuR37HDrE 6Z/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740055268; x=1740660068; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=rojGcxEAwtmI6wSkfdaNKuICgxz9AybhX0BUtDdGoxs=; b=W47fSZhbBv8JEv+OWRXmjPKthd/2//Fa1Yxqp1nJpCfXuQl2kXEdqExAZzAgHfDXJq NSUd2yFULDGOAcfWFqpc0CklAQjw7g+udJmfqT7ZgbE6DwDPKPPJy2N9saf5Mko1aN2f /wDu4qmDs9To57Vsz7xTTMlzS7B2JD2XqaKXM/5mlZtmCWNa+LbApUqOizEWD34c5DIz eFyuZRtPTRI2CzQEDV9HH3mX1mQvk7vEW09IPVMM1Bq4eywI2LhtLOg+/g5FQfgbTf4L 5TwByJSwJXc1h+zKV9CuvBLIqeK+XSc5ch5w3zZ37qpV5n+DxNXl/wX1iS5VBYRoPlTc EOnw== X-Gm-Message-State: AOJu0YwDJiPds5ZNd/vTuZseJJJhWvKtQysNssRR9u47qMUFZ0ciCDwp IXNkRh1+E5FC1FIoI9twVyfzNBheeeYVtmsQ3IgYe9h8J3+UjsdzCAmaUUKW X-Gm-Gg: ASbGncvZgYMDFcYYhteMFceTN6leuaSN0+FTajKRCUjJMGZUHpFVqugye2jU6HJxJOM 97dtS46tSn1ygv9llPPG1hcOCko2nhMPeb3UchEixBQNFKhwsYAhniGkgll6FtmzyqguSziWO99 uXmqKFPNw3SifayMhFZSgJ0R3E3HrPAiH2Wk8KlMQU/JSgG8qtJytdHsdZnYzbDkbgpkOO2nhv3 8UX2rJT8tadM+qxE0o+Y3siBVD5Z4eeyrGzJ/2AMI9HtBG8nJGwp9xkBV5A233QR7o3mpOHtTf7 NsVAggG0petSzmkquCA= X-Google-Smtp-Source: AGHT+IFZ+jSTX8x5w1PdnfdvjaZrtz8E/Dz7pZs5xgcH64NgbxKXYylgxiTxuIt/tPHgPJlX582xsg== X-Received: by 2002:a5d:6d0e:0:b0:38f:5833:43ca with SMTP id ffacd0b85a97d-38f58334434mr6657207f8f.9.1740055267576; Thu, 20 Feb 2025 04:41:07 -0800 (PST) Received: from localhost ([31.210.180.71]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f2591513bsm20741875f8f.55.2025.02.20.04.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 04:41:07 -0800 (PST) From: Efraim Flashner <efraim@HIDDEN> Date: Thu, 20 Feb 2025 14:39:52 +0200 Message-ID: <5a202e889168ca55610cae8afb8e9d95bac661be.1740054627.git.efraim@HIDDEN> X-Mailer: git-send-email 2.48.1 In-Reply-To: <cover.1740054626.git.efraim@HIDDEN> References: <cover.1740054626.git.efraim@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * Makefile.am (GUIX_SYSTEM_SUPPORTED_SYSTEMS): Rename to GUIX_SYSTEM_INSTALLER_SYSTEMS. Change-Id: I5c15e6916583bcd56e535733f284f3a735d7600b --- Makefile.am | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index d5b33570532..93d40a701fe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1078,8 +1078,9 @@ SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux armhf-linux aarch64-linux \ BINARY_TARBALLS = \ $(foreach system,$(SUPPORTED_SYSTEMS),guix-binary.$(system).tar.xz) -# Systems supported by Guix System. -GUIX_SYSTEM_SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux +# Systems supported by the Guix System installer. +# A Hurd install happens from a Linux installer image. +GUIX_SYSTEM_INSTALLER_SYSTEMS ?= x86_64-linux i686-linux # Systems for which we build Guix VMs. GUIX_SYSTEM_VM_SYSTEMS ?= x86_64-linux @@ -1140,10 +1141,10 @@ release: dist-with-updated-version all # Build 'current-guix' to speed things up for the next step. $(top_builddir)/pre-inst-env guix build \ -e '((@ (gnu packages package-management) current-guix))' \ - $(call system_flags,$(GUIX_SYSTEM_SUPPORTED_SYSTEMS)) \ + $(call system_flags,$(GUIX_SYSTEM_INSTALLER_SYSTEMS)) \ -v1 --no-grafts --fallback # Generate the ISO installation images. - for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do \ + for system in $(GUIX_SYSTEM_INSTALLER_SYSTEMS) ; do \ GUIX_DISPLAYED_VERSION="`git describe --match=v* | sed -'es/^v//'`" ; \ image=`$(top_builddir)/pre-inst-env \ guix system image -t iso9660 \ @@ -1207,7 +1208,7 @@ assert-no-store-file-names: exit 1 ; \ fi -# Make sure important substitutes are available. Check only the primary +# Make sure installer substitutes are available. Check only the primary # server so that '--display-missing' doesn't print two lists. assert-binaries-available: $(GOBJECTS) $(AM_V_at)$(top_builddir)/pre-inst-env \ -- Efraim Flashner <efraim@HIDDEN> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] [PATCH v2 4/5] etc: manifests/release: Only check for packages needed in the installer. Resent-From: Efraim Flashner <efraim@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 20 Feb 2025 12:42:04 +0000 Resent-Message-ID: <handler.76098.B76098.174005529629973 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76098 <at> debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Efraim Flashner <efraim@HIDDEN> Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.174005529629973 (code B ref 76098); Thu, 20 Feb 2025 12:42:04 +0000 Received: (at 76098) by debbugs.gnu.org; 20 Feb 2025 12:41:36 +0000 Received: from localhost ([127.0.0.1]:33900 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tl5rz-0007nH-2V for submit <at> debbugs.gnu.org; Thu, 20 Feb 2025 07:41:36 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:42307) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <efraim.flashner@HIDDEN>) id 1tl5rf-0007jx-W8 for 76098 <at> debbugs.gnu.org; Thu, 20 Feb 2025 07:41:17 -0500 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4399ee18a57so5355325e9.1 for <76098 <at> debbugs.gnu.org>; Thu, 20 Feb 2025 04:41:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740055270; x=1740660070; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=gndvtiITnqzLgJZ3w4G7XgfzJrVCaoAU619tZkbyovE=; b=Xzj+w8bchJLC1o6QYr2+YD5Uzx7V8O9OqfH2svzWWq7oiYhVI8sKgO0jbhayOwD6HU 0QfhnuBNNzhKjnNKQ27TpT5vZ6sFnB0M0gv82tGCY7bX2L5jOQ3fhvPRqOozp32dvw9l BhxQVdyfQgBKja2L6pLbGluXCaCIhXVNPTh0T2HYdzOh0Lsp9DnFB3Osu/tWX8+YvbTD YhIRBxPMJBtlLedKNeLZOSjExxQPIpMB5EvHej5pHrtJ8aI4PJl1gZi0Ha5opJRPqy7E drSfKxVMKLMS7x6mUWhT9CGCeOZrm+ObseCDJaSWALHgYONnenORfHqrYw1Hs1mHeUsf +WDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740055270; x=1740660070; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=gndvtiITnqzLgJZ3w4G7XgfzJrVCaoAU619tZkbyovE=; b=dynzOYDtcQxR7Mb3ZRPImkbUZoTsug3HDipBLlFWLX8Y+8MJcbGwVw8xkVNTGHgmj6 Q2WVv5dnhywqUrZ44IgJJUBg2qxSfRpf7dGV7l2rCVtuopEDJ+D/MhP3pEzydd6pMOTg Ge6A858xfrBoRbnTJxmQtzv626QsmHS2aZFrkmTybwiSUSuY9WMBSl4s4qu6uxjivSht JtKGeCjyFPp/vOgiSPfDhC/Cs2JkVoFXXd09M9mmUsmKrINAE7VX9ePIx2ppiWQy/YfD j3eu99XhLRMRuULncuVNBGVsTH7gehx04GQqAMOfQQWIzmpg+OMezWjRAZQy9nHLzr+9 3Vhw== X-Gm-Message-State: AOJu0YzJ7G0n1mP20AATqk48LM+uiQKnZKkgXZyLUaqZb50+fVr52P8T PjK1t0wb8HDC4lXB8SPzz7d7WTPoNTf6apBjFhRim7PqGBgjFSBRGgKwYae1 X-Gm-Gg: ASbGncsl6zU7chNQgWDtGuu0QvN/BxYKyqAh63Ip7qIuGz7Pf0Z7VOg3qrSyhAGMXHQ iQopQ5ziCgMmQ5ueXwopcx1tG6qviVyoSzCvMnSEiGpu8kTDfvJyTzlFKDGsp2T9T0VO9+NJLeT Cytf+sXRM5YHq3kvsFJq4lUxXMv+cwsfBnzpHFdgqIky099nFE5/uDuwyJ+BzrQHNr7tThx20fC 6hLV5Ns2DIlRQU+1Svys58mF9qLYpcLeV0ZlsdKcm+vTcx9wT5mbmYO8Bl6pPhVkrR8gXOHahp4 B2Xf9qxhl/cjpZ+epOs= X-Google-Smtp-Source: AGHT+IGaWimWfbHRsx+HKVL92Om6ZRsRfz4h7Dm14BCBdKFv9ZuEQp4wmlQHgR8+1sUNiTRFvl1ocA== X-Received: by 2002:a05:600c:c8b:b0:439:7ef0:a112 with SMTP id 5b1f17b1804b1-439a30d4ef3mr26150325e9.10.1740055269617; Thu, 20 Feb 2025 04:41:09 -0800 (PST) Received: from localhost ([31.210.180.71]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4399c5d1fe8sm25263585e9.1.2025.02.20.04.41.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 04:41:09 -0800 (PST) From: Efraim Flashner <efraim@HIDDEN> Date: Thu, 20 Feb 2025 14:39:53 +0200 Message-ID: <eecfbed834b434db6d5edfc375df047207620aba.1740054627.git.efraim@HIDDEN> X-Mailer: git-send-email 2.48.1 In-Reply-To: <cover.1740054626.git.efraim@HIDDEN> References: <cover.1740054626.git.efraim@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * etc/manifests/release.scm (%system-packages): Adjust the packages which are depended upon by the installer. Add a set of extra packages which we expect to have available. (%base-packages, %base-packages/armhf, %base-packages/hurd, %packages-to-cross-build, %packages-to-cross-build-for-mingw, %cross-bootstrap-targets, %base-manifest, %cross-manifest, %cross-bootstrap-manifest): Remove variables. Change-Id: I5806fff6bc38d14859f6d7163719841620e28d09 --- etc/manifests/release.scm | 155 ++++++++------------------------------ 1 file changed, 33 insertions(+), 122 deletions(-) diff --git a/etc/manifests/release.scm b/etc/manifests/release.scm index b003f216fff..f69ab316ca4 100644 --- a/etc/manifests/release.scm +++ b/etc/manifests/release.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2020-2022, 2024 Ludovic Courtès <ludo@HIDDEN> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@HIDDEN> ;;; Copyright © 2023 Andreas Enge <andreas@HIDDEN> +;;; Copyright © 2025 Efraim Flashner <efraim@HIDDEN> ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,18 +19,13 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. -;;; This file returns a manifest containing release-critical bit, for all the -;;; supported architectures and cross-compilation targets. +;;; This file returns a manifest containing packages which are needed by the +;;; installer. -(use-modules (gnu packages) - (guix packages) - (guix profiles) - ((guix platform) #:select (targets)) +(use-modules (guix packages) ((gnu services xorg) #:select (%default-xorg-modules)) (guix utils) - (guix gexp) - (srfi srfi-1) - (srfi srfi-26)) + (srfi srfi-1)) (define* (package->manifest-entry* package system #:key target) @@ -45,131 +41,46 @@ (define* (package->manifest-entry* package system (%current-target-system target)) package)))) -(define %base-packages - ;; Packages that must be substitutable on all the platforms Guix supports. - (map specification->package - '("bootstrap-tarballs" "gcc-toolchain" "nss-certs" - "openssh" "emacs" "vim" "python" "guile" "guix"))) - -(define %base-packages/armhf - ;; The guix package doesn't build natively on armhf due to Guile memory - ;; issues compiling the package modules - (remove (lambda (package) - (string=? (package-name package) "guix")) - %base-packages)) - -(define %base-packages/hurd - ;; XXX: For now we are less demanding of "i586-gnu". - (map specification->package - '("coreutils" "grep" "findutils" "gawk" "make" - #;"gcc-toolchain" "tar" "xz"))) - (define %system-packages ;; Key packages proposed by the Guix System installer. (append (map specification->package - '("xorg-server" "xfce" "gnome" "mate" "enlightenment" - "openbox" "awesome" "i3-wm" "ratpoison" + '("guix" + "gnome" "xfce" "mate" "enlightenment" + "openbox" "awesome" + "i3-wm" "i3status" "dmenu" "st" + "ratpoison" "xterm" "emacs" "emacs-exwm" "emacs-desktop-environment" - "xlockmore" "slock" "libreoffice" - "connman" "network-manager" "network-manager-applet" - "openssh" "ntp" "tor" - "linux-libre" "grub-hybrid" - "icecat")) + "openssh" "tor" "ntp" "gpm" + "connman" "network-manager" "wpa-supplicant" "isc-dhcp" "cups" + "linux-libre" "grub-hybrid")) %default-xorg-modules)) -(define %packages-to-cross-build - ;; Packages that must be cross-buildable from x86_64-linux. - ;; FIXME: Add (@ (gnu packages gcc) gcc) when <https://bugs.gnu.org/40463> - ;; is fixed. - (append (list (@ (gnu packages guile) guile-3.0/pinned)) - (map specification->package - '("coreutils" "grep" "sed" "findutils" "diffutils" "patch" - "gawk" "gettext" "gzip" "xz" - "hello" "zlib")))) - -(define %packages-to-cross-build-for-mingw - ;; Many things don't build for MinGW. Restrict to what's known to work. - (map specification->package '("hello"))) - -(define %cross-bootstrap-targets - ;; Cross-compilation triplets for which 'bootstrap-tarballs' must be - ;; buildable. - '("i586-pc-gnu" - "arm-linux-gnueabihf" - "aarch64-linux-gnu")) - ;;; ;;; Manifests. ;;; -(define %base-manifest - (manifest - (append-map (lambda (system) - (map (cut package->manifest-entry* <> system) - (cond ((string=? system "i586-gnu") - %base-packages/hurd) - ((string=? system "armhf-linux") - %base-packages/armhf) - ((string=? system "powerpc64le-linux") - ;; FIXME: Drop 'bootstrap-tarballs' until - ;; <https://bugs.gnu.org/48055> is fixed. - (drop %base-packages 1)) - (else - %base-packages)))) - %cuirass-supported-systems))) - (define %system-manifest (manifest - (append-map (lambda (system) - ;; Some of %SYSTEM-PACKAGES are currently unsupported on some - ;; systems--e.g., GNOME on non-x86_64, due to Rust. Filter - ;; them out. - (filter-map (lambda (package) - (and (supported-package? package system) - (package->manifest-entry* package system))) - %system-packages)) - '("x86_64-linux" "i686-linux")))) ;Guix System + (append + ;; The linux-libre-*-generic kernel is commonly used on some architectures. + (cond + ((target-aarch64?) + (package->manifest-entry (@ (gnu packages linux) + linux-libre-arm64-generic))) + ((target-riscv64?) + (package->manifest-entry (@ (gnu packages linux) + linux-libre-riscv64-generic))) + ((target-arm32?) + (package->manifest-entry (@ (gnu packages linux) + linux-libre-arm-generic))) + (else '())) -(define %cross-manifest - (manifest - (append-map (lambda (target) - (map (cut package->manifest-entry* <> "x86_64-linux" - #:target target) - (if (target-mingw? target) - %packages-to-cross-build-for-mingw - %packages-to-cross-build))) - (fold delete (targets) - '(;; Like in (gnu ci), dismiss cross-compilation to x86: - ;; it's pointless. - "x86_64-linux-gnu" - "i686-linux-gnu" + ;; Some of %SYSTEM-PACKAGES are currently unsupported on some + ;; systems--e.g., GNOME on 32-bit, due to Rust. Filter them out. + (filter-map (lambda (package) + (and (supported-package? package (%current-system)) + (package->manifest-entry package))) + %system-packages)))) - ;; Ignore obsolete systems, as in (gnu ci). - "mips64el-linux-gnu" - "powerpc-linux-gnu" - "powerpc64-linux-gnu" - - ;; Ignore bare-metal targets. - "avr" - "or1k-elf" - "xtensa-ath9k-elf" - - ;; XXX: Important bits like libsigsegv and libffi don't - ;; support RISCV at the moment, so don't require RISCV - ;; support. - "riscv64-linux-gnu"))))) - -(define %cross-bootstrap-manifest - (manifest - (map (lambda (target) - (package->manifest-entry* - (specification->package "bootstrap-tarballs") - "x86_64-linux" #:target target)) - %cross-bootstrap-targets))) - -;; Return the union of all three manifests. -(concatenate-manifests (list %base-manifest - %system-manifest - %cross-manifest - %cross-bootstrap-manifest)) +%system-manifest -- Efraim Flashner <efraim@HIDDEN> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] [PATCH v2 5/5] etc: Add cross-compile manifest. Resent-From: Efraim Flashner <efraim@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 20 Feb 2025 12:42:05 +0000 Resent-Message-ID: <handler.76098.B76098.174005529729985 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76098 <at> debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Efraim Flashner <efraim@HIDDEN> Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.174005529729985 (code B ref 76098); Thu, 20 Feb 2025 12:42:05 +0000 Received: (at 76098) by debbugs.gnu.org; 20 Feb 2025 12:41:37 +0000 Received: from localhost ([127.0.0.1]:33902 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tl5s0-0007nO-3v for submit <at> debbugs.gnu.org; Thu, 20 Feb 2025 07:41:37 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:51470) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <efraim.flashner@HIDDEN>) id 1tl5ri-0007kF-9A for 76098 <at> debbugs.gnu.org; Thu, 20 Feb 2025 07:41:19 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43995b907cfso5227995e9.3 for <76098 <at> debbugs.gnu.org>; Thu, 20 Feb 2025 04:41:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740055272; x=1740660072; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=xtWankyXqwOG3HjdvABjmamHqfRKPQ8k0huvh0sRu4c=; b=EeCd+pK6qTHMC9xpvz6rWB8HUqxPsUhj6e69NVoMm3ZfM6ul0ntV5V1YjnRS/bmLLC WC5IboAeoqxDPh/x9a3Ht6ZfgZDYUvmjON8aWGuKuXvDxoa4ke1hAcLMjUEtt8mZVyAB 4B65h0TVDcAOrlWEMsTmAnFupUJAEahrYzN1L/Ei7MHFQYX7kIBqHbYU6Y7C9AQSnx4T DiTzMxqqv83P0eKTIkjzo7rYQ75hMvmC4TTlD2NKnnvI9jj7zwFyShDbDnQTHQYsUtwu D6b+bh/qi/FtjHzPJhb84CqLWOwFGJ2IDv9N0WVxWK7d/2eLz18QYJC+rK4H0ASITnyD +Mmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740055272; x=1740660072; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=xtWankyXqwOG3HjdvABjmamHqfRKPQ8k0huvh0sRu4c=; b=bknyupa6WZMpwtUbgyHbGZLwIvoktv/jjkiD8ZfIoy2UclegHsITvvjZFFanB/steR ozpBRn6wjxVEv/NPoGFQHeJcdcQENfvNH1l9904h73KQJvlJ7ywp4ECpSPxeeQPXXnJB dzHC4xhMB0/luaHg38zrIr9p+zwdJbiEW4DVorIwrLuaQ+R+kJBHeVISehgC9D7p0VJW dqpf8AeKYv6JJZSCo/sD33VkFuUTjJHUs/vOE7w9DyBemTr8b96N3QANexHKaNCKiWc3 6qRrPnY3CQXIMn0IUNZXM8/Ay4pHOeTteuz7yr0K74+XfkkpCigswOXS0UFJ6gDt1+8N 593w== X-Gm-Message-State: AOJu0YyeiqMfR9fDKSVBkJTSoEUj+hzTzT9/At2sRs/8wa9GeD087/Q1 A7UziofvL9BaGwRXkVe/3Q8tF2+O3WtI0XDegz8GezXR5LuzHm5XtLDFcdJV X-Gm-Gg: ASbGncs64+Ks/NHLX1sS+HNklZJCPYGUJk+oBL3AXUFRwpcX/ERTveyYXqNLv7sK4lr m5dAN+/t91nWVysuRm4JqWj6PnTf33hrG1EAbN0J5N4pWlrJ2o+Kq068z1c/EMDvx5A1CQMNrv0 oPe0WjPrZu7fYG5EzhkNGqaoFaIpnV6Jy/Tp5U0YWdFdM+VzX3lcLF3NkRDsViNYFTlTRuMOGje c/6rzccL4Hwzna+bM7Bk4M86ISPNMCEX+WIN7w2Vwm4FEgvxN9ghmxmOrNmB4aY30bdpzfM+UdN cVoLo0isW/yDjo0j5XQ= X-Google-Smtp-Source: AGHT+IELjX0Yk4fEoYVWuYnrPCueqoossUi+kfF9mcrI3HNfNFRYKXh0jZkoNBn6jgPnveJdiMsE/Q== X-Received: by 2002:a05:600c:354c:b0:439:9595:c8e8 with SMTP id 5b1f17b1804b1-4399595cb04mr114829365e9.0.1740055271670; Thu, 20 Feb 2025 04:41:11 -0800 (PST) Received: from localhost ([31.210.180.71]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43989087517sm108226445e9.8.2025.02.20.04.41.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 04:41:11 -0800 (PST) From: Efraim Flashner <efraim@HIDDEN> Date: Thu, 20 Feb 2025 14:39:54 +0200 Message-ID: <96b2e33f638ff75460260eed579bb9f7655633ef.1740054627.git.efraim@HIDDEN> X-Mailer: git-send-email 2.48.1 In-Reply-To: <cover.1740054626.git.efraim@HIDDEN> References: <cover.1740054626.git.efraim@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * etc/manifests/cross-compile.scm: New file. Change-Id: I63ac4014617e8d716c508a04c6da553e36a99fec --- etc/manifests/cross-compile.scm | 167 ++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) create mode 100644 etc/manifests/cross-compile.scm diff --git a/etc/manifests/cross-compile.scm b/etc/manifests/cross-compile.scm new file mode 100644 index 00000000000..280489cc19a --- /dev/null +++ b/etc/manifests/cross-compile.scm @@ -0,0 +1,167 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020-2022, 2024 Ludovic Courtès <ludo@HIDDEN> +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@HIDDEN> +;;; Copyright © 2023 Andreas Enge <andreas@HIDDEN> +;;; Copyright © 2025 Efraim Flashner <efraim@HIDDEN> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. + +;;; This file returns a manifest containing packages which should all cross-compile. +;;; We use the packages included by default in an OS configuration since that is +;;; (probably) the most likely install method for some architectures. + +(use-modules (gnu packages) + (guix packages) + (guix profiles) + (guix platform) + ((gnu services xorg) #:select (%default-xorg-modules)) + ((gnu system) #:prefix gnu-system: + #:select (%base-packages %base-packages-linux)) + (guix utils) + (guix gexp) + (srfi srfi-1) + (srfi srfi-26)) + +(define* (package->manifest-entry* package system + #:key target) + "Return a manifest entry for PACKAGE on SYSTEM, optionally cross-compiled to +TARGET." + (manifest-entry + (inherit (package->manifest-entry package)) + (name (string-append (package-name package) "." system + (if target + (string-append "." target) + "'"))) + (item (with-parameters ((%current-system system) + (%current-target-system target)) + package)))) + +(define %base-packages + ;; Packages that must be substitutable on all the platforms Guix supports. + ;; Use the %base-packages from (gnu system) since they are included by default + ;; in the packages field of the operating system configuration. + (cons* (specification->package "guix") + gnu-system:%base-packages)) + +(define %base-packages/hurd + ;; Remove the packages from %base-packages-linux and some of the packages + ;; from the other package sets. + (fold delete %base-packages + (append (map specification->package + '("e2fsprogs" "kbd" "iproute2" "iw" "wireless-tools")) + %base-packages-linux))) + +(define %system-packages + ;; Key packages proposed by the Guix System installer. + (map specification->package + '("openssh" "tor" "ntp" "gpm" + "connman" "network-manager" "wpa-supplicant" "isc-dhcp" "cups" + "linux-libre" "grub-hybrid"))) + +(define %system-gui-packages + ;; Key packages proposed by the Guix System installer. + (append (map specification->package + '("enlightenment" + ;; build system `python' does not support cross builds + ;"gnome" "xfce" "mate" "openbox" + "awesome" + "i3-wm" "i3status" "dmenu" "st" + "ratpoison" "xterm" + ;; build system `emacs' does not support cross builds + ;"emacs-exwm" "emacs-desktop-environment" + "emacs")) + %default-xorg-modules)) + +(define %packages-to-cross-build + ;; Packages that must be cross-buildable from x86_64-linux. + ;; FIXME: Add (@ (gnu packages gcc) gcc) when <https://bugs.gnu.org/40463> + ;; is fixed. + (append (list (@ (gnu packages guile) guile-3.0/pinned)) + (map specification->package + '("coreutils" "grep" "sed" "findutils" "diffutils" "patch" + "gawk" "gettext" "gzip" "xz" "zstd" + "hello" "zlib")))) + +(define %packages-to-cross-build-for-mingw + ;; Many things don't build for MinGW. Restrict to what's known to work + ;; to test that the cross-compiler itself works. + (map specification->package '("hello"))) + + +;;; +;;; Manifests. +;;; + +;; As per the Guix Survey of 2024 we only worry about cross compiling from +;; x86_64-linux (98% of users) and not from others (aarch64 with 19%). +(define %cross-manifest + (manifest + (append-map (lambda (target) + (map (cut package->manifest-entry* <> "x86_64-linux" + #:target target) + (if (target-mingw? target) + %packages-to-cross-build-for-mingw + %packages-to-cross-build))) + (fold delete (targets) + '(;; Disable cross-compilation to self: + "x86_64-linux-gnu" + + ;; mips64el commonly targets a different architecture + ;; revision than we targeted in Guix. + "mips64el-linux-gnu" + + ;; Ignore bare-metal targets. + "avr" + "or1k-elf" + "xtensa-ath9k-elf"))))) + +(define %cross-system + (manifest + (cons* + ;; Include a couple of extra kernels that are commonly used: + (package->manifest-entry* (@ (gnu packages linux) + linux-libre-arm64-generic) + "x86_64-linux" + #:target "aarch64-linux-gnu") + (package->manifest-entry* (@ (gnu packages linux) + linux-libre-arm-generic) + "x86_64-linux" + #:target "arm-linux-gnueabihf") + (package->manifest-entry* (@ (gnu packages linux) + linux-libre-riscv64-generic) + "x86_64-linux" + #:target "riscv64-linux-gnu") + (append-map (lambda (target) + (map (cut package->manifest-entry* <> "x86_64-linux" + #:target target) + (append %base-packages + %system-packages + ;; With a graphical environment: + (if (or (target-x86-32? target) + (target-aarch64? target)) + %system-gui-packages + '())))) + (fold delete (map platform-system->target (systems)) + '(;; Disable cross-compilation to self: + "x86_64-linux-gnu" + + ;; Ignore obsolete systems, as in (gnu ci). + "mips64el-linux-gnu" + "powerpc-linux-gnu")))))) + +;; Return the union of all the manifests. +(concatenate-manifests (list %cross-manifest + %cross-system)) -- Efraim Flashner <efraim@HIDDEN> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] make dist and related fun (was: The next release) Resent-From: Vagrant Cascadian <vagrant@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 20 Feb 2025 17:22:02 +0000 Resent-Message-ID: <handler.76098.B76098.174007208711404 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Efraim Flashner <efraim@HIDDEN>, guix-devel@HIDDEN Cc: 76098 <at> debbugs.gnu.org Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.174007208711404 (code B ref 76098); Thu, 20 Feb 2025 17:22:02 +0000 Received: (at 76098) by debbugs.gnu.org; 20 Feb 2025 17:21:27 +0000 Received: from localhost ([127.0.0.1]:39655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tlAEo-0002xq-JF for submit <at> debbugs.gnu.org; Thu, 20 Feb 2025 12:21:26 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:36402) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <vagrant@HIDDEN>) id 1tlAEm-0002wl-83 for 76098 <at> debbugs.gnu.org; Thu, 20 Feb 2025 12:21:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1740072076; bh=j/TvcZixWKtPoozErps+Y9B3jG3TClTvfs/DTUeu49k=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=edFcYpGL2bwvs5kMy3fhIwsESKNasZTwS3N3TWAtiPuivwG1yvB9QAiYoahEeo1wm ED6QqDKNsTTJGhFuUpueyqHIqqHiVXURQpI0U/gbds6rzOgsNaWQl4LUTJBf/TjPX0 Vnzzjbhy2212pEu8pXf0lsp2rAr6htC+cqlozNNcZObSmDx8yGVSjXNqi0wN8FVIqx fNIKQcNj2qY0moGqQhZWUTGqIr6rTIWT+ZpJ+egcGwY5myGwsmXTcqEr0TUAUIYDP4 cRphq2IuzjZsru+CyoKOxpeuqlN7znLGUVnlTazFGrOj7AtA5gtC/7uCXbolkxCSjG N17iC5y9Qqjmg== Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) by cascadia.aikidev.net (Postfix) with ESMTPSA id 46AA8202; Thu, 20 Feb 2025 09:21:16 -0800 (PST) From: Vagrant Cascadian <vagrant@HIDDEN> In-Reply-To: <878qq1a8ss.fsf@wireframe> References: <Z6s6qzMesCT7kuyS@3900XT> <87o6z2afqb.fsf@wireframe> <878qq1a8ss.fsf@wireframe> Date: Thu, 20 Feb 2025 09:21:11 -0800 Message-ID: <871pvsa5x4.fsf@wireframe> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain On 2025-02-19, Vagrant Cascadian wrote: > Also, in reviewing the copyright and license headers while packaging for > Debian, this raised a broader question about translating license headers > in files such as doc/guix.de.info: > > https://salsa.debian.org/debian/guix/-/blob/debian/latest/doc/guix.de.info#L93 > > With my limited german, it is clearly a header to declare the file is > released under the GFDL in some form, but I wonder if that is a good > idea to translate the license headers ... as at least in the US, in > order to ship that file I would maybe need to at least consult with a > lawyer (the US only recognizes English for legal documents), and I > suspect various other countries might need something similar for > arbitrary languages... having to get a lawyer involved kind of kills the > joy of free software and the goal of free distribution... For clarity, the US does recognize contracts and whatnot under other languages, but requires a *certified* translation of the document into English, which may also require getting legal counsel and in my opinion, kind of defeats the purpose of free software at that point... as one cannot freely share it without fear of undue legal burdens... At least, that is my entirely not-a-lawyer concern... Since this is only shipped in this form whe running "make dist" ... well, seems relevent for the release process. :) live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZ7dkhwAKCRDcUY/If5cW qk2lAQC/DZ7HpL/xLlUA34pEFg//RGlI0HIerEjuFTGEobYL2QEA6xprUa+20p5g 7dPnwKKdRwfG9EWBYkQXnAufuCmtpgk= =a5p+ -----END PGP SIGNATURE----- --=-=-=--
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] The next release Resent-From: Efraim Flashner <efraim@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Fri, 21 Feb 2025 07:05:02 +0000 Resent-Message-ID: <handler.76098.B76098.174012147022332 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Andreas Enge <andreas@HIDDEN> Cc: guix-devel@HIDDEN, 76098 <at> debbugs.gnu.org Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.174012147022332 (code B ref 76098); Fri, 21 Feb 2025 07:05:02 +0000 Received: (at 76098) by debbugs.gnu.org; 21 Feb 2025 07:04:30 +0000 Received: from localhost ([127.0.0.1]:51120 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tlN5K-0005o7-G1 for submit <at> debbugs.gnu.org; Fri, 21 Feb 2025 02:04:30 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:59713) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <efraim.flashner@HIDDEN>) id 1tlN5I-0005my-Rl for 76098 <at> debbugs.gnu.org; Fri, 21 Feb 2025 02:04:29 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-439846bc7eeso10785275e9.3 for <76098 <at> debbugs.gnu.org>; Thu, 20 Feb 2025 23:04:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740121463; x=1740726263; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=C1OV7IVGrui8VLew0ppKMKm0ZdhQvdDnoQPAissPUG4=; b=CkrwzZ8uJGVIbrGGJckllxMfqqA6sP57v//pJhLcxkk8bo2CkhCr5rMmFopNyEMoe1 rlQ0orddK095rTx/I6t6FmJuFYNKgqkJHJmkl7PUrveXXRpw0nx8XmY8ZIq6dixLRdAo 0LkMp3TaEY2MXSbVOFyb60iYvDiAVD/jkspDmTvoufr0va/NV9NPomu4IwkOdv8xeBBp /tDc6vFCrpXH7kI15orDKxbu67M2mmY//K8LMpWBDS7HFg0DWRnMsCidHOo1ml7RKIpb 5CTlDDr+xFnorAD7UkbH/t2btF8bkMrSIPw8JyQAXuRXG3uv5krQyCfL+QoKfVF+806I JiOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740121463; x=1740726263; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=C1OV7IVGrui8VLew0ppKMKm0ZdhQvdDnoQPAissPUG4=; b=SZ15rQoX6LhppryFsSQjG/RjghRqzrBBjlRybL1n0SgBKC2UTZu862e4HlQFLbocxl ul1Svm0jA6amkWEJyaAjf9BIgnJZ71xSGwBT7XE8KC30jMQ5B1kt1YEHyheZYb6V/zfH xnag5Zj/L9Lp1dEkm/+Q0JprfQz1daalpC1yFIhxmBTA8jFGXdyKiKmATXC4lzVI0HQ8 bJmP/GlB7b79yHPCVcmP97dFSBi4f2iggfqbki3YfqrhN6IZ3elW5yInVNUNRIAI+cc1 4YGeMy9PBzC1yaW2NCp9Kl/YUu7ZzY6+6DtBxteo/bFvxSLk/nvo1al++05Je2DOZ7kK N+WQ== X-Forwarded-Encrypted: i=1; AJvYcCXoAAPQpsW+L4JSvTA9klPBIOyXbgzcQEqG4aI2ebcZ/qYw5lSMfK+okKpX5bzo8BDsnt2vRA==@debbugs.gnu.org X-Gm-Message-State: AOJu0YxM+edER7zl+boz7gcpCB8zBtmfW1A3BiaxYzuvAqe7nEeOuJl6 0rpsW2ZeLNt03D1f4Fox9rfz9DnGMrbvYRurJnoPd+JSSTtLMcEy3HYy+vSZ X-Gm-Gg: ASbGncsOczavQPWNlnY/iHgSdvnoSEVXk3inb6tfv1wiAhzJaTsi7WMiyfZVvwUS4WW pjOFH7Vugfw5BdnyDeIVpaVDwyd9Glpm1oAzZyqXep26NnKRhugl3/4gWB7GEY5Y+SIcDBDGS9T xMvD1AZO9kkGDk393g+uEHzb0ETPDTI7VCAsBMw59qQUoLp9MB6lwka6OrVIhtI21ZVoTtYA3Zu 9gsHsZwTWUHYRY/tgw51HRkR+LHQUGyvhfoIC3G+5s9VeXl8seIDo+kYqYQEsjDJVfEvtpRw7Vh Q38QVq2kO+OmF96f5khA+qOd X-Google-Smtp-Source: AGHT+IHlUj0dFRm+zL5ftUnLaHBtONuJ5TZ6dzJUoQN344ARFw7nZvkhdI8pr+zWOKwXt5QdVQgosA== X-Received: by 2002:a05:6000:188f:b0:38f:277a:4eb6 with SMTP id ffacd0b85a97d-38f6e4bdf02mr1491381f8f.0.1740121462515; Thu, 20 Feb 2025 23:04:22 -0800 (PST) Received: from localhost ([31.210.180.71]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-439b02ce615sm8182135e9.5.2025.02.20.23.04.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 23:04:20 -0800 (PST) Date: Fri, 21 Feb 2025 09:04:19 +0200 From: Efraim Flashner <efraim@HIDDEN> Message-ID: <Z7glc7XRCAbZn9D9@3900XT> Mail-Followup-To: Andreas Enge <andreas@HIDDEN>, guix-devel@HIDDEN, 76098 <at> debbugs.gnu.org References: <Z6s6qzMesCT7kuyS@3900XT> <Z7M-S6dbrPFKYhWj@jurong> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="S3fHQhLKrHfREP4g" Content-Disposition: inline In-Reply-To: <Z7M-S6dbrPFKYhWj@jurong> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) --S3fHQhLKrHfREP4g Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Feb 17, 2025 at 02:48:59PM +0100, Andreas Enge wrote: > Hello, >=20 > I think something we need to do urgently is to run an ungrafting > process - grafting takes a considerable amount of time when updating my > system now, and I suppose it will also waste a bit of space. We should > not burden the installation process with it. >=20 > Did we not have a jobset on ci to automate this? >=20 > As said in Brussels, I would be happy to test a new installation image > on a further x86_64 I would like to get running Guix. We do have an ungrafting job, but it needs to be tweaked to exclude the glibc graft. I agree that we need to do an ungrafting run before a release but I'm not sure we're at the pre-release ungraft yet. An ungraft run in general would be a good thing. --=20 Efraim Flashner <efraim@HIDDEN> =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --S3fHQhLKrHfREP4g Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAme4JXMACgkQQarn3Mo9 g1HZqQ//cFwDq/W/0pmcClGkhIMGXlO2wGCmerV63R8dK/PEUDWBdKlBjMQxZvKw dp3hJ+kH5bWIjFWum2RXrs8TJDvulvg9Jx/oTBLyPBRHcGqbfamwB4XuB6czH943 2UZpioekTyNbaYPcP0Uq/1ewCg78pwPoWNOL8qyp6ifSZeY0gpR0srLq3pHIwuJl AYtLIR2nRXVGkaIbYKu7VEwv+x5fL+Ozr7AwYPGFkTCdUweJFG1KjcQVgwpWVZmq L5MdtVDKJNfWicQ2oBPPfc22JLb/fiUX7C+lBOj+wsZVE1MWb52lYUUt4OW041Li UmWx4TV6F3UNJMa5KYNeolwqYbkMH2/4jW2B/p0QlrwSMZP4rhAOryi3LrbobYuX vFsayNqTVwp0ztzQjp1/QXcL7a392c6hlB6tyr686llMWq9yHI4qJuwKVI0M0ypI YntuEt9dHV1DWxYrTCF3TT1yDUZZbUdMWK+T4HcX2eCfSf39WNKQllXMhvIAEkrw K7F4ZhxPOx6UUGEZ1noS2XhKlQVf0pKq4iWx8ltm+Q+knFOVtPugslNxtJlvI91O iV65U3XtoLRAXUgVFgRSwQTiUfOelY8tjoNFD9+guHTERhxYYuXTlETWlnZwS420 nxZXJZIuF4NjwqAuMyFchRVmMWCktVasT3OTWqD/Ga7haM8ursg= =OsbA -----END PGP SIGNATURE----- --S3fHQhLKrHfREP4g--
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] make dist and related fun (was: The next release) Resent-From: Efraim Flashner <efraim@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Fri, 21 Feb 2025 07:17:02 +0000 Resent-Message-ID: <handler.76098.B76098.174012219829679 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Vagrant Cascadian <vagrant@HIDDEN> Cc: guix-devel@HIDDEN, 76098 <at> debbugs.gnu.org Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.174012219829679 (code B ref 76098); Fri, 21 Feb 2025 07:17:02 +0000 Received: (at 76098) by debbugs.gnu.org; 21 Feb 2025 07:16:38 +0000 Received: from localhost ([127.0.0.1]:51298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tlNH3-0007iU-ES for submit <at> debbugs.gnu.org; Fri, 21 Feb 2025 02:16:38 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:50245) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <efraim.flashner@HIDDEN>) id 1tlNGz-0007gw-Lk for 76098 <at> debbugs.gnu.org; Fri, 21 Feb 2025 02:16:35 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43690d4605dso10925225e9.0 for <76098 <at> debbugs.gnu.org>; Thu, 20 Feb 2025 23:16:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740122187; x=1740726987; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=Rnzb1lyD3E4wUNMMxEOoLUTcgh+xsoqeA5iZFioH6Vw=; b=YloPR5iYdbkkkHUm6HVJLnETgZ6TWsOJtj9+/kmUoUpezm262yBAFZ65XBV5JXjSiC RBs1WUgnqgSPLWp0YDgq4yvSEK3VxJqFmrylpvLHptz84m9GHdJ85n8jnve7FzRUiNYp QpcfGitPpK38xotcV6EFe2KDrBcOPGMVjpMFngLycbQdQ839vgDhAZJhzw18pGhr1njX ZiQ6PWHC8pdWCSXbv+3BeTjuGk2fBQZQS3dZgO8V9qdq+ygPTmEmAdxnGQ0W1QxJOk3/ 50hBzmwF69c4pBi6HN3KOUivMUqZdIFmtyEwmuAd0ex83GqfSfOMAI+xZ1+e2+Rg65Bo Hg9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740122187; x=1740726987; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Rnzb1lyD3E4wUNMMxEOoLUTcgh+xsoqeA5iZFioH6Vw=; b=w32qij6dBO7kjrgucAbZLPeo44oZbYUsQcV3jhdNXaWoKRYJCIlIq95VXvQXw7ErDN y1DF9Z8nGBRLip8/B9egfPvGrsRvEyvA56k0Y816VZVkA9z4mhknt7z77iWa2t6CKYLD TwC01iW+lp9mY5NMxabf4n/puMwvcmgleCss1zkCUQ6aBfQv1agFfCLJPVubgRhslX/q aR8cktj71kDJ575zq2+vbh/1PkbkH0nfzbz9n9hyV4mND5lSHAFkfDCOKTzX4vnu6Cdi X8+vB8RG9p2FNqRtasMgLKCsiCp9aFFVe50JOg3kcwt7QEcnskWURNVXZfOWy5Aby1Y1 h8Eg== X-Forwarded-Encrypted: i=1; AJvYcCWNGeX0NsSKwT0THw0TXGbqN306I9ctU7DGN00PXc1UNXmAq5GZxpKl4WtpDm+lANEPE37f1Q==@debbugs.gnu.org X-Gm-Message-State: AOJu0Yz6MeKer8kSdi2NG8tysVq5uUV4RRS4laDT8k42hl7HsGcZzytn FHa9nhwxSAud+6ph2zCX/xCS+X0F8Z7tpLW9GbYcpv4qQzA6nmpI X-Gm-Gg: ASbGncvhFSH+UMlNFlUFvJnHHIhIrTw+Sdr0cRMr5r2r+fcps6uqbhZ9th1HX1DKnBG PExC5CVkI16/FUwE+Psz4Qv0B1oQ7/S0BBTXFBuhqdOPvuMywxzda93FTnUCJZ/eqNe23rr/IMQ sqJyWFdbyHNR7loHA9eb1OLzr4pF6VfWGXFVq9rApU8rmFcqrmVywReB/Ugt2kv/iuvPSXIfbpB yA7Pjo7fxyUcgzFw4KUTmvuWe9Uz7B1YyfpTAQFl8Q4WFNz9H2Ulqe1kKqRGDqdRT8p8HSgXRbr 39bfVpBF1Ju1E5Gl/al1DoMO X-Google-Smtp-Source: AGHT+IFHEwYkvIqJVCH7tNARL/QlKSU/r+x51hg882xSu0mCIsuTffKSiAt8WYoqOSfHq6MMBbEPlQ== X-Received: by 2002:a05:600c:4e8d:b0:439:9595:c8e8 with SMTP id 5b1f17b1804b1-439ae189cb3mr17608365e9.0.1740122181294; Thu, 20 Feb 2025 23:16:21 -0800 (PST) Received: from localhost ([31.210.180.71]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-439b0367507sm8325175e9.28.2025.02.20.23.16.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 23:16:20 -0800 (PST) Date: Fri, 21 Feb 2025 09:16:19 +0200 From: Efraim Flashner <efraim@HIDDEN> Message-ID: <Z7goQ2MWRRceTYZO@3900XT> Mail-Followup-To: Vagrant Cascadian <vagrant@HIDDEN>, guix-devel@HIDDEN, 76098 <at> debbugs.gnu.org References: <Z6s6qzMesCT7kuyS@3900XT> <87o6z2afqb.fsf@wireframe> <878qq1a8ss.fsf@wireframe> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="uCh7f4VfEa4VFkkD" Content-Disposition: inline In-Reply-To: <878qq1a8ss.fsf@wireframe> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) --uCh7f4VfEa4VFkkD Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Feb 19, 2025 at 02:06:43PM -0800, Vagrant Cascadian wrote: > On 2025-02-15, Vagrant Cascadian wrote: > > On 2025-02-11, Efraim Flashner wrote: > >> We discussed the next release during Guix Days and I volunteered to le= ad > >> the effort. > ... > > I may just make an attempt at making a git snapshot or something, which > > I did once in the distant past... any recommendations on a particular > > commit to aim at? Even an alpha or release candidate or whatever tag > > would be nice... >=20 > So, in order to try this, the first thing I needed to do was remember > how to run "make dist" to generate the tarball... >=20 > Basically from a clean git checkout: >=20 > guix git tag v1.4.0+XYZ HEAD # I used f7cd085f4a36e118aa05af5524e74830a= 30b3dca > guix git authenticate && \ > guix shell --container --pure --development guix guix git imagemagick p= erl graphviz less -- ./bootstrap && \ > guix shell --container --pure --development guix guix git imagemagick p= erl graphviz less -- ./configure && \ > guix shell --container --pure --development guix guix git imagemagick p= erl graphviz less -- make -j1 dist >=20 > Not sure if that is the "right" way or if there is better > documentation... ? I think there is/was a 'make dist' cuirass job, but I've never actually looked at it closely. The guix.scm and manifest.scm both are in use, but I could see putting together a make-dist.scm manifest, probably in etc/manifests, and then documenting (somewhere) that it exists. Or putting the command in as a comment in the Makefile. > Running "make -j5 dist" failed in various ways... so there are probably > some undefined dependencies. >=20 > graphviz was needed otherwise the bootstrap-graph.pdf failed to build > (graphviz-minimal gets pulled in by "--development guix" but does not > support .pdf generation). >=20 > The other inputs, well, they're just from the last times I tried running > "make dist"! maybe they are no longer needed, maybe the are! >=20 >=20 > The generated tarball also appears to be missing a few files, some of > which seem fine (e.g. .gitignore) but some which actually cause problems > (e.g. missing po4a.cfg, tests/*.scm, gnu/patches/*.patch), some of which > probably should be added to dist_patch_DATA in gnu/local.mk or other > relevent values: >=20 > Only in ../guix-master/build-aux: cuirass > Only in ../guix-master/build-aux: gitlog-to-changelog > Only in ../guix-master: .editorconfig > Only in ../guix-master/etc: copyright.el > Only in ../guix-master/etc: git > Only in ../guix-master/etc: snippets > Only in ../guix-master/etc: teams > Only in ../guix-master/etc: teams.scm > Only in ../guix-master: .gitattributes > Only in ../guix-master: .gitignore > Only in ../guix-master/gnu/packages/patches: cyrus-sasl-ac-try-run-fix.= patch > Only in ../guix-master/gnu/packages/patches: gcc-10-tree-sra-union-hand= ling.patch > Only in ../guix-master/gnu/packages/patches: gegl-compatibility-old-lib= rsvg.patch > Only in ../guix-master/gnu/packages/patches: go-github-com-skip2-go-qrc= ode-fix-tests.patch > Only in ../guix-master/gnu/packages/patches: librewolf-neuter-locale-do= wnload.patch > Only in ../guix-master/gnu/packages/patches: openjdk-15-jtask-reproduci= bility.patch > Only in ../guix-master/gnu/packages/patches: python-pytorch-for-r-torch= -fix-codegen.patch > Only in ../guix-master/gnu/packages/patches: python-pytorch-for-r-torch= -system-libraries.patch > Only in ../guix-master/gnu/packages/patches: rdkit-unbundle-external-de= pendencies.patch > Only in ../guix-master/gnu/packages/patches: tinydir-fix-cbehave-test.p= atch > Only in ../guix-master/gnu/system/examples: bare-hurd64.tmpl > Only in ../guix-master/gnu/system/examples: devel-hurd64.tmpl > Only in ../guix-master/gnu/system/examples: devel-hurd.tmpl > Only in ../guix-master/gnu/tests: lightdm.scm > Only in ../guix-master/gnu/tests: sddm.scm > Only in ../guix-master: .mailmap > Only in ../guix-master: .mumi > Only in ../guix-master/nix: .gitignore > Only in ../guix-master/nix/libstore: .gitignore > Only in ../guix-master: .patman > Only in ../guix-master/po/doc: po4a.cfg > Only in ../guix-master/tests: hexpm.scm > Only in ../guix-master/tests: ipfs.scm I saw a suggestion elsewhere to use pattern globbing for some stuff in the Makefile. I only saw files ending in .patch in gnu/packages/patches, and apparently we have over 1500 files there. I'm guessing we could do something similar with the .tmpl files in gnu/system/examples and perhaps other places too. >=20 > I also fixed a bunch of typos, spelling, grammar, etc. that my workflow > building Guix in Debian detects in various package > synopsis/descriptions, and seem to have inspired others to do the same! > :) The package python-codespell has the codespell binary, and is something I use occasionally to find typos. > In this process I also found a bug that caused "make dist" to fail due > to embedded store paths, and pushed a fix to guix.git as > 0626f567378cf549fd097f3c3372fa498000a8a3. >=20 >=20 > Also, in reviewing the copyright and license headers while packaging for > Debian, this raised a broader question about translating license headers > in files such as doc/guix.de.info: >=20 > https://salsa.debian.org/debian/guix/-/blob/debian/latest/doc/guix.de.i= nfo#L93 >=20 > With my limited german, it is clearly a header to declare the file is > released under the GFDL in some form, but I wonder if that is a good > idea to translate the license headers ... as at least in the US, in > order to ship that file I would maybe need to at least consult with a > lawyer (the US only recognizes English for legal documents), and I > suspect various other countries might need something similar for > arbitrary languages... having to get a lawyer involved kind of kills the > joy of free software and the goal of free distribution... >=20 > This of course touches on some awful issues around language > imperialism. :/ >=20 >=20 > live well, > vagrant --=20 Efraim Flashner <efraim@HIDDEN> =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --uCh7f4VfEa4VFkkD Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAme4KEMACgkQQarn3Mo9 g1G9QRAAp7ouGz+2pttpeoU+OiZFI6minroqM8orXkQZWLFaWm8AF3PNrDVBAdUU H+enPsFuhNahBY/ososP3bz0Vm0cFVOfGd4Y11Hb0Eyc2zpHdHcV1wqj6dOnG5ej 63zLHdyOXGsBVLu9Jqpyb5MAxrvDBftersrEtb0W2LaKn8+HWog+fJxGWaW2nYOB Ub+xp+Dd0xA+X0vCFhj4bGJ2Wphem2KfBLunvzlIHBUT/oozY5wKC2GnKrtFM/E/ VvwsensXm3AOJDbVa4sTYOoudd6t1YMWkmTvkz3jnihWo9nYKMp9JDVeN3rQshCm 7XW+qYAKoLs2sMrStuyJMx0Qc30yTpa7ekhPWJ974fiLUcLDPtGQttzPOgtvaeNX z36/RkMky3FlQIqoqOpmCAGnwOJbbXP/1FAT4uu/sY796Wqo/1HxzCXRMlijtUdn 4m1QFq0HFgmQcN8sqyEpYHXFYbXG48p60UWo/GNNuFuPJXuF1TLzeGaSI/Hel2zA SGMnATR0+LI+Gw/hyaOh/wGmj9Sdzvy3fGSpkkRR6JV27Z5rm1si4sE/Pz2pKrIK Ieuom1OousVLlAWpZCZSf63FkIBLous520ZIis9hl5FjWN+9PvUH+lRovXbcboUY fBXHf89yOfjvhyzhC1QpLkNLNeFNK97LqAGlPsy1CUxoTMkbgMU= =DP5+ -----END PGP SIGNATURE----- --uCh7f4VfEa4VFkkD--
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] [PATCH v2 4/5] etc: manifests/release: Only check for packages needed in the installer. Resent-From: Efraim Flashner <efraim@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Fri, 21 Feb 2025 08:14:02 +0000 Resent-Message-ID: <handler.76098.B76098.174012559630631 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76098 <at> debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN> Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.174012559630631 (code B ref 76098); Fri, 21 Feb 2025 08:14:02 +0000 Received: (at 76098) by debbugs.gnu.org; 21 Feb 2025 08:13:16 +0000 Received: from localhost ([127.0.0.1]:52151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tlO9r-0007xt-GT for submit <at> debbugs.gnu.org; Fri, 21 Feb 2025 03:13:16 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:56737) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <efraim.flashner@HIDDEN>) id 1tlO9n-0007wc-Hq for 76098 <at> debbugs.gnu.org; Fri, 21 Feb 2025 03:13:13 -0500 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-38f504f087eso1526991f8f.1 for <76098 <at> debbugs.gnu.org>; Fri, 21 Feb 2025 00:13:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740125585; x=1740730385; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=+n2tWzefbIlqeqzJBZdL8rlgSQLzLFg6C5qdaZb8R88=; b=JOhlU/kVzN8E1qrJ/mtEzPlBAvqK8vVtYw7WiVTMtX9Bs+kGtu46hWazTJMK0NuGcZ Zc6oOcygcvrbTNsALtzXzD8TRNDNtmT3mdnQXeNXiIOCakaVocTrfB7q5PX/m8LMghtw GDkgwcX7ebghiVERYDICL1mznduelkPkm2eKriwbqWaWpp/vLpzB6HlFV2JTJdTbr3C7 /Bfc5ftFodSmJfHvrJMDOA5TUvr0iF4d5q4XyYXf1Vm+hFUpxVridNPtA0jC298kVXFZ e6+zFzeCQj0I3ST7ZAm+FXPRIBn8UysH51Xp41yp0OnxkgpsWXHiXqPlmJIIg5Pimbiq ZD0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740125585; x=1740730385; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+n2tWzefbIlqeqzJBZdL8rlgSQLzLFg6C5qdaZb8R88=; b=TQmyr4DUvdI8y7O4oVrvothjlQGljOXTqCrlD8syKHJL27B9UVt12oUNspPfvaAKaK +wXC5PV85/d5jwniVcjQ7adAOTrto8YVXLx606ScbTylaBWVd0OqXf/Bplodwcr60nQw HKIPfsk/dtuVkAO9/WIbfrvxZfv0tFuGWPQYGbI593jvGRZuON1/Mb4ulNR74FkWpZbX 08yOfgUBBXq8l86Q/MlNT5Zo+varirfAXguYxMpEd92ji7WwBUoUSJOIEFetYp4iZNQD PpmKNsMTajNuKPsf5oPELDzdoSiY19jSe1jyk+MkK61PQs6kqPOXNZWXEgK1n8/uOEMA IhIQ== X-Gm-Message-State: AOJu0YzrTW69pRc3B8NwXVciUMA91GBo4qm8D1Hoa8Lo0fTErAWixZs9 7sT81Am0lYJZSbQOJd+tiC/zf3pb0vZoUK99Jp5/SjCF+L9q/fHKg7TnL3kv X-Gm-Gg: ASbGncsriWZIDpoEr0pliAnRz7PqXyUkZsfeaNVawg9Hnk8ntd/BDEqPW+9ya1MFDXn OyFij4zFFq/x1oOoDFzS4cDE4N5y4bT0xlvXTWutas1Xvlz26ii5cnON3Jxbr2ae+yyBWO1jWqI HiSHE6iIqIBM8DedE9WeylU2s9OgtRbO8obBG/DVXB3x6ZRY7n1ox6aOVC/qbBP07Fj9rcBOI/i 1bcoJ2Cnf+l+hU0fGeCiggIRCHkl5Zao3F4R7b8gnYqwYm9JGHQrwWleAmibhqjfd2jhG4go3BJ irwct7aAB8Z7qEImlT+OZC67 X-Google-Smtp-Source: AGHT+IHtp4s+X5odaKpf7P1THSKc9iNHlI1pWWheuP9rdkjuG+cqkBrIbJmG9+ByqOpDhap6pupxcw== X-Received: by 2002:a05:6000:1f84:b0:38d:bd82:2f9 with SMTP id ffacd0b85a97d-38f6f09b8e8mr2021437f8f.43.1740125584849; Fri, 21 Feb 2025 00:13:04 -0800 (PST) Received: from localhost ([31.210.180.71]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-439b02d8859sm9589685e9.16.2025.02.21.00.13.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Feb 2025 00:13:03 -0800 (PST) Date: Fri, 21 Feb 2025 10:13:02 +0200 From: Efraim Flashner <efraim@HIDDEN> Message-ID: <Z7g1jjKpFB3euWes@3900XT> Mail-Followup-To: Efraim Flashner <efraim@HIDDEN>, 76098 <at> debbugs.gnu.org, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN> References: <cover.1740054626.git.efraim@HIDDEN> <eecfbed834b434db6d5edfc375df047207620aba.1740054627.git.efraim@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ZJGx7AZTmTw7IQN3" Content-Disposition: inline In-Reply-To: <eecfbed834b434db6d5edfc375df047207620aba.1740054627.git.efraim@HIDDEN> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) --ZJGx7AZTmTw7IQN3 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Feb 20, 2025 at 02:39:53PM +0200, Efraim Flashner wrote: > * etc/manifests/release.scm (%system-packages): Adjust the packages > which are depended upon by the installer. Add a set of extra packages > which we expect to have available. > (%base-packages, %base-packages/armhf, %base-packages/hurd, > %packages-to-cross-build, %packages-to-cross-build-for-mingw, > %cross-bootstrap-targets, %base-manifest, %cross-manifest, > %cross-bootstrap-manifest): Remove variables. >=20 > Change-Id: I5806fff6bc38d14859f6d7163719841620e28d09 > --- > etc/manifests/release.scm | 155 ++++++++------------------------------ > 1 file changed, 33 insertions(+), 122 deletions(-) >=20 > diff --git a/etc/manifests/release.scm b/etc/manifests/release.scm > index b003f216fff..f69ab316ca4 100644 > --- a/etc/manifests/release.scm > +++ b/etc/manifests/release.scm > @@ -2,6 +2,7 @@ > ;;; Copyright =C2=A9 2020-2022, 2024 Ludovic Court=C3=A8s <ludo@HIDDEN> > ;;; Copyright =C2=A9 2020 Jan (janneke) Nieuwenhuizen <janneke@HIDDEN> > ;;; Copyright =C2=A9 2023 Andreas Enge <andreas@HIDDEN> > +;;; Copyright =C2=A9 2025 Efraim Flashner <efraim@HIDDEN> > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -18,18 +19,13 @@ > ;;; You should have received a copy of the GNU General Public License > ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. > =20 > -;;; This file returns a manifest containing release-critical bit, for al= l the > -;;; supported architectures and cross-compilation targets. > +;;; This file returns a manifest containing packages which are needed by= the > +;;; installer. > =20 > -(use-modules (gnu packages) > - (guix packages) > - (guix profiles) > - ((guix platform) #:select (targets)) > +(use-modules (guix packages) > ((gnu services xorg) #:select (%default-xorg-modules)) > (guix utils) > - (guix gexp) > - (srfi srfi-1) > - (srfi srfi-26)) > + (srfi srfi-1)) > =20 > (define* (package->manifest-entry* package system > #:key target) > @@ -45,131 +41,46 @@ (define* (package->manifest-entry* package system > (%current-target-system target)) > package)))) > =20 > -(define %base-packages > - ;; Packages that must be substitutable on all the platforms Guix suppo= rts. > - (map specification->package > - '("bootstrap-tarballs" "gcc-toolchain" "nss-certs" > - "openssh" "emacs" "vim" "python" "guile" "guix"))) > - > -(define %base-packages/armhf > - ;; The guix package doesn't build natively on armhf due to Guile memory > - ;; issues compiling the package modules > - (remove (lambda (package) > - (string=3D? (package-name package) "guix")) > - %base-packages)) > - > -(define %base-packages/hurd > - ;; XXX: For now we are less demanding of "i586-gnu". > - (map specification->package > - '("coreutils" "grep" "findutils" "gawk" "make" > - #;"gcc-toolchain" "tar" "xz"))) > - > (define %system-packages > ;; Key packages proposed by the Guix System installer. > (append (map specification->package > - '("xorg-server" "xfce" "gnome" "mate" "enlightenment" > - "openbox" "awesome" "i3-wm" "ratpoison" > + '("guix" > + "gnome" "xfce" "mate" "enlightenment" > + "openbox" "awesome" > + "i3-wm" "i3status" "dmenu" "st" > + "ratpoison" "xterm" > "emacs" "emacs-exwm" "emacs-desktop-environment" > - "xlockmore" "slock" "libreoffice" > - "connman" "network-manager" "network-manager-applet" > - "openssh" "ntp" "tor" > - "linux-libre" "grub-hybrid" > - "icecat")) > + "openssh" "tor" "ntp" "gpm" > + "connman" "network-manager" "wpa-supplicant" "isc-dhcp"= "cups" > + "linux-libre" "grub-hybrid")) > %default-xorg-modules)) > =20 > -(define %packages-to-cross-build > - ;; Packages that must be cross-buildable from x86_64-linux. > - ;; FIXME: Add (@ (gnu packages gcc) gcc) when <https://bugs.gnu.org/40= 463> > - ;; is fixed. > - (append (list (@ (gnu packages guile) guile-3.0/pinned)) > - (map specification->package > - '("coreutils" "grep" "sed" "findutils" "diffutils" "patch" > - "gawk" "gettext" "gzip" "xz" > - "hello" "zlib")))) > - > -(define %packages-to-cross-build-for-mingw > - ;; Many things don't build for MinGW. Restrict to what's known to wor= k. > - (map specification->package '("hello"))) > - > -(define %cross-bootstrap-targets > - ;; Cross-compilation triplets for which 'bootstrap-tarballs' must be > - ;; buildable. > - '("i586-pc-gnu" > - "arm-linux-gnueabihf" > - "aarch64-linux-gnu")) > - > =0C > ;;; > ;;; Manifests. > ;;; > =20 > -(define %base-manifest > - (manifest > - (append-map (lambda (system) > - (map (cut package->manifest-entry* <> system) > - (cond ((string=3D? system "i586-gnu") > - %base-packages/hurd) > - ((string=3D? system "armhf-linux") > - %base-packages/armhf) > - ((string=3D? system "powerpc64le-linux") > - ;; FIXME: Drop 'bootstrap-tarballs' until > - ;; <https://bugs.gnu.org/48055> is fixed. > - (drop %base-packages 1)) > - (else > - %base-packages)))) > - %cuirass-supported-systems))) > - > (define %system-manifest > (manifest > - (append-map (lambda (system) > - ;; Some of %SYSTEM-PACKAGES are currently unsupported o= n some > - ;; systems--e.g., GNOME on non-x86_64, due to Rust. Fi= lter > - ;; them out. > - (filter-map (lambda (package) > - (and (supported-package? package system) > - (package->manifest-entry* package sy= stem))) > - %system-packages)) > - '("x86_64-linux" "i686-linux")))) ;Guix System > + (append > + ;; The linux-libre-*-generic kernel is commonly used on some archi= tectures. > + (cond These 3 need to be wrapped in a list > + ((target-aarch64?) > + (package->manifest-entry (@ (gnu packages linux) > + linux-libre-arm64-generic))) > + ((target-riscv64?) > + (package->manifest-entry (@ (gnu packages linux) > + linux-libre-riscv64-generic))) > + ((target-arm32?) > + (package->manifest-entry (@ (gnu packages linux) > + linux-libre-arm-generic))) > + (else '())) > =20 > -(define %cross-manifest > - (manifest > - (append-map (lambda (target) > - (map (cut package->manifest-entry* <> "x86_64-linux" > - #:target target) > - (if (target-mingw? target) > - %packages-to-cross-build-for-mingw > - %packages-to-cross-build))) > - (fold delete (targets) > - '(;; Like in (gnu ci), dismiss cross-compilation to= x86: > - ;; it's pointless. > - "x86_64-linux-gnu" > - "i686-linux-gnu" > + ;; Some of %SYSTEM-PACKAGES are currently unsupported on some > + ;; systems--e.g., GNOME on 32-bit, due to Rust. Filter them out. > + (filter-map (lambda (package) > + (and (supported-package? package (%current-system)) > + (package->manifest-entry package))) > + %system-packages)))) > =20 > - ;; Ignore obsolete systems, as in (gnu ci). > - "mips64el-linux-gnu" > - "powerpc-linux-gnu" > - "powerpc64-linux-gnu" > - > - ;; Ignore bare-metal targets. > - "avr" > - "or1k-elf" > - "xtensa-ath9k-elf" > - > - ;; XXX: Important bits like libsigsegv and libffi= don't > - ;; support RISCV at the moment, so don't require = RISCV > - ;; support. > - "riscv64-linux-gnu"))))) > - > -(define %cross-bootstrap-manifest > - (manifest > - (map (lambda (target) > - (package->manifest-entry* > - (specification->package "bootstrap-tarballs") > - "x86_64-linux" #:target target)) > - %cross-bootstrap-targets))) > - > -;; Return the union of all three manifests. > -(concatenate-manifests (list %base-manifest > - %system-manifest > - %cross-manifest > - %cross-bootstrap-manifest)) > +%system-manifest > --=20 > Efraim Flashner <efraim@HIDDEN> =D7=90=D7=A4=D7=A8=D7=99=D7= =9D =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 > GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 > Confidentiality cannot be guaranteed on emails sent or received unencrypt= ed >=20 --=20 Efraim Flashner <efraim@HIDDEN> =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --ZJGx7AZTmTw7IQN3 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAme4NY0ACgkQQarn3Mo9 g1H+lA/+NpNpN4NRR+644drN3hKGBX/NZfIC+kLIzDdmWLGfatRQueoR/zTLscFM et5/st0xj2G+hM8IJVWXiMHXcJ3qy9iU0o2RnwU4UZ5oq7tl64SQ+9ic2xej0+ZI S9r0s1c8eVrbOahn8EAh/udGo6MkWLV2lnoMCsjU0Fcb1WpADvXh0nQSPOXQbEtS gk2G5so8AcY0e3oiaH2frjTsKFsZkvwxLaYK1oHdeZwUAPmjaoHGnbIerIFg3FAp 1jN6yISl2Onv3mOA5nsvUbuG/Ouo+MWOp8HD6vkmQUPMyvbevg4xZUnfCH3SDFf+ EPpoKXSXz0OU52+wa5zCVmH2hEKR1g1hZdFkDUUuB+2FfwghjBvidr6U0Gjz9agm i1i6YXV3xvNz8oTon/0OQ9nACR9NStD5XqF77UlF74i2Pr6nLjrBn/QY/TIxI/GU YBUiZQ9qS3BpJdGqi9SvjIgnbi6TxJHLHsYSocfI6xoJTR/A6143XOr6O5C1Dd5h l3EZgC8bUAKdpkcQ12+psJZ+Adg5Sua1op/cL1zv13pDM514wxmL3pJSJNdz1U7o E0pp+xkYYo2PcC2nigW1ileGgbUUrIQHl+jpP4F4FpVkq0C/9mY0V5hi9mDmAsUL VXoeBlz3ASIgdqabpx5iKDNjcxrxrkabf52n3H5YOXAMK8pVRd0= =O5Fg -----END PGP SIGNATURE----- --ZJGx7AZTmTw7IQN3--
X-Loop: help-debbugs@HIDDEN Subject: [bug#76098] make dist and related fun Resent-From: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Fri, 21 Feb 2025 11:15:03 +0000 Resent-Message-ID: <handler.76098.B76098.174013645718647 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Vagrant Cascadian <vagrant@HIDDEN> Cc: guix-devel@HIDDEN, 76098 <at> debbugs.gnu.org, Efraim Flashner <efraim@HIDDEN> Received: via spool by 76098-submit <at> debbugs.gnu.org id=B76098.174013645718647 (code B ref 76098); Fri, 21 Feb 2025 11:15:03 +0000 Received: (at 76098) by debbugs.gnu.org; 21 Feb 2025 11:14:17 +0000 Received: from localhost ([127.0.0.1]:54986 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tlQz2-0004qa-A8 for submit <at> debbugs.gnu.org; Fri, 21 Feb 2025 06:14:17 -0500 Received: from relay.yourmailgateway.de ([188.68.63.166]:47915) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <pelzflorian@HIDDEN>) id 1tlQyz-0004pz-0A for 76098 <at> debbugs.gnu.org; Fri, 21 Feb 2025 06:14:14 -0500 Received: from mors-relay-8202.netcup.net (localhost [127.0.0.1]) by mors-relay-8202.netcup.net (Postfix) with ESMTPS id 4YzmnF2qyGz3xlG; Fri, 21 Feb 2025 11:38:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1740134305; bh=Or69T7mMcVL+MqHM3gatGKE8WVQ0w/UdsSRe2X/xtN4=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=NI+oxTU+BwEhmTDgZzMv6If7ug0PRMNMIBKxkhQF+gzJ9al1h6mtntCp7aDCk9zb1 D2sLX1NYpY4EwyRHs+dSU71Y1rp0PcRJDIpJQDXoNfY4QUTo8cR+8mh31ZjS86xv2L /F+h+hIXME4gJZZ64zfrh3Ix1uSEQwAWHl1Vb9G7Aq3Ja+krKGwQh4pe964mJvnGF0 3xDLD/t6l8nKyFbK55CfSJ7OqACVik122TY6X8qHO2Hn65MFYYeTylUqCGqnCrzRui 35EP677ej20Bl1szAmJ2UpojsrogsA0AC2gjGORoZviSPQWA/PXa/wGYYbNwiBQNIc p+BQ9JBhXBHCg== Received: from policy01-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8202.netcup.net (Postfix) with ESMTPS id 4YzmnF26pxz3xgC; Fri, 21 Feb 2025 11:38:25 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at policy01-mors.netcup.net X-Spam-Flag: NO X-Spam-Score: -2.898 X-Spam-Level: X-Spam-Status: No, score=-2.898 required=6.31 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9, URIBL_BLOCKED=0.001, URIBL_DBL_BLOCKED_OPENDNS=0.001] autolearn=ham autolearn_force=no Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy01-mors.netcup.net (Postfix) with ESMTPS id 4YznZR5NdSz8tY0; Fri, 21 Feb 2025 12:14:06 +0100 (CET) Received: from florianhp (ipb21a5dbf.dynamic.kabel-deutschland.de [178.26.93.191]) by mxe217.netcup.net (Postfix) with ESMTPSA id 376BB83BFC; Fri, 21 Feb 2025 12:13:58 +0100 (CET) From: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN> In-Reply-To: <878qq1a8ss.fsf@wireframe> (Vagrant Cascadian's message of "Wed, 19 Feb 2025 14:06:43 -0800") References: <Z6s6qzMesCT7kuyS@3900XT> <87o6z2afqb.fsf@wireframe> <878qq1a8ss.fsf@wireframe> Date: Fri, 21 Feb 2025 12:14:14 +0100 Message-ID: <87ldtzzh15.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 376BB83BFC X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: QupM9xa6u9lvgm5XPXislqNCcl5Of2HvC1hU6R9MhMaW23ATfm1MQTAl X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hello Vagrant. Vagrant Cascadian <vagrant@HIDDEN> writes: > Also, in reviewing the copyright and license headers while packaging for > Debian, this raised a broader question about translating license headers > in files such as doc/guix.de.info: > > https://salsa.debian.org/debian/guix/-/blob/debian/latest/doc/guix.de.i= nfo#L93 > > With my limited german, it is clearly a header to declare the file is > released under the GFDL in some form, but I wonder if that is a good > idea to translate the license headers ... as at least in the US, in > order to ship that file I would maybe need to at least consult with a > lawyer (the US only recognizes English for legal documents), and I > suspect various other countries might need something similar for > arbitrary languages... having to get a lawyer involved kind of kills the > joy of free software and the goal of free distribution... > > This of course touches on some awful issues around language > imperialism. :/ > > [=E2=80=A6] > For clarity, the US does recognize contracts and whatnot under other > languages, but requires a *certified* translation of the document into > English, which may also require getting legal counsel and in my opinion, > kind of defeats the purpose of free software at that point... as one > cannot freely share it without fear of undue legal burdens... >=20 > At least, that is my entirely not-a-lawyer concern... >=20 > Since this is only shipped in this form whe running "make dist" > ... well, seems relevent for the release process. :) >=20 > live well, > vagrant We should translate license notices. It is harmless. My German translation of the GFDL header is derived from unofficial translations of older GFDL version 1.2, linked at German Wikipedia and clearly uncertified. IANAL neither, but my defense of the current translated license headers in manual, website and such would be that translated manual, website are clearly marked as a translation in the first paragraph or website header. Clearly the original license applies and in some sentences the translator also has copyright. More clearly, deviation from the license text in translations is an error. The full English license is still part of doc/guix.de.info and other languages. So the English license would likely apply. Generally translation seems not to be a source of dispute in court. I believe I remember in court cases of Software Freedom Conservancy, all parties agreed to use an unofficial German GPL translation. So generally translation seems not to be a source of dispute. But I could not anymore find example cases. It was not the VMWare lawsuit. Regards, Florian
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.