From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id /Ay3I+cQZGT0agEASxT56A (envelope-from ) for ; Wed, 17 May 2023 01:25:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id qJvLIucQZGQ3KAAAauVa8A (envelope-from ) for ; Wed, 17 May 2023 01:25:27 +0200 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 42FB387A5 for ; Wed, 17 May 2023 01:25:27 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pz42W-0005MS-0M; Tue, 16 May 2023 19:25:08 -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 ) id 1pz42U-0005KG-07 for guix-patches@gnu.org; Tue, 16 May 2023 19:25:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pz42T-0002RX-PE for guix-patches@gnu.org; Tue, 16 May 2023 19:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pz42T-0004IO-Kh for guix-patches@gnu.org; Tue, 16 May 2023 19:25:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63542] [PATCH 10/19] gnu: python-fitsio: Use Gexp. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 May 2023 23:25:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63542 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63542@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 63542-submit@debbugs.gnu.org id=B63542.168427944816318 (code B ref 63542); Tue, 16 May 2023 23:25:05 +0000 Received: (at 63542) by debbugs.gnu.org; 16 May 2023 23:24:08 +0000 Received: from localhost ([127.0.0.1]:48276 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pz41Y-0004F2-6F for submit@debbugs.gnu.org; Tue, 16 May 2023 19:24:08 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:60834) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pz41R-0004Be-2L for 63542@debbugs.gnu.org; Tue, 16 May 2023 19:24:02 -0400 Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-3093a6311dcso41432f8f.1 for <63542@debbugs.gnu.org>; Tue, 16 May 2023 16:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684279435; x=1686871435; 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=RyJkyeDLkRiP6JyOeRvmxvLqfI2O4L/s55ulSXaSoKM=; b=MiWghVaMn6xQE2aATzODb0zhFFzkjPK59A9sk6NUpzPAwZ7SnB1AYCCtkmnLotYPeM Csk6CK8D6oaGvdGXOABAVQvaejsjQ1UQ/rzDJ/cisxD8xY1fqAKSzcOcT/fKMdqNPDUJ ynbz8YlisY5fOoaqUbSfv5U2EhLIK+rFHuNKFJ87nu+bxQMCk9ccP3m9EfL9Cy33E3e/ 27BOxHBICSyeOv4uiWgyyGqbfCh/b1ukhAtf3IcG3izTjGCKgefLhHGQtZtcRbdJDBVe 8lDRRaXf8KsHqlnNAbwGsdzlAcMxqvR2qFHbBzSLX+ki4g/hhx7eGEeovtBcB0svSrEg mq4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684279435; x=1686871435; 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=RyJkyeDLkRiP6JyOeRvmxvLqfI2O4L/s55ulSXaSoKM=; b=juEC10gNZyiTPLSb6It8yykrfzQzJax7eKYdJi+SHWMaGRiavms4ynOHpDiGU8eHXi 0vv2pg50wq8cbgL2jvIababnkC9VqwmIiU5l7vmCVsD1Dbp3mCzGNXXUEehWCN3cfNVa C2TOHWjf/aNiPInKhrSTG03CwRTEDfSq07oKWrAFqpmAGQL1p4q7uwiJEuNMI6UWmaKT Rd01o/ZbFkJ7NEJLt7Y0uG4ERxs7XO04bsPMVW6214pKJX2CPjVC/Dfjv2wsa3KC7UbU D6gS3zUdlmYgULXrgHfZpA1LMjC4GNUiMZ5nqA0p8npKCFu8G476Ow/NvoBnq6QJv/D0 8I2w== X-Gm-Message-State: AC+VfDw/c6IL0r+1JwsvUq2rnLGfBJWrJA5TlCAHOH8khQoV78FdsERy HE1aj3S/OtT48NcgW0JItpjtNbNvGo4= X-Google-Smtp-Source: ACHHUZ4eDRk1qfXtu8+1ZUDzi62ENVVrdylz+ymMfs8aSVWf9t+7hTsZk8Xlr7Xg/r1Rd+D7MmxGMg== X-Received: by 2002:adf:d846:0:b0:307:8651:258e with SMTP id k6-20020adfd846000000b003078651258emr25016902wrl.21.1684279435325; Tue, 16 May 2023 16:23:55 -0700 (PDT) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id n10-20020a5d67ca000000b0030796e103a1sm949609wrw.5.2023.05.16.16.23.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 16:23:55 -0700 (PDT) From: Sharlatan Hellseher Date: Wed, 17 May 2023 00:23:39 +0100 Message-Id: X-Mailer: git-send-email 2.39.2 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-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1684279527; a=rsa-sha256; cv=none; b=l8ahk1Axea+8cwzH6dGiKx6a3dlTL3qa7vtKm4kGJWgM8+AiCDFOgXEE9vSgaFVMAoRXbr 44K4yUfzZb90vvcpzz+b6MYbwhjRGOTjs72qLGNDAR/Kp3nDhP3WcOGka/hKCx64el0f1X sO9XmiF0iTyLEVgZQbQmqVVacRappNCucHQfNeHwiqIa9C2S5RAhWXee5+qUM8Y0swOXFg sQS1mKPCTKXjfXr+gzi/FNMugz5OrjJtij8XX1rUuf5ZRu6mBns7ccarqweJtmhMF1HhmI OiHkVlw547G2oznPLDLD6frkC2mHDr/1AsoE7NsUtIIQn1VEGTCx0wOJZLXmwA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=MiWghVaM; 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=1684279527; 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=RyJkyeDLkRiP6JyOeRvmxvLqfI2O4L/s55ulSXaSoKM=; b=ZMAB1E9GZetMJZiE13M5L+PFvt7fSwVag/IF2iIM3nLkZuw9Vj9zfMNcGq/0n2VbtYZEGX UtIb919vtAyLzlWCLxotlkYNpxMz+ZM+/XFfydxE3VBJxfx4oDgn6HvvqW5DeuuBuiaY+p VVEShmzFUq1biJcO9cISuQkZPyWP14IC85efimhwUKRlfPcr3IMhWwONFUiJgTZD9OZrK1 TAX+4t+1Oo71kwp/8v+pktvAkYh59iT3t87F8w1Zi6bUD7jkiH/0ClKCG5nqPEay4sdB3H LQ+e+zhvzuE0qLFj0t7SwyLOU8OtP2B9wR7vMM5ijLi8l6U0tiKJzr3vZ7Icog== X-Migadu-Spam: Yes X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=MiWghVaM; 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" X-Spam: Yes X-Migadu-Spam-Score: 8.81 X-Spam-Score: 8.81 X-Migadu-Queue-Id: 42FB387A5 X-TUID: qI76LEcfKPtS * gnu/packages/astronomy.scm (python-fitsio): Adjust package style by using Gexp. --- gnu/packages/astronomy.scm | 39 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index afde394708..25b372b06d 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -476,27 +476,28 @@ (define-public python-fitsio (modules '((guix build utils))) (snippet ;; Remove the bundled cfitsio - `(begin - (delete-file-recursively "cfitsio3490") - (substitute* "MANIFEST.in" - (("recursive-include cfitsio3490.*$\n") "")))))) + #~(begin + (delete-file-recursively "cfitsio3490") + (substitute* "MANIFEST.in" + (("recursive-include cfitsio3490.*$\n") "")))))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'unbundle-cfitsio - (lambda* (#:key inputs #:allow-other-keys) - (let* ((cfitsio (assoc-ref inputs "cfitsio")) - (includedir (string-append "\"" cfitsio "/include\"")) - (libdir (string-append "\"" cfitsio "/lib\""))) - ;; Use Guix' cfitsio instead of the bundled one - (substitute* "setup.py" - (("self.use_system_fitsio = False") "pass") - (("self.system_fitsio_includedir = None") "pass") - (("self.system_fitsio_libdir = None") "pass") - (("self.use_system_fitsio") "True") - (("self.system_fitsio_includedir") includedir) - (("self.system_fitsio_libdir") libdir)))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'unbundle-cfitsio + (lambda _ + (let* ((cfitsio #$(this-package-input "cfitsio")) + (includedir (string-append "\"" cfitsio "/include\"")) + (libdir (string-append "\"" cfitsio "/lib\""))) + ;; Use Guix' cfitsio instead of the bundled one + (substitute* "setup.py" + (("self.use_system_fitsio = False") "pass") + (("self.system_fitsio_includedir = None") "pass") + (("self.system_fitsio_libdir = None") "pass") + (("self.use_system_fitsio") "True") + (("self.system_fitsio_includedir") includedir) + (("self.system_fitsio_libdir") libdir)))))))) (inputs (list curl)) (propagated-inputs (list python-numpy cfitsio)) -- 2.39.2