From patchwork Thu Feb 29 22:40:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: terru X-Patchwork-Id: 61258 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 AAD7D27BBEA; Fri, 1 Mar 2024 02:06:36 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EA50D27BBE9 for ; Fri, 1 Mar 2024 02:06:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfsI0-0002ix-5k; Thu, 29 Feb 2024 21:06:20 -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 ) id 1rfqZo-0001qF-Fm for guix-patches@gnu.org; Thu, 29 Feb 2024 19:16:36 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rfqZn-0004aN-IK for guix-patches@gnu.org; Thu, 29 Feb 2024 19:16:36 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfqaE-0002DZ-GS for guix-patches@gnu.org; Thu, 29 Feb 2024 19:17:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69482] [PATCH] gnu: hikari: fix build. Resent-From: stuebinm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Mar 2024 00:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69482 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69482@debbugs.gnu.org Cc: stuebinm X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17092522128504 (code B ref -1); Fri, 01 Mar 2024 00:17:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 Mar 2024 00:16:52 +0000 Received: from localhost ([127.0.0.1]:35685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfqa3-0002D4-4u for submit@debbugs.gnu.org; Thu, 29 Feb 2024 19:16:52 -0500 Received: from lists.gnu.org ([209.51.188.17]:53910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfpDA-0008NR-VU for submit@debbugs.gnu.org; Thu, 29 Feb 2024 17:49:12 -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 ) id 1rfpCj-00018k-4T for guix-patches@gnu.org; Thu, 29 Feb 2024 17:48:41 -0500 Received: from layka.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rfpCf-0003bi-PW for guix-patches@gnu.org; Thu, 29 Feb 2024 17:48:39 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id DF9A84118E; Thu, 29 Feb 2024 23:48:32 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kgM8MIuq-wKn; Thu, 29 Feb 2024 23:48:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1709246911; bh=l0RyrkWzDEKBTvqe1ntllDG5+cyb4IBFdNgbGR8/Q1c=; h=From:To:Cc:Subject:Date; b=C7zBJMCAQRHtJ+jKesCVW2DJ36wLx0+8tQRN5faDuz6qVqX3ndeKEmLrkyhr+S8TU FvI0No1To/NuL9XTezVOjbzxj5j2cZrNWtYSY4rUO35gnMkTWt7uRupxVj7yx2RLSQ x9tY32JnaCO0+8UDXJRsbSsu9J4krUGAduqcdu7ILjry/eP3wIT3De9fxg7QQjbjxS zJs4/sNW6vq9PQJrHECTJmUllC3evBnLENhjeBWE5googIIkNKEXNU1I2oGAHU1+IE p3YaF8n+9LMveAbOJ9ZMkauq6xyjWiltzcm6aFMLg+pBv7rwMpDUGL98bOviPFu03Z lKgCRpVEal1/w== Date: Thu, 29 Feb 2024 23:40:34 +0100 Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=stuebinm@disroot.org; helo=layka.disroot.org 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Thu, 29 Feb 2024 19:16:50 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Thu, 29 Feb 2024 21:06:15 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: stuebinm X-ACL-Warn: , stuebinm via Guix-patches X-Patchwork-Original-From: stuebinm via Guix-patches via From: terru Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches It fails to build with versions of wlroots newer than 0.15, which seems unlikey to be fixed https://hub.darcs.net/raichoo/hikari/issue/45 * gnu/packages/wm.scm (wlroots-0.15): New variable. * gnu/packages/wm.scm (hikari)[inputs]: Replace wlroots with wlroots-0.15. Change-Id: Id90e1e1ff399afe54fff68167f497f0484d2c218 --- Hi everyone! I'm new to Guix, so I hope I'm doing this right. Unfortunately, hikari seems to be unmaintained for now (see the linked issue, now almost two years old; asking on their Matrix chat also led to no result). With this change, hikari builds again, though I could also understand if it's preferred to remove it entirely over keeping old versions of wlroots around. gnu/packages/wm.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) base-commit: b988248e1c88bde3001b7f2b1830dececa7e8b23 diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 768fbc5bc7..afa60bf3ad 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1757,6 +1757,21 @@ (define-public wlroots-0.16 (propagated-inputs (modify-inputs (package-propagated-inputs wlroots) (delete libdisplay-info))))) +(define-public wlroots-0.15 + (package + (inherit wlroots) + (name "wlroots-0.15") + (version "0.15.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/wlroots/wlroots") + (commit version))) + (file-name (git-file-name "wlroots" version)) + (sha256 + (base32 "00s73nhi3sc48l426jdlqwpclg41kx1hv0yk4yxhbzw19gqpfm1h")))))) + (define-public sway (package (name "sway") @@ -3221,7 +3236,7 @@ (define-public hikari linux-pam pango wayland - wlroots-0.16)) + wlroots-0.15)) (arguments `(#:tests? #f ; no tests #:make-flags