From patchwork Wed Jul 26 23:15:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 52219 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 9AC5A27BBE9; Thu, 27 Jul 2023 00:48:07 +0100 (BST) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 A016B27BBE2 for ; Thu, 27 Jul 2023 00:48:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qOnjk-0002ZL-OO; Wed, 26 Jul 2023 19:16: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 1qOnjh-0002Z3-7q for guix-patches@gnu.org; Wed, 26 Jul 2023 19:16:05 -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 ) id 1qOnjg-00014I-W7 for guix-patches@gnu.org; Wed, 26 Jul 2023 19:16:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qOnjg-0003x5-LM; Wed, 26 Jul 2023 19:16:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64201] [PATCH v2 02/22] gnu: sextractor: Use G-expressions. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Wed, 26 Jul 2023 23:16:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64201@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 64201-submit@debbugs.gnu.org id=B64201.169041336315149 (code B ref 64201); Wed, 26 Jul 2023 23:16:04 +0000 Received: (at 64201) by debbugs.gnu.org; 26 Jul 2023 23:16:03 +0000 Received: from localhost ([127.0.0.1]:40172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOnjd-0003vV-Fl for submit@debbugs.gnu.org; Wed, 26 Jul 2023 19:16:02 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:49359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOnjZ-0003uk-Rc for 64201@debbugs.gnu.org; Wed, 26 Jul 2023 19:15:58 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-3fd2f298712so2968765e9.2 for <64201@debbugs.gnu.org>; Wed, 26 Jul 2023 16:15:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690413352; x=1691018152; 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=rGuQKEOBqfOrX53w3GZio/MTXD8jzaoVkynBUBKhF0Y=; b=Sp01a9211wazQMfvCDzaZOwrhpxiQtUXC0xCX7kPDAE1AI42rkse/ulQCG2wg+ICk5 ECQky4mQFxL7kouOSuKD7fvzUu7LXJkrlE93LBzPf7fPFCPbbO5Vf4dOtlQyuiwnY/Si 2Oo4zG43ilVvEvOa4/YuR6PA7MzczP3D0VeDFNSvSgd97Viv4EMU9+NknR55dpEWeIro 3gYd19V2ucIUfQdmEAmHLEwYq1DeIQLXZDCBUZjoJInZWFNXKUUYUr0Y0aCK6GK9dxdc loOpJSW9SW1dChbcAg8aoFss6P7lYff2IaCgHGjV5jCQpewRvF6WhWTIbicURIZsH9Ek D6ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690413352; x=1691018152; 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=rGuQKEOBqfOrX53w3GZio/MTXD8jzaoVkynBUBKhF0Y=; b=UeGNA6fFFrZZ/PtulVbFwRLxix5FIl7sIxB44uKoJCk42RgfXmW4gC+2Iy/xZWZHhf 1bpdg9ZgPJ6tC8qvNSFKapmKiiM7vQ9QAeh85iG0udGq1Ip/i92O4wwWnQFJ6xL5DJp7 pwZAwAR2V4+3KY/qvjW3hcBh07atedE18ORp7Vvzvpywnw/KTXUC/tazPt3DjiQrHRpK 7PCFZjmhjoL75gSIM8N4QmAXiNnfo7xSiTR8/EYyaADZDJG5wMuw4UNzRJXd+t6xy6ap gqZ2FW65DIm9LXZG9c/0ej6OagbUxBX8O3/0cyG86ZfQA/F93D6mvqeRbRRj0IUVPuOA RKpw== X-Gm-Message-State: ABy/qLajahvIqldUIX/3ul3K3oTDwR0/y16b3QwemC1Fhec7sq/iIwer K7Wz1YCnIpo7ZV00AzJaVmu/buX6M5sv4w== X-Google-Smtp-Source: APBJJlGTqMcCzFNL8Zv0WzIpNnJWkBFr2E8TnCWMnlzmYmPIfgHYu6NuVqEflERZwzXhGPrkr2pFzA== X-Received: by 2002:a05:600c:210b:b0:3fb:d1c1:9b79 with SMTP id u11-20020a05600c210b00b003fbd1c19b79mr317345wml.30.1690413352151; Wed, 26 Jul 2023 16:15:52 -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 u20-20020a05600c00d400b003faef96ee78sm3147472wmm.33.2023.07.26.16.15.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jul 2023 16:15:51 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:28 +0100 Message-Id: <07e98fd519e9a37f785625b2cc99738426b11ff6.1690410490.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/astronomy.scm (sextractor): Use G-expressions. [inputs]: Remove labels. --- gnu/packages/astronomy.scm | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 4e03e2fcd6..26d4e9621d 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -848,27 +848,26 @@ (define-public sextractor ;; build to use `openblas' instead. It requires FFTW with single precision ;; `fftwf'. (arguments - `(#:configure-flags - (list - "--enable-openblas" - (string-append - "--with-cfitsio-libdir=" (assoc-ref %build-inputs "cfitsio") "/lib") - (string-append - "--with-cfitsio-incdir=" (assoc-ref %build-inputs "cfitsio") "/include") - (string-append - "--with-openblas-libdir=" (assoc-ref %build-inputs "openblas") "/lib") - (string-append - "--with-openblas-incdir=" (assoc-ref %build-inputs "openblas") "/include") - (string-append - "--with-fftw-libdir=" (assoc-ref %build-inputs "fftw") "/lib") - (string-append - "--with-fftw-incdir=" (assoc-ref %build-inputs "fftw") "/include")))) + (list + #:configure-flags + #~(list + "--enable-openblas" + (string-append "--with-cfitsio-incdir=" + #$(this-package-input "cfitsio") "/include") + (string-append "--with-cfitsio-libdir=" + #$(this-package-input "cfitsio") "/lib") + (string-append "--with-fftw-incdir=" + #$(this-package-input "fftwf") "/include") + (string-append "--with-fftw-libdir=" + #$(this-package-input "fftwf") "/lib") + (string-append "--with-openblas-incdir=" + #$(this-package-input "openblas") "/include") + (string-append "--with-openblas-libdir=" + #$(this-package-input "openblas") "/lib")))) (native-inputs (list autoconf automake libtool)) (inputs - `(("cfitsio" ,cfitsio) - ("openblas" ,openblas) - ("fftw" ,fftwf))) + (list cfitsio fftwf openblas)) (home-page "https://www.astromatic.net/software/sextractor") (synopsis "Extract catalogs of sources from astronomical images") (description