[bug#62306] [PATCH] gnu: Add phd2

unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed

* [bug#62306] [PATCH] gnu: Add phd2
@ 2023-03-20 21:50 Sharlatan Hellseher
  2023-03-21 19:24 ` Maxim Cournoyer
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Sharlatan Hellseher @ 2023-03-20 21:50 UTC (permalink / raw)
  To: 62306; +Cc: Sharlatan Hellseher

* gnu/packages/astronomy.scm (phd2): New variable.
---
 gnu/packages/astronomy.scm | 71 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 46839c802f..66040ad5f5 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -678,6 +678,77 @@ (define-public gnuastro
 programs for the manipulation and analysis of astronomical data.")
     (license license:gpl3+)))
 
+(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)))
+       (snippet
+        '(begin
+           ;; NOTE: Keep eye on the thirdparty directory as the bundled names
+           ;; change from relase to release.
+           ;;
+           ;; Remove bundles.
+           (with-directory-excursion "thirdparty"
+             (for-each delete-file-recursively
+                       '("HID_Utilities"
+                         "MallincamGuider-OSX-dylib-source.zip"
+                         "VidCapture"
+                         "cfitsio-3.47-patched.tar.gz"
+                         "cfitsio-README-PHD2.txt"
+                         "cfitsio-snprintf.patch"
+                         "eigen-eigen-67e894c6cd8f.tar.bz2"
+                         "gettext-0.14.4-bin.zip"
+                         "gettext-0.14.4-dep.zip"
+                         "gtest-1.7.0.zip"
+                         "indiclient-44aaf5d3-win32.zip"
+                         "libcurl-7.54.0-win32.zip"
+                         "libdc1394-2.2.2.tar.gz"
+                         "libindi-58b26c584049e1b9ecd55aa5f4a225677a417898.tar.gz"
+                         "libusb-1.0.21.tar.bz2"
+                         "openssag")))))))
+    (build-system cmake-build-system)
+    (arguments
+     (list
+      #:configure-flags
+      #~(list "-DOPENSOURCE_ONLY=yes"
+              "-DUSE_SYSTEM_CFITSIO=yes"
+              "-DUSE_SYSTEM_EIGEN3=yes"
+              "-DUSE_SYSTEM_GTEST=yes"
+              "-DUSE_SYSTEM_LIBINDI=yes"
+              "-DUSE_SYSTEM_LIBUSB=yes")))
+    (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 to simplify the process of tracking a guide star.")
+    (license license:bsd-3)))
+
 (define-public sextractor
   (package
     (name "sextractor")
-- 
2.39.2





^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [bug#62306] [PATCH] gnu: Add phd2
  2023-03-20 21:50 [bug#62306] [PATCH] gnu: Add phd2 Sharlatan Hellseher
@ 2023-03-21 19:24 ` Maxim Cournoyer
  2023-03-22 11:04   ` Sharlatan Hellseher
  2023-03-27  8:46 ` [bug#62306] [PATCH v2] " Sharlatan Hellseher
  2023-04-09 19:00 ` [bug#62306] Sharlatan Hellseher
  2 siblings, 1 reply; 6+ messages in thread
From: Maxim Cournoyer @ 2023-03-21 19:24 UTC (permalink / raw)
  To: Sharlatan Hellseher; +Cc: 62306

Hi,

Sharlatan Hellseher <sharlatanus@gmail.com> writes:

> * gnu/packages/astronomy.scm (phd2): New variable.
> ---
>  gnu/packages/astronomy.scm | 71 ++++++++++++++++++++++++++++++++++++++
>  1 file changed, 71 insertions(+)
>
> diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
> index 46839c802f..66040ad5f5 100644
> --- a/gnu/packages/astronomy.scm
> +++ b/gnu/packages/astronomy.scm
> @@ -678,6 +678,77 @@ (define-public gnuastro
>  programs for the manipulation and analysis of astronomical data.")
>      (license license:gpl3+)))
>  
> +(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)))
> +       (snippet
> +        '(begin
> +           ;; NOTE: Keep eye on the thirdparty directory as the bundled names
> +           ;; change from relase to release.
> +           ;;
> +           ;; Remove bundles.
> +           (with-directory-excursion "thirdparty"
> +             (for-each delete-file-recursively
> +                       '("HID_Utilities"
> +                         "MallincamGuider-OSX-dylib-source.zip"
> +                         "VidCapture"
> +                         "cfitsio-3.47-patched.tar.gz"
> +                         "cfitsio-README-PHD2.txt"
> +                         "cfitsio-snprintf.patch"
> +                         "eigen-eigen-67e894c6cd8f.tar.bz2"
> +                         "gettext-0.14.4-bin.zip"
> +                         "gettext-0.14.4-dep.zip"
> +                         "gtest-1.7.0.zip"
> +                         "indiclient-44aaf5d3-win32.zip"
> +                         "libcurl-7.54.0-win32.zip"
> +                         "libdc1394-2.2.2.tar.gz"
> +                         "libindi-58b26c584049e1b9ecd55aa5f4a225677a417898.tar.gz"
> +                         "libusb-1.0.21.tar.bz2"
> +                         "openssag")))))))

To make maintenance easier, perhaps you could reuse the 'delete-all-but'
procedure from turbovnc or similar?  This has the benefit of listing
what is kept (more transparent), and if the things we do care for change
names, we will know.

Could you please send a v2 with this suggestion implemented?

-- 
Thanks,
Maxim




^ permalink raw reply	[flat|nested] 6+ messages in thread

* [bug#62306] [PATCH] gnu: Add phd2
  2023-03-21 19:24 ` Maxim Cournoyer
@ 2023-03-22 11:04   ` Sharlatan Hellseher
  0 siblings, 0 replies; 6+ messages in thread
From: Sharlatan Hellseher @ 2023-03-22 11:04 UTC (permalink / raw)
  To: Maxim Cournoyer; +Cc: 62306

[-- Attachment #1: Type: text/plain, Size: 2853 bytes --]

Hi Maxim,

Thank you for the review. I'll check that procedure and prepare simplified
v2 patch.

Oleg

On Tue, 21 Mar 2023, 19:24 Maxim Cournoyer, <maxim.cournoyer@gmail.com>
wrote:

> Hi,
>
> Sharlatan Hellseher <sharlatanus@gmail.com> writes:
>
> > * gnu/packages/astronomy.scm (phd2): New variable.
> > ---
> >  gnu/packages/astronomy.scm | 71 ++++++++++++++++++++++++++++++++++++++
> >  1 file changed, 71 insertions(+)
> >
> > diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
> > index 46839c802f..66040ad5f5 100644
> > --- a/gnu/packages/astronomy.scm
> > +++ b/gnu/packages/astronomy.scm
> > @@ -678,6 +678,77 @@ (define-public gnuastro
> >  programs for the manipulation and analysis of astronomical data.")
> >      (license license:gpl3+)))
> >
> > +(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)))
> > +       (snippet
> > +        '(begin
> > +           ;; NOTE: Keep eye on the thirdparty directory as the bundled
> names
> > +           ;; change from relase to release.
> > +           ;;
> > +           ;; Remove bundles.
> > +           (with-directory-excursion "thirdparty"
> > +             (for-each delete-file-recursively
> > +                       '("HID_Utilities"
> > +                         "MallincamGuider-OSX-dylib-source.zip"
> > +                         "VidCapture"
> > +                         "cfitsio-3.47-patched.tar.gz"
> > +                         "cfitsio-README-PHD2.txt"
> > +                         "cfitsio-snprintf.patch"
> > +                         "eigen-eigen-67e894c6cd8f.tar.bz2"
> > +                         "gettext-0.14.4-bin.zip"
> > +                         "gettext-0.14.4-dep.zip"
> > +                         "gtest-1.7.0.zip"
> > +                         "indiclient-44aaf5d3-win32.zip"
> > +                         "libcurl-7.54.0-win32.zip"
> > +                         "libdc1394-2.2.2.tar.gz"
> > +
>  "libindi-58b26c584049e1b9ecd55aa5f4a225677a417898.tar.gz"
> > +                         "libusb-1.0.21.tar.bz2"
> > +                         "openssag")))))))
>
> To make maintenance easier, perhaps you could reuse the 'delete-all-but'
> procedure from turbovnc or similar?  This has the benefit of listing
> what is kept (more transparent), and if the things we do care for change
> names, we will know.
>
> Could you please send a v2 with this suggestion implemented?
>
> --
> Thanks,
> Maxim
>

[-- Attachment #2: Type: text/html, Size: 4324 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [bug#62306] [PATCH v2] gnu: Add phd2.
  2023-03-20 21:50 [bug#62306] [PATCH] gnu: Add phd2 Sharlatan Hellseher
  2023-03-21 19:24 ` Maxim Cournoyer
@ 2023-03-27  8:46 ` Sharlatan Hellseher
  2023-04-11 15:56   ` bug#62306: [PATCH] " Maxim Cournoyer
  2023-04-09 19:00 ` [bug#62306] Sharlatan Hellseher
  2 siblings, 1 reply; 6+ messages in thread
From: Sharlatan Hellseher @ 2023-03-27  8:46 UTC (permalink / raw)
  To: 62306; +Cc: Sharlatan Hellseher

* 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+)))
 
+(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=> (stat x #f)
+                       (compose (cut eq? 'directory <>) stat:type)))
+              (with-directory-excursion directory
+                (let* ((pred
+                        (negate (cut member <> (append '("." "..") preserve))))
+                       (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=yes"
+              "-DUSE_SYSTEM_CFITSIO=yes"
+              "-DUSE_SYSTEM_EIGEN3=yes"
+              "-DUSE_SYSTEM_GTEST=yes"
+              "-DUSE_SYSTEM_LIBINDI=yes"
+              "-DUSE_SYSTEM_LIBUSB=yes")))
+    (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")
-- 
2.39.2





^ permalink raw reply related	[flat|nested] 6+ messages in thread

* bug#62306: [PATCH] gnu: Add phd2
  2023-03-27  8:46 ` [bug#62306] [PATCH v2] " Sharlatan Hellseher
@ 2023-04-11 15:56   ` Maxim Cournoyer
  0 siblings, 0 replies; 6+ messages in thread
From: Maxim Cournoyer @ 2023-04-11 15:56 UTC (permalink / raw)
  To: Sharlatan Hellseher; +Cc: 62306-done

Hi,

Sharlatan Hellseher <sharlatanus@gmail.com> 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+)))
>  
> +(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=> (stat x #f)
> +                       (compose (cut eq? 'directory <>) stat:type)))
> +              (with-directory-excursion directory
> +                (let* ((pred
> +                        (negate (cut member <> (append '("." "..") preserve))))
> +                       (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=yes"
> +              "-DUSE_SYSTEM_CFITSIO=yes"
> +              "-DUSE_SYSTEM_EIGEN3=yes"
> +              "-DUSE_SYSTEM_GTEST=yes"
> +              "-DUSE_SYSTEM_LIBINDI=yes"
> +              "-DUSE_SYSTEM_LIBUSB=yes")))
> +    (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 © 2019 by Amar Singh <nly@disroot.org>
 ;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
 ;;; Copyright © 2020, 2021 Guillaume Le Vaillant <glv@posteo.net>
-;;; Copyright © 2021, 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2021, 2022, 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2021, 2022 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
 ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
@@ -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=> (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 :-).
     
     (build-system cmake-build-system)
     (arguments
-     (list
-      #:configure-flags
-      #~(list "-DOPENSOURCE_ONLY=yes"
-              "-DUSE_SYSTEM_CFITSIO=yes"
-              "-DUSE_SYSTEM_EIGEN3=yes"
-              "-DUSE_SYSTEM_GTEST=yes"
-              "-DUSE_SYSTEM_LIBINDI=yes"
-              "-DUSE_SYSTEM_LIBUSB=yes")))
+     (list #:configure-flags #~(list "-DOPENSOURCE_ONLY=yes"
+                                     "-DUSE_SYSTEM_CFITSIO=yes"
+                                     "-DUSE_SYSTEM_EIGEN3=yes"
+                                     "-DUSE_SYSTEM_GTEST=yes"
+                                     "-DUSE_SYSTEM_LIBINDI=yes"
+                                     "-DUSE_SYSTEM_LIBUSB=yes")))

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!

-- 
Thanks,
Maxim




^ permalink raw reply	[flat|nested] 6+ messages in thread

* [bug#62306]
  2023-03-20 21:50 [bug#62306] [PATCH] gnu: Add phd2 Sharlatan Hellseher
  2023-03-21 19:24 ` Maxim Cournoyer
  2023-03-27  8:46 ` [bug#62306] [PATCH v2] " Sharlatan Hellseher
@ 2023-04-09 19:00 ` Sharlatan Hellseher
  2 siblings, 0 replies; 6+ messages in thread
From: Sharlatan Hellseher @ 2023-04-09 19:00 UTC (permalink / raw)
  To: 62306; +Cc: Maxim Cournoyer

Hi,

Just a gentle ping on the status of this pach. Let me know if it
requirers to be modified more.

Thanks,
Oleg

-- 
… наш разум - превосходная объяснительная машина которая способна
найти смысл почти в чем угодно, истолковать любой феномен, но
совершенно не в состоянии принять мысль о непредсказуемости.

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2023-04-11 15:57 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-20 21:50 [bug#62306] [PATCH] gnu: Add phd2 Sharlatan Hellseher
2023-03-21 19:24 ` Maxim Cournoyer
2023-03-22 11:04   ` Sharlatan Hellseher
2023-03-27  8:46 ` [bug#62306] [PATCH v2] " Sharlatan Hellseher
2023-04-11 15:56   ` bug#62306: [PATCH] " Maxim Cournoyer
2023-04-09 19:00 ` [bug#62306] Sharlatan Hellseher

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).