From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 2DLxDWiHbmSrmwAASxT56A (envelope-from ) for ; Wed, 24 May 2023 23:53:44 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id MDfgDWiHbmSz2QAAauVa8A (envelope-from ) for ; Wed, 24 May 2023 23:53:44 +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 D58291A231 for ; Wed, 24 May 2023 23:53:43 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1wPt-0006iQ-PV; Wed, 24 May 2023 17:53:09 -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 1q1wPs-0006gn-5D for guix-patches@gnu.org; Wed, 24 May 2023 17:53:08 -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 1q1wPr-0005ON-RZ for guix-patches@gnu.org; Wed, 24 May 2023 17:53:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q1wPp-0002UU-MO for guix-patches@gnu.org; Wed, 24 May 2023 17:53:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63542] [PATCH v2 10/20] gnu: python-fitsio: Use Gexp. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 May 2023 21:53: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.16849651419399 (code B ref 63542); Wed, 24 May 2023 21:53:05 +0000 Received: (at 63542) by debbugs.gnu.org; 24 May 2023 21:52:21 +0000 Received: from localhost ([127.0.0.1]:45335 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1wP6-0002RR-P3 for submit@debbugs.gnu.org; Wed, 24 May 2023 17:52:21 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:54380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1wOt-0002Ny-P9 for 63542@debbugs.gnu.org; Wed, 24 May 2023 17:52:08 -0400 Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-3094871953bso974990f8f.0 for <63542@debbugs.gnu.org>; Wed, 24 May 2023 14:52:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684965122; x=1687557122; 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=U5CbFQMMhgV8kFubMyMENs2S4KjNGW291zeKpvhRmIc=; b=ZXgzbrlgDeUm/TLSH6BmZGMTb8u+rFljjEGAk0FxqAWSE8DK6v3PYVnqPzPH063Aj7 i/Ljj1npI3evZ7YbUG5QtphX6IFAh+AahLGdUkdx0h3GKLilduzmbUbfa38r1T4c2ycO raNfCCrrgN2qXm+wdwWfOjke3CvdHWomdrIn1Udm1HWFXzOnYbz280WDhbN1ld3IjVKU TFlQO2Lsfxb6IatBipyupXvfbKaTUqG2Wb7Gra/vvTCScK8jH9NaSQH+dlDNV/s9db+N A3zlI4mtkgJU9rA3jrJV0PoZjNwvvMr/YtidoU38uPRwdxzkdgjG/OmggUOlQzp1o/p9 m5DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684965122; x=1687557122; 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=U5CbFQMMhgV8kFubMyMENs2S4KjNGW291zeKpvhRmIc=; b=GS1rVMVM0gog6WqP5xqoASLvPfV3rbztHOi7Bl9UvchRbLALrBaLJ4eLkwBec2WwUv dT8RCgAcmLg21FoFiXFCAkWvw9K4cWnaJC+Is0byrONGgpVdnjta/SYCS478gE+0SGUr NZamjeGFkbSyNp2vLrMrqcQOwaDbZeZKBfQqxbMurKZQ+UyJaUG4unW+X4vuUDLLRGJQ aG/IKFmD08QYYEBROLqV6NeHkVZYzJa+49OHqrK80tr+6ufP8MC1Li/IY3+I37yPtLJ9 mZPw3e0TvMNYVr/lFc1IirPe4ycEn4Wi74FBLytnR39tjXCi5leRRkNJsEr4HbBfr3h0 dImw== X-Gm-Message-State: AC+VfDzDuF1gf6ATFVSPH6jDhgkw+1qp76YImhDYxTwJR8k93fxwXERY uy+U5xULlXj+ppNa4Sk1yU0ZDZv7Sr8= X-Google-Smtp-Source: ACHHUZ65qS+bGvsqK8uLNKYgrfZWZP0XayDYjKuitU4pX0+8EQFSt+eWRj8O6NGKipYNKkJgBg0oiA== X-Received: by 2002:adf:f38e:0:b0:309:3bc3:7d25 with SMTP id m14-20020adff38e000000b003093bc37d25mr724911wro.62.1684965122122; Wed, 24 May 2023 14:52:02 -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 c13-20020a056000104d00b0030632833e74sm15609806wrx.11.2023.05.24.14.52.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 14:52:01 -0700 (PDT) From: Sharlatan Hellseher Date: Wed, 24 May 2023 22:51:44 +0100 Message-Id: <1f31f3b01dd3424205f7c5416131022feba1fd97.1684964119.git.sharlatanus@gmail.com> 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-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1684965224; a=rsa-sha256; cv=none; b=lROi61bJ9rU5J6q54MZ9DYmIbYoy3gACe+LNUwO+JzIiPLtw13dDnmGL9YvaW1ShOvEvfp +CfHHNuyvtxYreIPfW4vA4l6MBu+ZuirByhxY1bhUtATym9Yrt6EAKpC2rFT8PT8oI8W+g CWiSIOiH7vKtpo6Zabxr/CcKlv0gYjkPmCeWC8xoF5Asu6LGmwcvgriujKLHW2RQ2vQEz+ 85vRQGEQE4t03fOh5l+bW/2CtlYRP9OOfolBS//oK1H5eCL9vgVJcqAOxucW9bYE43qINf RvmUi963tTz7lEWY0lB6Z3JHHMGwYzK0JbtQlqwZTsM8oR9UdpAPhdiT1MFaWA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=ZXgzbrlg; 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=1684965224; 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=U5CbFQMMhgV8kFubMyMENs2S4KjNGW291zeKpvhRmIc=; b=CxidtdHe0Jgyjpaxl47H655kJFxcxlf8tF08Gp1NpW4wU2yl/MB4eIRvaf6eYabzC6oQjx sjgpXVVrqPGxQ+EhR81vBc4l3jkxPSRBCr5h1P5V9EzezFBSz+UbyK2puOUdrncGQ9IOJk zK1clHT+At5CT9Mtbz88m3E7zw/EQfRxkqXvHIKWJtngIf0RmPkI5+fZY6NJhpmufFPfPT o9/pIXbl9B2MiF7JKhth+3rxoZNuuK2b4Y6TBkqjhaGsbw0FUfyDoWU3kh1yU7wytI7TUu 9tR5YSPU6CtBkXAazBQdAET1Xc7ITMsHhFAosrt7WgKvcKwXI9N0N1Su9reCvg== X-Migadu-Spam-Score: 1.39 X-Spam-Score: 1.39 X-Migadu-Queue-Id: D58291A231 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=ZXgzbrlg; 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-TUID: pdUs63IhM6Hi * 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 29bc60ae98..c72be7b30b 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