From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id uJL3HGzzd2enRAAAe85BDQ:P1 (envelope-from ) for ; Fri, 03 Jan 2025 14:25:48 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id uJL3HGzzd2enRAAAe85BDQ (envelope-from ) for ; Fri, 03 Jan 2025 15:25:48 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=RX+9v8Uv; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=BoId8fKF; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=zAj8MeFV; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=wolfsden.cz (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1735914348; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ZK5GTx2FmQ/WYEM7ajNMZY8e8AYzdxoV7DVgsTXhDfA=; b=KTl7ceyrYpW2RkV+oq677WewwYkgbOO0x2D4JQ+OSfvCAckIWrmZ8a5WDgtlXJNSnKsyju JhXLRAhO724IPygeR5f38+ziIXSgoSXtJYXNWLClnnzb415Dca/W/AZpF4TQzMWM3q7Bi2 uzdzAVrsCgIxMVhX2UvF/Wxix1torh6Ox94DRK+kAmfNYVsqXSyfSGOYu1Hf5ufYQOboC1 Bbs4y2eZ9Klv/KU2ve6f6FLUDJy4rMW1HU9Pm8/YYjpEbuL75c50eHeAiOy4QpPDkWf+Pl YbecPJ62bMPwlTORlN00qUz3LbIZwIPnSAQTljubvKfxbwo5RDdHdJjTrjuhxg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=RX+9v8Uv; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=BoId8fKF; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=zAj8MeFV; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=wolfsden.cz (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1735914348; a=rsa-sha256; cv=none; b=GJVjskp2rlfRaWP0F67gJ30arhsHI9Q2yx7/qSn0zEriBYIXqVoMMb9TsJtcfL6AQ3EdRU yrg9OLMsQYwhm7rLtvGENPiJ117z+idwwabtyrL+aFPPp3ZoZZO7KG+zVps6IOjt96rCXD +FJigXUM2vm8msESKQj1yK58QPuJ5x+Qxs2f4cD83+YMaB7Ynrto4SBVTUs3kEGamfv10f PpNRI8ucxwhU9L/Uu4lDHrnmwzO0ehZKFHNzljdYZpwbHJqQNPlVhTJHiCW2EcfTK7gsH4 MQZHG5sIpEnoBZKJWzvyrSj72Z2vPkauMXwIJMaMkA2v/C5AcsX64dMBuzoR/Q== 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 3E9788518E for ; Fri, 03 Jan 2025 15:25:48 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tTibw-0002PV-83; Fri, 03 Jan 2025 09:25: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 1tTibu-0002Oe-M1 for guix-patches@gnu.org; Fri, 03 Jan 2025 09:25:10 -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 1tTibu-0000YR-CC for guix-patches@gnu.org; Fri, 03 Jan 2025 09:25:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ZK5GTx2FmQ/WYEM7ajNMZY8e8AYzdxoV7DVgsTXhDfA=; b=RX+9v8UvEGxRkxjPpH3LBfg4oNhbmrO51j27R7e3rCTjNBcCKseLsL/F2mFqkMK+d9JLBsU9jwpBiqQrLRGh5fbTBqSKN27Uas3wcjD+6kLJc8lSJ4l+uu6ezDH6pvOnepmb1lHWuNsBngJmqhjCeAUxq/Q1prb71q7jV8RyLDX9BBZPuGb591qjQQOzsUJ6HNpecsjwBNLa2RwJiRu/sxVYJZnjSwnEHnFZCFLKLhjB5QKyy1q/70BAq0J4YUX1NdPs/YJXMNLCAJOLIGyEElUOzE6WSgHR5dqn6zlIkMxx7r3sYfq/QiM9qhFPQ9NOTDLgXGGvF2dmv1Z98HbbZA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tTibt-0001t3-4i for guix-patches@gnu.org; Fri, 03 Jan 2025 09:25:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75317] [PATCH 4/6] gnu: gnucash: Do not wrap finance-quote-wrapper. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Jan 2025 14:25:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75317 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75317@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 75317-submit@debbugs.gnu.org id=B75317.17359142927055 (code B ref 75317); Fri, 03 Jan 2025 14:25:08 +0000 Received: (at 75317) by debbugs.gnu.org; 3 Jan 2025 14:24:52 +0000 Received: from localhost ([127.0.0.1]:50146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tTibb-0001pd-Ku for submit@debbugs.gnu.org; Fri, 03 Jan 2025 09:24:52 -0500 Received: from wolfsden.cz ([37.205.8.62]:40798) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tTibS-0001ol-Gl for 75317@debbugs.gnu.org; Fri, 03 Jan 2025 09:24:43 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id BBA893442A0; Fri, 3 Jan 2025 14:24:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1735914280; bh=FgLuTTn3sxIWCtognzfqe42asJEDHTpDPl8gBfuCazM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BoId8fKF2lmUh4DqVTqrd2n7eRc23KeoeibysAVc0aYjnYsGuOSVm5bsb6fINiMO3 7x6AFA286EMrS+b/ul95agj7D94Yj8fubGmOH1Tw3dteJbWj3zhlsP2TqJ4VPx/hoE 0ktya5V3Qa2fjuQG7RHwk3yvf9KNKdqvhr+USCRQ3qUcyQivtOyh1UNA4uIb1caqL4 iQ3gXBLQyOUwQXmwqC2K3blAtwNauW612T6KLRny+LjCUsSvDES8GkAFfL+93Ejo5b Ubn0mMJfPeRbHRIW1sGgo3dcjuA1+OaIal3hD9Pg7bZx/1YX9X3ZvUsisJYt9oQini 72R0bL9ZPOC2PNOzDDcolAQpP3WQw98RTudH+cQFTuRJYrwB8LDl62VFxzIWn8mM3q GsRk0R7za6ng0RNNUmtVTqBdYofaH1sYABy8C3xUsHxN0wvyvAtbQkSejZxjLdi9cR u7PFgFIPQy0afWcmTcW5lmY6y21EClK/1f1YuzdAiBn3QwEEYSTc2ePv2I47da+E97 rFZ/mUsqd3/rKbL+mx9WH/7nRzKqqliLBLMtsIecSs1DUDTC4JBHK//vtBgcNrPOGp JyTSIgxCvCRJKk2Dl50ONZ6UT1EKbz9LjjS4Q14TtKXXGlwqE+1VRitZyYsXJmawHh hV1TgaTGPrwb+WG25HEJTUMk= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 29923343C70; Fri, 3 Jan 2025 14:24:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1735914279; bh=FgLuTTn3sxIWCtognzfqe42asJEDHTpDPl8gBfuCazM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zAj8MeFVWz4qfl50CLwaSBVBU0qIMwiBAocv7j9aq+VbzodWo0BQ+inyykSeDxq6o 3eDU9m/pV5FijaWHwdIoseSCtU3xJNZafUBWD8p6picSR8+s7QTVH9PeLCoggybhd9 6QTbmbjf/yq6As3bWTmccJwVDpt7g8mYJLCJ36ALeHU0AmQPSnvAV0ePIRZu23Qe7g VTIWBil2U3yHWkYcqh1eM/lE7wUgbo0le8HKGyYnkV6EdSS+co5RjQdRuN2YU9in1r cibOHQzjx9Z/tx1A1Y76j+ade+d9h8jlUjvKCiPrSBi1bzNq4XQRRVVRfnAqJBucpS B/jSrSAaW7GqayZGs4MZ/u31ZtBD7Y3xubzpKgLMx+ap0NlJTROCRhBfojtRy4oi6E 6Ml17CwuDt+oDpUjIHEMyChQh/tuW8pmZ6erJu3lVJdmb9QIUEzdZmA+3H/ynp2JEG B3UdHjrDGUnNF4fP6Sh8cTaHYe443nhszEFMVDQuERfyCdcwM9I9V1Dd5EBU3kxGzc go+UQLqcjuqUgSnZeE+ksrtnLYTkP4wwTVap03s3vAWYsqdY7Uuo3AyZmnlfqxEZIz GWBaO3k46UrAx0W1PU4IKrfRcErW/CLG/ppEeZ3QA5G57+r5GF7KWSTuijiC6QEUDv PsU92wkFnmiY7l/M/j0fktLM= From: Tomas Volf <~@wolfsden.cz> Date: Fri, 3 Jan 2025 15:24:29 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 3E9788518E X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -0.09 X-Spam-Score: -0.09 X-TUID: o4Fn3xK00kYK The file needs no special wrapping. Even before, it was wrapped just by accident (via the glib-or-gtk-wrap phase). Wrapping changes it from perl script to shell script and gnucash cannot deal with that. So stop wrapping it. * gnu/packages/gnucash.scm (gnucash)[arguments]<#:phases>: Add 'unwrap-some. Wrap gnucash-cli in 'wrap-programs. Change-Id: I60e7ac5cf40fb00f9620b9ee9d725770009721d2 --- gnu/packages/gnucash.scm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index 12a168d6fd..3f4967b2ef 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -151,8 +151,10 @@ (define-public gnucash 'inputs (map (lambda (l) (assoc l (package-inputs this-package))) - '("perl-finance-quote")))))))) - '("gnucash")))) + '("perl-json-parse" + "perl-finance-quote")))))))) + '("gnucash" + "gnucash-cli")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'install 'glib-or-gtk-wrap @@ -161,7 +163,18 @@ (define-public gnucash (lambda _ ;; We are not updating Finance::Quote from CPAN. There is no ;; reason to install this binary. - (delete-file (string-append #$output "/bin/gnc-fq-update"))))))) + (delete-file (string-append #$output "/bin/gnc-fq-update")))) + (add-after 'glib-or-gtk-wrap 'unwrap-some + (lambda _ + (for-each + (lambda (prog) + (delete-file (string-append #$output "/bin/" prog)) + (rename-file (string-append #$output "/bin/." prog "-real") + (string-append #$output "/bin/" prog))) + ;; Sadly glib-or-gtk-wrap does not allow excluding individual + ;; files. Being wrapped breaks the finance-quote-wrapper (it + ;; is expected to be a perl script, not a shell one). + '("finance-quote-wrapper"))))))) (native-inputs (list gmp `(,glib "bin") ;glib-compile-schemas, etc. -- 2.46.0