From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id YMjhE2SDNWQWqgAASxT56A (envelope-from ) for ; Tue, 11 Apr 2023 17:57:24 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id +IvmEmSDNWSMUwEAG6o9tA (envelope-from ) for ; Tue, 11 Apr 2023 17:57:24 +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 C67033914C for ; Tue, 11 Apr 2023 17:57:23 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pmGMi-0008Ur-12; Tue, 11 Apr 2023 11:57: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 ) id 1pmGMg-0008U2-GV for guix-patches@gnu.org; Tue, 11 Apr 2023 11:57:02 -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 1pmGMg-00046D-8F for guix-patches@gnu.org; Tue, 11 Apr 2023 11:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pmGMf-0001Lr-PD for guix-patches@gnu.org; Tue, 11 Apr 2023 11:57:01 -0400 Subject: bug#62306: [PATCH] gnu: Add phd2 Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Tue, 11 Apr 2023 15:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 62306 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: Sharlatan Hellseher Cc: 62306-done@debbugs.gnu.org Mail-Followup-To: 62306@debbugs.gnu.org, maxim.cournoyer@gmail.com, sharlatanus@gmail.com Received: via spool by 62306-done@debbugs.gnu.org id=D62306.16812285915157 (code D ref 62306); Tue, 11 Apr 2023 15:57:01 +0000 Received: (at 62306-done) by debbugs.gnu.org; 11 Apr 2023 15:56:31 +0000 Received: from localhost ([127.0.0.1]:38031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmGMA-0001L7-Kw for submit@debbugs.gnu.org; Tue, 11 Apr 2023 11:56:31 -0400 Received: from mail-qt1-f172.google.com ([209.85.160.172]:38675) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmGLu-0001Kc-3V for 62306-done@debbugs.gnu.org; Tue, 11 Apr 2023 11:56:29 -0400 Received: by mail-qt1-f172.google.com with SMTP id fc12so4854450qtb.5 for <62306-done@debbugs.gnu.org>; Tue, 11 Apr 2023 08:56:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681228568; x=1683820568; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=O7m+PmlIK7xYH+JHzRM5b1I1lkv5DDSoOZjY+kl893U=; b=j7IoWxjQ8TP/nMPiOJbWruqA1dzCnbv/YGok7dIBjdjqWFwXRh2TKvgt6YlozcIxAW AnGKeTjEFQweGUEt05HtABeKbZTnnQEbl8HTfPZ9kQaPFGwwmkvmPb97+FsDeo89Eaz7 o5p1iVVH8pbqcbKISi8w5avvtrJx5cGsLgifAEnOm6k074kBKqLQjekNktNZQKt2X8yU jZMseDa0WOYzlicGLTJDlazVj+T3A8F4EvGGZ2jQf7Z1x3hMFqiP3aUpJyGXowQz7OON jQd/9cxgfNrR+2nfXas/VJiBDc+COhvrHtKbHdY4wNqFfAneY6eYgsUXOCvcFhJlrWJK x4iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681228568; x=1683820568; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=O7m+PmlIK7xYH+JHzRM5b1I1lkv5DDSoOZjY+kl893U=; b=JNZZuVBhYRgmIF7XGgpwe9QEUvx7WRTR+qHxW9d1imsL4paD38E1JivzLvkvc3gnD2 JJ8NRWmgrQnUiHrAPFJtZp0iIk2zSArzLIEl0bA3ngeSi7sy8thUN3QEofVzcjwdz0V5 t0jXxRNlm8xemkYn5xf0yWmJDt0SwfwcFPCR+eOJ/s4MAcP4gfx8ptXa+7/AYPUJnV5w VWQ4RfPde9sUFzpkT1IRr+yBpHBG04vhdD9wXKPtKYsveXO7cpMyj55fowRp50sUERRx 7vbRpJJWtCLq9Hd1C2hJ+Wlogpy6bodWrKFEz9yI8w5NJvBN1eTNeUsVRiWleI3FZRZS WDyA== X-Gm-Message-State: AAQBX9eJ2giEc6tzD//tHt+oDIkXd9wAYyD9ku03FM9/3Jk8HekQbyHu S1Ydm1l9NwBM57ax+78AsRFYKqHMAi0= X-Google-Smtp-Source: AKy350ZvONahYk3noBcDtt+6HiOr6cqWRp+A2m5trRFEQvxzxuGFrNk64/m/bHgzgmObTW/XvUd4bg== X-Received: by 2002:ac8:4e4e:0:b0:3b6:3e4f:f876 with SMTP id e14-20020ac84e4e000000b003b63e4ff876mr5323120qtw.18.1681228567900; Tue, 11 Apr 2023 08:56:07 -0700 (PDT) Received: from hurd (dsl-152-224.b2b2c.ca. [66.158.152.224]) by smtp.gmail.com with ESMTPSA id 65-20020a370b44000000b0071f0d0aaef7sm4057432qkl.80.2023.04.11.08.56.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 08:56:07 -0700 (PDT) From: Maxim Cournoyer References: <20230320215028.26102-1-sharlatanus@gmail.com> <20230327084649.5633-1-sharlatanus@gmail.com> Date: Tue, 11 Apr 2023 11:56:06 -0400 In-Reply-To: <20230327084649.5633-1-sharlatanus@gmail.com> (Sharlatan Hellseher's message of "Mon, 27 Mar 2023 09:46:49 +0100") Message-ID: <87jzyimmzt.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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=1681228644; a=rsa-sha256; cv=none; b=NQit/SmirChsL2u6+dk4npQEll97VkNB0fl0So13aoUU6XoXNsghhj/cYqjCrmFih8cYyA dMldMr6gtdkqjhDN13ALS82PbsFW0Ht0RekGso32MXwngnQssufgJzkumQFQ0F2eSZrtP6 oszpAosAZpqxGDbt1JdicWfgcLFtRZ4MR7V80dZq4OVYZ4Kj6zGVcL0rxIPWaSjFBE5ixH /8dEIY7Xp25VUWD9z5JjnrUJB9jV2g16g9CCX6xTfXBGycXQ8lr8IEuA7DhlY8CuUrsGXQ V680IieP9kRCX3Nm0tmXeYQZw04mSmDI/dK/TjCQIucal9KhDm2mfdGItDw4YQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=j7IoWxjQ; 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=1681228644; 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-to: 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=O7m+PmlIK7xYH+JHzRM5b1I1lkv5DDSoOZjY+kl893U=; b=ZB76ebwGQ7kw+4/Xgj47+/3wXQ2P0XAgP1jPNsKItkYTYB/zMpYSP5t6b7aA50h9JYLCyO 88PahkrZdud2FbT7BHfQIEoO2KG5OfagxHsfgbqynsrULZ1Vix/RVum/FModooG36pusX2 ugu3IAnl1IBeSRr/QQMN2N40Mg1MuluhlMNeq14xQ3lK79lP2m/49GhQ4nB7ZjVHHpMdb2 gdd+N4EJgezdy8r8+N8SZVbiNa0itYczzWMW6K7ZBpat5BIuy2BNSiTceLuWzpyWOvvl1Y E3O6NlqSRqFaY1o5FjYicKZu61WXDGSYKsy3AcWK6gxLJGF69l2n+bk/5kqVVg== X-Migadu-Spam-Score: 5.78 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=j7IoWxjQ; 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-Score: 5.78 X-Migadu-Queue-Id: C67033914C X-TUID: W4mhGgkIVPeh Hi, Sharlatan Hellseher writes: > * gnu/packages/astronomy.scm (phd2): New variable. > --- > gnu/packages/astronomy.scm | 70 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 70 insertions(+) > > diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm > index 46839c802f..6ca3c4f4e7 100644 > --- a/gnu/packages/astronomy.scm > +++ b/gnu/packages/astronomy.scm > @@ -678,6 +678,76 @@ (define-public gnuastro > programs for the manipulation and analysis of astronomical data.") > (license license:gpl3+))) >=20=20 > +(define-public phd2 > + (package > + (name "phd2") > + (version "2.6.11") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/OpenPHDGuiding/phd2") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "0n87xsv9gzrwk1ygws4vw397ffq40xybp5b3c3bd5kcmff0avaw9")) > + (modules '((guix build utils) > + (ice-9 ftw) > + (srfi srfi-26))) > + (snippet > + #~(begin > + ;; TODO: This snippet is sourced from > + ;; guix/gnu/packages/vnc.scm. It might be merged with > + ;; `delete-file-recursively' which can have `ignore' optional > + ;; argument. > + (define (delete-all-but directory . preserve) > + (define (directory? x) > + (and=3D> (stat x #f) > + (compose (cut eq? 'directory <>) stat:type))) > + (with-directory-excursion directory > + (let* ((pred > + (negate (cut member <> (append '("." "..") prese= rve)))) > + (items (scandir "." pred))) > + (for-each (lambda (item) > + (if (directory? item) > + (delete-file-recursively item) > + (delete-file item))) > + items)))) > + ;; XXX: Check this list of ignored items in next release. > + (delete-all-but "thirdparty" "thirdparty.cmake"))))) > + (build-system cmake-build-system) > + (arguments > + (list > + #:configure-flags > + #~(list "-DOPENSOURCE_ONLY=3Dyes" > + "-DUSE_SYSTEM_CFITSIO=3Dyes" > + "-DUSE_SYSTEM_EIGEN3=3Dyes" > + "-DUSE_SYSTEM_GTEST=3Dyes" > + "-DUSE_SYSTEM_LIBINDI=3Dyes" > + "-DUSE_SYSTEM_LIBUSB=3Dyes"))) > + (native-inputs > + (list gettext-minimal > + googletest > + perl > + pkg-config > + python-wrapper)) > + (inputs > + (list cfitsio > + curl-minimal > + eigen > + gtk+ > + indi > + libnova > + libusb > + wxwidgets > + zlib)) > + (home-page "https://openphdguiding.org") > + (synopsis "Teleskope guiding software") > + (description > + "PHD2 is the enhanced, second generation version of the PHD guiding= software > +from Stark Labs.") > + (license license:bsd-3))) > + > (define-public sextractor > (package > (name "sextractor") I've taken the liberty to apply the following cosmetic adjustments: --8<---------------cut here---------------start------------->8--- 1 file changed, 10 insertions(+), 16 deletions(-) gnu/packages/astronomy.scm | 26 ++++++++++---------------- modified gnu/packages/astronomy.scm @@ -5,7 +5,7 @@ ;;; Copyright =C2=A9 2019 by Amar Singh ;;; Copyright =C2=A9 2020 R Veera Kumar ;;; Copyright =C2=A9 2020, 2021 Guillaume Le Vaillant -;;; Copyright =C2=A9 2021, 2022 Sharlatan Hellseher +;;; Copyright =C2=A9 2021, 2022, 2023 Sharlatan Hellseher ;;; Copyright =C2=A9 2021, 2022 Vinicius Monego ;;; Copyright =C2=A9 2021 Greg Hogan ;;; Copyright =C2=A9 2021 Foo Chuan Wei @@ -696,10 +696,7 @@ (define-public phd2 (srfi srfi-26))) (snippet #~(begin - ;; TODO: This snippet is sourced from - ;; guix/gnu/packages/vnc.scm. It might be merged with - ;; `delete-file-recursively' which can have `ignore' optional - ;; argument. + ;; XXX: 'delete-all-but' is copied from the turbovnc package. Rationale: the suggestion to enhance delete-file-recursively would be better discussed on guix-devel. (define (delete-all-but directory . preserve) (define (directory? x) (and=3D> (stat x #f) @@ -713,27 +710,24 @@ (define (directory? x) (delete-file-recursively item) (delete-file item))) items)))) - ;; XXX: Check this list of ignored items in next release. (delete-all-but "thirdparty" "thirdparty.cmake"))))) Rationale: we're safe by default. If the package breaks on a version update, its maintainer will be forced into looking into that :-). =20=20=20=20=20 (build-system cmake-build-system) (arguments - (list - #:configure-flags - #~(list "-DOPENSOURCE_ONLY=3Dyes" - "-DUSE_SYSTEM_CFITSIO=3Dyes" - "-DUSE_SYSTEM_EIGEN3=3Dyes" - "-DUSE_SYSTEM_GTEST=3Dyes" - "-DUSE_SYSTEM_LIBINDI=3Dyes" - "-DUSE_SYSTEM_LIBUSB=3Dyes"))) + (list #:configure-flags #~(list "-DOPENSOURCE_ONLY=3Dyes" + "-DUSE_SYSTEM_CFITSIO=3Dyes" + "-DUSE_SYSTEM_EIGEN3=3Dyes" + "-DUSE_SYSTEM_GTEST=3Dyes" + "-DUSE_SYSTEM_LIBINDI=3Dyes" + "-DUSE_SYSTEM_LIBUSB=3Dyes"))) Stylistic. (native-inputs (list gettext-minimal googletest perl pkg-config - python-wrapper)) + python)) (inputs (list cfitsio - curl-minimal + curl curl-minimal doesn't exist anymore. It had long been deprecated (2020). eigen gtk+ indi --8<---------------cut here---------------end--------------->8--- And installed it! Thank you! --=20 Thanks, Maxim