From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id cH4QK+EvR2D1IgAA0tVLHw (envelope-from ) for ; Tue, 09 Mar 2021 08:20:49 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id cPZZJuEvR2DrOwAA1q6Kng (envelope-from ) for ; Tue, 09 Mar 2021 08:20:49 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1032127607 for ; Tue, 9 Mar 2021 09:20:49 +0100 (CET) Received: from localhost ([::1]:47868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJXbj-0004qS-Ue for larch@yhetil.org; Tue, 09 Mar 2021 03:20:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJXbM-0004qK-1N for guix-devel@gnu.org; Tue, 09 Mar 2021 03:20:24 -0500 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]:42774) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJXbK-00058o-B9 for guix-devel@gnu.org; Tue, 09 Mar 2021 03:20:23 -0500 Received: by mail-pf1-x436.google.com with SMTP id e26so325743pfd.9 for ; Tue, 09 Mar 2021 00:20:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=kJkWQgFMx73qct+x7j426I49SBFdTk9czWcxMD22Lh0=; b=eC7uJCRXBkYn6+LFAoOK8hVzxlcUZDbE2iX3hQC3Au20DptV+PtmuetWe6cIktSQWp HJFOeJrCL0kCDrj41rg4Tj0kktKr6wDO6DMUNfPuxEqF755Z2SLmR8oOO7Sabj6sB+V4 0WSk/uex9Ji568zFbvewqvf5/llsz+nDs1s51znhTqkVlm2mBLm+DcPV27iKpFQHkHnd G1NlViSAsurr5BJWUOoWqtYJAUewsdbxVhvAnlWMGhxrGdmLrS/4Mz1QjVSXKJWWktJx winKPz58Gj93BOFngrO7wvrBsNBQuYkV/o126L06aNlrpaxrUI+XSkajwnMHOsT9E87I pgfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=kJkWQgFMx73qct+x7j426I49SBFdTk9czWcxMD22Lh0=; b=s4eUclc0I459aIdV65J7MglYVr7AowH+7XTAqRK4KpjeB3+ByqkQhZWEqkE2uIBiS7 Jf+ZyOj0cL6q+lkomk/aloCDnnbr6/l4POyZFav7PsHdod0gTkrZaTfJRVRDTqSlPhiO mbfjdlXzhSS55axObHvdpsk/XiYF86t4o+riL1oxl3ktL4hb1HwBR1I1bESdnkP0tGKB R39MWBH8G7YgE8VZsuGw2tNcduJ9L2zl9/b+rSy87DYjM5k388qDUo3bNddaacQHYTcS S6dJ4BvCw+Qpo92C6GRd3RTEfvEdpj24Sjl1InGil6nJz3loTKq0cT8DkJAyIRVokGnW oAXw== X-Gm-Message-State: AOAM533neIQXiTcAspz2ExkCuuPMmHKXF/n6LAo/Z/Kxxz/Qr0GbPYmD xopRzB19JMsx0scYksGQcDsyvMg0dyE9wA== X-Google-Smtp-Source: ABdhPJxxiJMLjAg4iGPMYCcv9lkVgdPhek5fWazQbNese+Qw9Uy71rf2QpdKBIfel6w7rSr5MuxXnA== X-Received: by 2002:aa7:90c5:0:b029:1e3:5e84:4a7c with SMTP id k5-20020aa790c50000b02901e35e844a7cmr24247267pfk.71.1615278020057; Tue, 09 Mar 2021 00:20:20 -0800 (PST) Received: from garuda-lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id z8sm1864582pjr.57.2021.03.09.00.20.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Mar 2021 00:20:19 -0800 (PST) From: Chris Marusich To: Mark H Weaver , Ricardo Wurmus , Christopher Baines , Leo Famulari Subject: Re: core-updates: Emacs is only supported on x86_64-linux? References: <87a6rf5rd6.fsf@gmail.com> <87a6rf5rd6.fsf@gmail.com> <87r1krgs10.fsf@netris.org> <87a6rf5rd6.fsf@gmail.com> <87r1krgs10.fsf@netris.org> <874khm5pab.fsf_-_@gmail.com> <87a6rf5rd6.fsf@gmail.com> <87r1krgs10.fsf@netris.org> <874khm5pab.fsf_-_@gmail.com> <87sg56i55h.fsf@netris.org> <87a6rf5rd6.fsf@gmail.com> <87r1krgs10.fsf@netris.org> <874khm5pab.fsf_-_@gmail.com> <87sg56i55h.fsf@netris.org> <87zgzc50db.fsf_-_@gmail.com> Date: Tue, 09 Mar 2021 00:20:15 -0800 In-Reply-To: <87zgzc50db.fsf_-_@gmail.com> (Chris Marusich's message of "Mon, 08 Mar 2021 22:04:16 -0800") Message-ID: <87v9a04u2o.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Received-SPF: pass client-ip=2607:f8b0:4864:20::436; envelope-from=cmmarusich@gmail.com; helo=mail-pf1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, 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-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: guix-devel@gnu.org Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1615278049; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=kJkWQgFMx73qct+x7j426I49SBFdTk9czWcxMD22Lh0=; b=l+snKTXqnpN95ZklbxiqLfpUN+kClCSHd5F8RdHMI1fzXTjTucuo5TZBfM63DhxwcEiYb7 TEwbdl2plEV4JuwQtdW01I2FcPayIWKFvjvFJVnZeseOJZ0SKnwNSy/gT+8pyeFKcFDudh ORyV7RLmpre0xtrHOQ/pNKDpffHghAQZqCWs07bFQHqI06PJiPG2um1/E8A7rQ+POG2Spd EubqWt6oWzMJw7qtNt74Cm0ZbLWTtiqrGFHbfPYkefC3Y5eY+BbsfE1MsuhwbrIXGQXuTI Dfs6pZBVnKZzyWyx5HabBer8xSS7efy6oOj9aqYY0tWlhBRDdKbPuej1xbH5yg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615278049; a=rsa-sha256; cv=none; b=cE5sReYapyw2Wv7BMzSc18fywltAL3Sxn09bc63zpYLHsbskpp/UHMTCO7DB8j1u62BRUA CItKyB97+C3itzmYbFxtppJUsVaWakzIqfMSR8Efc6y6GjTtboc92fDQTz/tK/i0bNWnTN QYQADcCDxONy+da2dsCKfoJuknGAZAI1WoI3EazbA3kUfdsFF19l/u7WPKIXkeizdDS0Hj bma/G8iiPKoHUabAoUvjGSD+lwCFImOdnMdY4is4hwyCN5UDbDIlgGNs79NRJetaA/Qhmb r/8tkOgND/4xBgX3kQAsC5rW7ncCZSa1IgnAGAGTvFdRoeQBFl6q2lvCPFJJ8w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=eC7uJCRX; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Migadu-Spam-Score: -1.68 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=eC7uJCRX; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Migadu-Queue-Id: 1032127607 X-Spam-Score: -1.68 X-Migadu-Scanner: scn1.migadu.com X-TUID: SCYWmdHEc35Q --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Chris Marusich writes: > How about a patch like the following - would it be acceptable to you? Actually, I've realized that that patch wasn't quite right. I've attached a corrected version to this email. Although the %current-system parameter will look like "x86_64-linux" because it's a Guix system name, the %current-target-system parameter will look like "x86_64-linux-gnu" (or whatever the user happens to supply, e.g. via the --target option of "guix build") because it's a GNU triplet. The attached patch accomplishes the same goal as before, but it uses string-prefix? to check whether we're building for an x86_64 machine, rather than matching on an exact string. =2D-=20 Chris --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-Restore-emacs-supported-systems.patch Content-Transfer-Encoding: quoted-printable From=200eb5583f243a399293ae52a3e78ccf7d3a153a47 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Mon, 8 Mar 2021 23:13:39 -0800 Subject: [PATCH] gnu: Restore emacs' supported systems. Recently, librsvg was updated to depend upon rust. That change inadvertent= ly restricted the "supported" systems of emacs (among other package) to x86_64-linux only, since that is the only system declared in the rust package's list of supported systems. This unintentionally made emacs unavailable on all other systems. This change fixes that by removing the rust dependency from some packages. The packages remain unchanged from the perspective of an x86_64-linux syste= m, but from the perspective of other systems, the packages are now supported again (albeit without certain optional SVG features). * gnu/packages/gtk.scm (gtk+, gtk+-2)[propagated-inputs]: If compiling for x86_64, use gdk-pixbuf+svg as the "gdk-pixbuf" input, as usual. Otherwise, use gdk-pixbuf, which avoids adding librsvg (thus rust) to the closure of inputs. Note that both gtk+ and gtk+-2 are in the transitive closure of inputs of emacs, so these two changes are necessary. * gnu/packages/emacs (emacs)[inputs]: If compiling for x86_64, add librsvg = to the inputs, as usual. Otherwise, do not add it, which avoids adding rust to the closure of inputs. =2D-- gnu/packages/emacs.scm | 8 +++++++- gnu/packages/gtk.scm | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 98061c93ae0..fe5b3b25b3d 100644 =2D-- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -71,6 +71,7 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix utils) + #:use-module (ice-9 match) #:use-module (srfi srfi-1)) =20 (define-public emacs @@ -236,7 +237,12 @@ ("libpng" ,libpng) ("zlib" ,zlib) =20 =2D ("librsvg" ,librsvg) + ;; librsvg is an optional dependency that pulls in rust. Rust is n= ot + ;; supported well on every architecture yet. + ,@(if (string-prefix? "x86_64" (or (%current-target-system) + (%current-system))) + `(("librsvg" ,librsvg)) + '()) ("libxpm" ,libxpm) ("libxml2" ,libxml2) ("libice" ,libice) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f458366fb6a..d396425d9a6 100644 =2D-- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -776,7 +776,12 @@ is part of the GNOME accessibility project.") (outputs '("out" "bin" "doc")) (propagated-inputs `(("atk" ,atk) =2D ("gdk-pixbuf" ,gdk-pixbuf+svg) + ;; SVG support is optional and requires librsvg, which pulls in rust. + ;; Rust is not supported well on every architecture yet. + ("gdk-pixbuf" ,(if (string-prefix? "x86_64" (or (%current-target-sys= tem) + (%current-system))) + gdk-pixbuf+svg + gdk-pixbuf)) ("pango" ,pango))) (inputs `(("cups" ,cups) @@ -843,7 +848,12 @@ application suites.") (propagated-inputs `(("at-spi2-atk" ,at-spi2-atk) ("atk" ,atk) =2D ("gdk-pixbuf" ,gdk-pixbuf+svg) + ;; SVG support is optional and requires librsvg, which pulls in rust. + ;; Rust is not supported well on every architecture yet. + ("gdk-pixbuf" ,(if (string-prefix? "x86_64" (or (%current-target-sys= tem) + (%current-system))) + gdk-pixbuf+svg + gdk-pixbuf)) ("libepoxy" ,libepoxy) ("libxcursor" ,libxcursor) ("libxi" ,libxi) =2D-=20 2.26.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEy/WXVcvn5+/vGD+x3UCaFdgiRp0FAmBHL78ACgkQ3UCaFdgi Rp22URAAqLOSPCnQfIf50L9DUem4pIwH6a1LNa/6nDjpuBM5C1aXwA7HsJTYxfxt t+2N0+UB6LS1745kVGg/h3hsoIEONLUY7JfQVW02EnfIxmnJpUk90MZAhbcLDfJz aLGvo3d3VHu9rC1jIf+y6iLNa+GtMGNewyGfqKepWSUJ37VgmhJZgQPsKKZT1lFl Z6XKpZN/0Pni8l0pi88F0QeJtup1SjVyPfajhRozrHlczjcAWnX4vUByoTxSFvsy AaeGBM6JLYjpT2GX9sVeKakc+AZw1kasFCNy+BmyTPmk+GYaHpUBkY0KCIDHhnu7 apCYuOGwQekUrngNlUJkHsPqp3hXcrPPPKjpLIMV/BbrSMdwjxzuL6WsYN25knoW InEMpoiN47vZf/A35J6U90mDBOzSgtlQt7VZ0f7vg57b96BF3tWjqGI1J4/KrvlO T3PHuh6pDJhnwNUeoblCvl55VHo5KRVrh+7EpsJS9/aeHzVomf8+uS7d4dZCmtHW 0ttnO5tHa2AkIWX0+JfY1VqlHTsZejn7+A4YPzyKE8sMDAB2Fb5PAmICX+dzMbr2 oJblQqOY7Jm1fpC8z3k+szqoMcD7j+2lGt8xWRiROsQuWUCVEqIYb0hiFF6GmTsq +6tgjA9vqHOwxT61boFEtUgTEUbid/Ns/jdZf/+h95RMUMPbBbU= =S2MP -----END PGP SIGNATURE----- --==-=-=--