From patchwork Sat Mar 6 08:05:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 27469 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4743627BC50; Sat, 6 Mar 2021 08:07:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3BD7427BC51 for ; Sat, 6 Mar 2021 08:07:15 +0000 (GMT) Received: from localhost ([::1]:59952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lIRxy-0003eq-D4 for patchwork@mira.cbaines.net; Sat, 06 Mar 2021 03:07:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIRxo-0003ec-DS for guix-patches@gnu.org; Sat, 06 Mar 2021 03:07:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:52632) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lIRxl-0004Mj-S5 for guix-patches@gnu.org; Sat, 06 Mar 2021 03:07:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lIRxl-0005Qu-NS for guix-patches@gnu.org; Sat, 06 Mar 2021 03:07:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46960] [PATCH]: Fix monad (and emacsy-minimal) build Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 Mar 2021 08:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46960 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46960@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161501797520827 (code B ref -1); Sat, 06 Mar 2021 08:07:01 +0000 Received: (at submit) by debbugs.gnu.org; 6 Mar 2021 08:06:15 +0000 Received: from localhost ([127.0.0.1]:35945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lIRx0-0005Pq-N0 for submit@debbugs.gnu.org; Sat, 06 Mar 2021 03:06:14 -0500 Received: from lists.gnu.org ([209.51.188.17]:33312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lIRwy-0005Ph-Om for submit@debbugs.gnu.org; Sat, 06 Mar 2021 03:06:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIRwy-0003aU-7z for guix-patches@gnu.org; Sat, 06 Mar 2021 03:06:12 -0500 Received: from laurent.telenet-ops.be ([2a02:1800:110:4::f00:19]:51778) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lIRws-0003k6-TX for guix-patches@gnu.org; Sat, 06 Mar 2021 03:06:11 -0500 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id cw612401b0mfAB401w62oE; Sat, 06 Mar 2021 09:06:02 +0100 Message-ID: From: Maxime Devos Date: Sat, 06 Mar 2021 09:05:54 +0100 User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1615017962; bh=S0VmZf1kz/dDSBOVA4J/Mk5QndzO5QjxWhLB6CxfKvs=; h=Subject:From:To:Date; b=mBmS8X0MFwEv7f3N/fpoO3pGsguxUeQjdiJBcNPqj4doSi/LzAkviIJ28QZuRqOze IWj1BYfFq54v9amdaZO+4juIttsltXQSFihr6w0nD/4SomOeyDx92gryMmjTgn0D61 zX3pz1j4g716LRuy5EsGNlOa2OUz/ceHnAUc545HaBwfMCpvEgiCy8/f1iwCfPTiAc 1Sr1whKtiu9b1QsDfZsQrfwF8SY+SCmpN1PPxmmoSDdg7iYbWwLRNiY8txf7G3yhTu Dtq5w2jNIzMI2ZcYNeFsxqPsPLU6cxoOuMVLsGhIlro7vwbqPsx/fKy4g4cxvtKMAa spZxSXsTh4tCA== Received-SPF: pass client-ip=2a02:1800:110:4::f00:19; envelope-from=maximedevos@telenet.be; helo=laurent.telenet-ops.be X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This fixes bug#46934 (https://issues.guix.gnu.org/46934). emacsy-minimal is only used by nomad AFAIK. From c4057074960a525389f781cc30d8c2b82c2e48e5 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Fri, 5 Mar 2021 20:03:19 +0100 Subject: [PATCH] gnu: nomad: Fix build. Fixes: . Fixes: . * gnu/packages/guile-xyz.scm (emacsy-minimal)[native-inputs]: Add autotools inputs and use guile-2.2 instead of guile-3.0. (nomad)[inputs]: Use the guile2.2 version of gnutls. --- gnu/packages/guile-xyz.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 45b3a82d00..9c237da8f7 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3254,6 +3254,11 @@ in C using Gtk+-3 and WebKitGtk.") (sha256 (base32 "03ym14g9qhjqmryr5z065kynqm8yhmvnbs2djl6vp3i9cmqln8cl")))) (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("guile" ,guile-2.2) + ,@(alist-delete "guile" (package-native-inputs emacsy)))) (inputs `(("guile" ,guile-2.2) ("guile-lib" ,guile2.2-lib) @@ -3333,7 +3338,7 @@ perform geometrical transforms on JPEG images.") ("guile-lib" ,guile2.2-lib) ("guile-readline" ,guile2.2-readline) ("guile-gcrypt" ,guile2.2-gcrypt) - ("gnutls" ,gnutls) + ("guile-gnutls" ,guile2.2-gnutls) ("g-golf" ,g-golf) ("shroud" ,shroud) ("emacsy" ,emacsy-minimal) -- 2.30.1