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 +NWXKwKymGRGNwEASxT56A (envelope-from ) for ; Sun, 25 Jun 2023 23:30:42 +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 gGyXKwKymGTUogAAauVa8A (envelope-from ) for ; Sun, 25 Jun 2023 23:30:42 +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 5A75211233 for ; Sun, 25 Jun 2023 23:30:42 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDXIU-0000Et-UB; Sun, 25 Jun 2023 17:29:27 -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 1qDXI9-0008PC-KX for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29: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 1qDXI9-0003qw-CG for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDXI7-0004qP-Bz; Sun, 25 Jun 2023 17:29:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64287] [PATCH 5/9] gnu: skymaker: Update to 3.10.5-0.1a69c47, fix build. 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: Sun, 25 Jun 2023 21:29:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64287 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64287@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 64287-submit@debbugs.gnu.org id=B64287.168772852118522 (code B ref 64287); Sun, 25 Jun 2023 21:29:03 +0000 Received: (at 64287) by debbugs.gnu.org; 25 Jun 2023 21:28:41 +0000 Received: from localhost ([127.0.0.1]:43812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHk-0004oa-Mz for submit@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:41 -0400 Received: from mail-lf1-f47.google.com ([209.85.167.47]:54390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHc-0004nA-Sb for 64287@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:34 -0400 Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-4fb7769f15aso41433e87.0 for <64287@debbugs.gnu.org>; Sun, 25 Jun 2023 14:28:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728507; x=1690320507; 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=m7N03sKJ2ASFFcncFF6vZJpyp1XqK21W+y7DN26lOug=; b=JdO++mO+PpZEBJMCobjd/5dFLzEtT4oF32srrN3mWQhBS5L/qSg/+/JnTvSEcCBZVa nxF95Alp6/9golKOPOuRr9qsFP+iUxNi7tkHFbhUUH87bs/25KlgajYbtkqR00iX8dIe 5YaOPSFExsXGP0GPmGIzWGs1qt0egd2HazZozUDa/f28RoU9tMmPBAtSoJ+BIQHEduof Eq9isH3wCT2AiQFn9MfIbUm0iKOdsIfDtPSBwxij78Wgf7E7mfdJB+e3J7qn8fjWBb0U V87U2eBf+FdfY5MTtxO2+4aweNe36a+7GIPA0JTovSRcLSc2mYWn24IFdu7JKp9LUmr8 KX+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728507; x=1690320507; 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=m7N03sKJ2ASFFcncFF6vZJpyp1XqK21W+y7DN26lOug=; b=cEKxLe1RubxaZLDZjx010Vuwizo8DxAddwZc83KkH4sQxF68CP6ZXR9sxb59o9c3vM JkFzdRHGJw/orIlVfdPbquC3Serb/N1Sn1mjfZNRvLkXuV+abALhvSPZPv363xUrLDyu +8SCQAnNLwOtXSSMYW/Z3UyoF5W/hqW5+6By71MQe2uBnNjz4i8DWFvSg56J7U5YuV1H O/N8NR+mIIMCddfiY7PjDb6/JPFRJD5FMmH5CwJTCtP5iK7o/Kfe0BiekIr82x31YKK0 nnnLbEX7rWCUyfIcqn2/yY5MYd2JlhmVoXpiPf7lrw2okPRo6buaEl63nu1wYUFOZTjB 5Sag== X-Gm-Message-State: AC+VfDxdBvnAdaUga0xlN7HMefsoznPlW66z69cyvJ/8NZuxN47Ioy5n Be9REbVAiPVoDTC2f6dpAulkc2DfUtc= X-Google-Smtp-Source: ACHHUZ4WGrXLdA9MBhr55Bo3nwGzJDILeQog5H7mAigATI0KelGN1aDcapwBSfwn/7UTWOQxPmdcvw== X-Received: by 2002:ac2:4bd0:0:b0:4fb:b11:c99d with SMTP id o16-20020ac24bd0000000b004fb0b11c99dmr925956lfq.57.1687728506858; Sun, 25 Jun 2023 14:28:26 -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 o23-20020a05600c379700b003f8f884ebe5sm5766923wmr.2.2023.06.25.14.28.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:28:26 -0700 (PDT) From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:17 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 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=1687728642; a=rsa-sha256; cv=none; b=Jz5NphsqIVzodccxzuJBt3QKzmuItIWeTplykavUFt8MheHsD1iX78B/FDqlkboydHv4P9 EBCUheXmC8K5zCxRLBI1ow+hZRWm62zk2R2iFgKHF2MI5vzXV7kbyQHNab61PzmP7cj5Rc dgyOmenfiwMw/gIsgG785pDYGNiO9qEZMvC3wjSQ9GlfgV5woXAztN88lQMCRkqxeXrN/D cczE7k+Gwtz5wuuv8s5jWg3PBZ/1oGQMoBMwyTrsXhYkHQrnNK7kRoi+eon5/S9vMKtobD YFDI/Ihm2bZk1qZqGtCgREyI4fulS5Jzemh48bTpU72T/IbFNZqdDAw4e5+6eQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=JdO++mO+; 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=1687728642; 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=m7N03sKJ2ASFFcncFF6vZJpyp1XqK21W+y7DN26lOug=; b=dbAxps1TpwkiPg0P4PrjW0+M+JxZG3s5/rRDJ8A36PMpoVK9VPjC9Kqmex9MxNh34TMnRR OKH0RmCpAecGB3O9VqnLXayFBJhrpCrxTLbrZh+9O34cF2yyM4YXUOqyqjVI29vDEFWje5 W2MfUU9WFCIdFijrMZljFmXXG9DVHIGqiTpzAkholbkyKvPH3LLxU/HcQ7+45dbSHPPerz J+IzYeer8FdqQb8aaoVk6V0ehsL3E17Cysf18/8ZUA1IlaQE0VXPFtPMQo2TjwM3K8lJ1j xYqZqgPMdL5r2UWVXOHUcQe8qT6ly4yLm5cQdSWoyXAdXUkDtUs2x8c/F7FlEA== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=JdO++mO+; 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-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -0.65 X-Spam-Score: -0.65 X-Migadu-Queue-Id: 5A75211233 X-TUID: duSye1Dd3P2x * gnu/packages/astronomy.scm (skymaker): Update to 3.10.5-0.1a69c47, fix build. [source]: Swap to 'git-checkout and pin to the latest commit as upstream version tag is not available. [arguments]: Use G-expressions. #:configure-flags add CPPFLAGS to pass build on GCC 10. [native-inputs]: Add automake, autoconf, libtool, pkg-config. --- gnu/packages/astronomy.scm | 57 ++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 4c869fc295..b5d96c932f 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -900,34 +900,43 @@ (define-public splash (license license:gpl2+))) (define-public skymaker - (package - (name "skymaker") - (version "3.10.5") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.astromatic.net/download/skymaker/" - "skymaker-" version ".tar.gz")) - (sha256 - (base32 "03zvx7c89plp9559niqv5532r233kza3ir992rg3nxjksqmrqvx1")))) - (build-system gnu-build-system) - (arguments - `(#:configure-flags + ;; XXX: No version tag availalbe in GitHub. + ;; See: https://github.com/astromatic/skymaker/issues/3 + (let ((commit "1a69c4716bdc9b5c6d4a917b0bc2dbd47635c459") + (revision "0")) + (package + (name "skymaker") + (version (git-version "3.10.5" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/astromatic/skymaker") + (commit commit))) + (sha256 + (base32 "1vin4vgvcmqmwjdchsxnap374559rksz55xmaliawnl3qpzxn1nk")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments (list - (string-append - "--with-fftw-libdir=" (assoc-ref %build-inputs "fftw") "/lib") - (string-append - "--with-fftw-incdir=" (assoc-ref %build-inputs "fftw") "/include")))) - (inputs - `(("fftw" ,fftwf))) - (home-page "https://www.astromatic.net/software/skymaker") - (synopsis "Astronomical image simulator") - (description - "SkyMaker is a program that simulates astronomical images. It accepts + #:configure-flags + #~(list + "CPPFLAGS=-O2 -g -fcommon" + (string-append + "--with-fftw-libdir=" #$(this-package-input "fftwf") "/lib") + (string-append + "--with-fftw-incdir=" #$(this-package-input "fftwf") "/include")))) + (native-inputs + (list automake autoconf libtool pkg-config)) + (inputs (list fftwf)) + (home-page "https://www.astromatic.net/software/skymaker") + (synopsis "Astronomical image simulator") + (description + "SkyMaker is a program that simulates astronomical images. It accepts object lists in ASCII generated by the Stuff program to produce realistic astronomical fields. SkyMaker is part of the EFIGI (@url{https://www.astromatic.net/projects/efigi}) development project.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public stackistry (package -- 2.40.1