From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp0.migadu.com ([2001:41d0:403:58f0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms1.migadu.com with LMTPS
	id YKRHBC5vRGa+BAEAqHPOHw:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Wed, 15 May 2024 10:15:42 +0200
Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp0.migadu.com with LMTPS
	id YKRHBC5vRGa+BAEAqHPOHw
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Wed, 15 May 2024 10:15:42 +0200
X-Envelope-To: larch@yhetil.org
Authentication-Results: aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=eLKFKADN;
	dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none);
	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"
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1715760941;
	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:
	 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=JSRGydofJa1T96MPooiqM8VFqiqpxeHO3aJUpM4ola8=;
	b=J5zOp3DVSZJ9bCKd1mHeUgMyHS17sMX18g6us4IYBJNI45vBg6H3aSqrP6wchuEEbVx15G
	WNyvGfitBRkViDZRGfj+tJISdZxyWyZw4I3BjmHd6BVqijN2FZJzdJNrIK+3GLsW9ly0k+
	U/tSan8kyivTnYrNieENwWS6gtcoNqOeSMpRsN/3Akl3zqI2WBseYNrs5V5wK3U0m0GQIc
	QjQUXc2tIPHfknWf6DX/tNUUe4QVVjkSQiwsCZSddYHJhZhuwXKlYCUynoHJ7gcX1wm/93
	yQeKh3CZhxkHRiilsEf+KsTAtSdNT30UIFwFz6S8+0F2GYoRrwj4GIQJeuFXiA==
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1715760941; a=rsa-sha256; cv=none;
	b=og6hnNSznWwF1HNbH6mcl0g8Yl5a12rs4O6k3C5X6xiNop/umJqIdezWio1/kWSaQSU2A4
	ONWVuF8HDg/xQj7ZFMELibtjeDuzNwL193qSQlSMZI8UaUB1wf1wmS240jDIvN4tx6kCOS
	WbkSXb+Bt4rHDfkZAFc9C5O9bRztzwvduOjiFeRebjviDKx9hPWNXoi7efUy1ylk5Et8v1
	0mhcitR6qZE9xgVoatDo58LF0jIDhYROYNpR4ssX7xPmauyjIk4MZKe/tTxgHSMzqH2C5F
	6dAea8Akk7iaJNQlqFgMCn+InnfDBHBaRDJ2pVj0gUOZx/eINhFAfMIli3AMZQ==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=eLKFKADN;
	dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none);
	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"
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 A9E38F46E
	for <larch@yhetil.org>; Wed, 15 May 2024 10:15:41 +0200 (CEST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces@gnu.org>)
	id 1s79mx-0000Th-Sy; Wed, 15 May 2024 04:15:04 -0400
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 <Debian-debbugs@debbugs.gnu.org>)
 id 1s79mw-0000OQ-3g
 for guix-patches@gnu.org; Wed, 15 May 2024 04:15:02 -0400
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 <Debian-debbugs@debbugs.gnu.org>)
 id 1s79mv-0004W4-O0; Wed, 15 May 2024 04:15:01 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1s79mv-0002tW-S4; Wed, 15 May 2024 04:15:01 -0400
X-Loop: help-debbugs@gnu.org
Subject: [bug#70957] [PATCH 1/2] gnu: python-pivy: Fix build.
Resent-From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com,
 sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de,
 guix-patches@gnu.org
Resent-Date: Wed, 15 May 2024 08:15:01 +0000
Resent-Message-ID: <handler.70957.B70957.171576088111085@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 70957
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70957@debbugs.gnu.org
Cc: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>,
 Lars-Dominik Braun <lars@6xq.net>, Marius Bakke <marius@gnu.org>,
 Munyoki Kilyungi <me@bonfacemunyoki.com>,
 Sharlatan Hellseher <sharlatanus@gmail.com>,
 Tanguy Le Carrour <tanguy@bioneland.org>, jgart <jgart@dismail.de>
X-Debbugs-Original-Xcc: Lars-Dominik Braun <lars@6xq.net>,
 Marius Bakke <marius@gnu.org>, Munyoki Kilyungi <me@bonfacemunyoki.com>,
 Sharlatan Hellseher <sharlatanus@gmail.com>,
 Tanguy Le Carrour <tanguy@bioneland.org>, jgart <jgart@dismail.de>
Received: via spool by 70957-submit@debbugs.gnu.org id=B70957.171576088111085
 (code B ref 70957); Wed, 15 May 2024 08:15:01 +0000
Received: (at 70957) by debbugs.gnu.org; 15 May 2024 08:14:41 +0000
Received: from localhost ([127.0.0.1]:41934 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1s79ma-0002sj-WF
 for submit@debbugs.gnu.org; Wed, 15 May 2024 04:14:41 -0400
Received: from mail-lf1-f50.google.com ([209.85.167.50]:52496)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <poptsov.artyom@gmail.com>) id 1s79mY-0002sS-6f
 for 70957@debbugs.gnu.org; Wed, 15 May 2024 04:14:39 -0400
Received: by mail-lf1-f50.google.com with SMTP id
 2adb3069b0e04-51f1b378ca5so11228220e87.1
 for <70957@debbugs.gnu.org>; Wed, 15 May 2024 01:14:36 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1715760810; x=1716365610; darn=debbugs.gnu.org;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:from:to:cc:subject:date
 :message-id:reply-to;
 bh=JSRGydofJa1T96MPooiqM8VFqiqpxeHO3aJUpM4ola8=;
 b=eLKFKADNnE7WO/6BPqRLI5r0B+6nEIS29tPwNcSiSmqgw/+1iHaTsC9LF6s+pb0Tgs
 ZGzd8C4Ah0TuVpuzK5UOEV/vq13YbOGduPGVEuA0FEmvVjE5ruobbKjx/VwIJ72+JilB
 iF5P9RWQ/sLOsa5W9qbZz3vJ3tY25dBTXKuqvbfPDK5KZRks9rCaIX9CGzdCO957hWBv
 ya+EPbA28/P0ZPkpFTO1aYUYduJKxDWG2MKLxjpSVSDm/scQoMW1u8sJd67zhRDm3kyA
 ogg7IpGURzY8NygqSELb8Cm7aZ009fFTnW0bd05z9pzoXRaJO81xQUl/jR6ue1JnsOmP
 p7Yw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1715760810; x=1716365610;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=JSRGydofJa1T96MPooiqM8VFqiqpxeHO3aJUpM4ola8=;
 b=szwrNgrJfmbit3wqYtAP+2Ay2HKaFkXEUY5ogkKu0qXE2+zSEP4qkFHdEXOuZdYaxF
 JxqVn+pRsQ9oPPJ1IjKZtf3l6ONoKZoNrb2EZbBGVMNe573yrMVKbT8KO4NLmCq8cwE4
 9mEqQpUv4sYYVuhnqYxN0wTPFu/WQSJZoE1FFmCxXhxnDYAJGorL4uEYIbB8nuYTISGV
 SO+rUHInSuJMhs+CYRQhXlAIWMmYwt+46K7M8KemMCsEauLekJhFA6l3K0fWosdW1tts
 4htovoVV6KtmqlcJtHpU8eamSiSRLT3PKIjIq5kijIM+JjovLxTxedvYTGiUOretXcFK
 LBLw==
X-Gm-Message-State: AOJu0YxJ3dkc6x5PEOB3+qwUJT72kiUJQPOHSln+cCoxV7HY+AyVts2y
 DSBOrM4fXcOi0lXMjDaDakKy9/uDViNuXkuyF+UPwAgPevCTmjFvpR+MlA==
X-Google-Smtp-Source: AGHT+IEM66Je54Ogd1+J6MNmwNBMSUbtLoLB1nruY00t1biVgRdTHBTYGg/T1g97vIxFtZ1ZKldvvw==
X-Received: by 2002:a19:ca4f:0:b0:51d:3675:6a06 with SMTP id
 2adb3069b0e04-52210474021mr11196410e87.66.1715760809983; 
 Wed, 15 May 2024 01:13:29 -0700 (PDT)
Received: from elephant.. ([95.79.11.228]) by smtp.gmail.com with ESMTPSA id
 2adb3069b0e04-521f39d2c8fsm2421017e87.279.2024.05.15.01.13.29
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Wed, 15 May 2024 01:13:29 -0700 (PDT)
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Wed, 15 May 2024 11:13:23 +0300
Message-ID: <e60fd655944c439e86da0d9ecf3104f7b1bd19c5.1715760488.git.poptsov.artyom@gmail.com>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1715760488.git.poptsov.artyom@gmail.com>
References: <cover.1715760488.git.poptsov.artyom@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
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: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: guix-patches-bounces+larch=yhetil.org@gnu.org
X-Migadu-Flow: FLOW_IN
X-Migadu-Country: US
X-Migadu-Spam-Score: -0.77
X-Spam-Score: -0.77
X-Migadu-Queue-Id: A9E38F46E
X-Migadu-Scanner: mx11.migadu.com
X-TUID: xFQyveF670nE

"python-pivy" build fails when "soqt" is in the inputs (see
<https://bugs.gentoo.org/920482>.)

* gnu/packages/python-xyz.scm (python-pivy): Fix build.
  [inputs]: Remove "soqt".
  [arguments]: Use gexps.

Change-Id: If332ccd42b3a373e7b4118f3bcbc3646e8b59d41
---
 gnu/packages/python-xyz.scm | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b295d780ab..c48d52952b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -121,7 +121,7 @@
 ;;; Copyright © 2022 Peter Polidoro <peter@polidoro.io>
 ;;; Copyright © 2022, 2023 Wamm K. D. <jaft.r@outlook.com>
 ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
-;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2022-2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2022 Paul A. Patience <paul@apatience.com>
 ;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
 ;;; Copyright © 2022 Philip McGrath <philip@philipmcgrath.com>
@@ -32935,20 +32935,20 @@ (define-public python-pivy
                (commit version)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "0vids7sxk8w5vr73xdnf8xdci71a7syl6cd35aiisppbqyyfmykx"))))
+         (base32 "0vids7sxk8w5vr73xdnf8xdci71a7syl6cd35aiisppbqyyfmykx"))))
     (build-system python-build-system)
     (arguments
-      `(;; The test suite fails due to an import cycle between 'pivy' and '_coin'
-        #:tests? #f
-        #:phases
-        (modify-phases %standard-phases
+     (list
+      ;; The test suite fails due to an import cycle between 'pivy' and '_coin'
+      #:tests? #f
+      #:phases
+      #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-cmake-include-dirs
-           (lambda _
-             ;; Patch buildsystem to respect Coin3D include directory
-             (substitute* "CMakeLists.txt"
-                          (("\\$\\{SoQt_INCLUDE_DIRS}")
-                           "${Coin_INCLUDE_DIR};${SoQt_INCLUDE_DIRS}"))
-             #t)))))
+            (lambda _
+              ;; Patch buildsystem to respect Coin3D include directory
+              (substitute* "CMakeLists.txt"
+                (("\\$\\{SoQt_INCLUDE_DIRS}")
+                 "${Coin_INCLUDE_DIR};${SoQt_INCLUDE_DIRS}")))))))
     (native-inputs
       (list cmake swig))
     (inputs
@@ -32956,7 +32956,6 @@ (define-public python-pivy
             qtbase-5
             libxi
             libice
-            soqt
             glew
             coin3d))
     (home-page "https://github.com/coin3d/pivy")
-- 
2.41.0