unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Sharlatan Hellseher <sharlatanus@gmail.com>
To: 68641@debbugs.gnu.org
Cc: Sharlatan Hellseher <sharlatanus@gmail.com>,
	Andreas Enge <andreas@enge.fr>,
	Efraim Flashner <efraim@flashner.co.il>,
	Eric Bavier <bavier@posteo.net>,
	Sharlatan Hellseher <sharlatanus@gmail.com>
Subject: [bug#68641] [PATCH 18/19] gnu: stackistry: Use G-Expressions.
Date: Sun, 21 Jan 2024 16:53:58 +0000	[thread overview]
Message-ID: <9d938ac4ef5c10625840629f00f4a345f12cfd41.1705854493.git.sharlatanus@gmail.com> (raw)
In-Reply-To: <cover.1705854493.git.sharlatanus@gmail.com>

* gnu/packages/astronomy.scm (stackistry): Update package style by using
G-Expressions. Apply indention.
[arguments]<#:tests?>: Use it instead of deleting check phase.
<#:phases>: Remove trailing #f from each lambda.

Change-Id: I30f3906719713f0d47dc2049564bc2691ba3cd5d
---
 gnu/packages/astronomy.scm | 79 +++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 40 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index c049e6e67f..99b22fa39e 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -1227,52 +1227,51 @@ (define-public stackistry
         (base32 "0rz29v33n0x0k40hv3v79ym5ylch1v0pbph4i21809gz2al5p7dq"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:make-flags
-       (list
-        (string-append
-         "SKRY_INCLUDE_PATH=" (assoc-ref %build-inputs "libskry") "/include")
-        (string-append
-         "SKRY_LIB_PATH=-L" (assoc-ref %build-inputs "libskry") "/lib")
-        (string-append
-         "LIBAV_INCLUDE_PATH=" (assoc-ref %build-inputs "ffmpeg") "/include"))
-       #:phases
-       (modify-phases %standard-phases
-         ;; no configure and tests are provided
-         (delete 'configure)
-         (delete 'check)
-         (add-after 'unpack 'fix-paths
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "src/main.cpp"
-               (("\"\\.\\.\", \"lang\"")
-                "\"../share/stackistry\", \"lang\""))
-             (substitute* "src/utils.cpp"
-               (("\"\\.\\.\", \"icons\"")
-                "\"../share/stackistry\", \"icons\""))
-             #t))
-         (replace 'install
-           ;; The Makefile lacks an ‘install’ target.
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (bin (string-append out "/bin"))
-                    (icons (string-append out "/share/stackistry/icons"))
-                    (lang (string-append out "/share/stackistry/lang")))
-               (copy-recursively "bin" bin)
-               (copy-recursively "icons" icons)
-               (copy-recursively "lang" lang))
-             #t)))))
+     (list
+      #:tests? #f ; No test target
+      #:make-flags
+      #~(list
+         (string-append
+          "SKRY_INCLUDE_PATH=" #$(this-package-input "libskry") "/include")
+         (string-append
+          "SKRY_LIB_PATH=-L" #$(this-package-input "libskry") "/lib")
+         (string-append
+          "LIBAV_INCLUDE_PATH=" #$(this-package-input "ffmpeg") "/include"))
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; no configure and tests are provided
+          (delete 'configure)
+          (add-after 'unpack 'fix-paths
+            (lambda _
+              (substitute* "src/main.cpp"
+                (("\"\\.\\.\", \"lang\"")
+                 "\"../share/stackistry\", \"lang\""))
+              (substitute* "src/utils.cpp"
+                (("\"\\.\\.\", \"icons\"")
+                 "\"../share/stackistry\", \"icons\""))))
+          (replace 'install
+            ;; The Makefile lacks an ‘install’ target.
+            (lambda _
+              (let* ((out #$output)
+                     (bin (string-append out "/bin"))
+                     (icons (string-append out "/share/stackistry/icons"))
+                     (lang (string-append out "/share/stackistry/lang")))
+                (copy-recursively "bin" bin)
+                (copy-recursively "icons" icons)
+                (copy-recursively "lang" lang)))))))
     (native-inputs
      (list pkg-config))
-     (inputs
-      (list gtkmm-3 libskry ffmpeg-4))
-     (home-page "https://github.com/GreatAttractor/stackistry")
-     (synopsis "Astronomical lucky imaging/image stacking tool")
-     (description
-      "Stackistry implements the lucky imaging principle of astronomical
+    (inputs
+     (list gtkmm-3 libskry ffmpeg-4))
+    (home-page "https://github.com/GreatAttractor/stackistry")
+    (synopsis "Astronomical lucky imaging/image stacking tool")
+    (description
+     "Stackistry implements the lucky imaging principle of astronomical
 imaging: creating a high-quality still image out of a series of many (possibly
 thousands) low quality ones (blurred, deformed, noisy).  The resulting image
 stack typically requires post-processing, including sharpening (e.g. via
 deconvolution).  Such post-processing is not performed by Stackistry.")
-     (license license:gpl3+)))
+    (license license:gpl3+)))
 
 (define-public stellarium
   (package
-- 
2.41.0





  parent reply	other threads:[~2024-01-21 16:56 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-21 16:51 [bug#68641] [PATCH 00/19] gnu: Astronomy 2024/01 updates Sharlatan Hellseher
2024-01-21 16:53 ` [bug#68641] [PATCH 01/19] gnu: stellarium: Update to 23.4 Sharlatan Hellseher
2024-01-21 16:53 ` [bug#68641] [PATCH 02/19] gnu: indi-2.0: Update to 2.0.5 Sharlatan Hellseher
2024-01-21 16:53 ` [bug#68641] [PATCH 03/19] gnu: gpredict: Update home-page and description Sharlatan Hellseher
2024-01-21 16:53 ` [bug#68641] [PATCH 04/19] gnu: libxisf: Update to 0.2.11 Sharlatan Hellseher
2024-01-21 16:53 ` [bug#68641] [PATCH 05/19] gnu: python-crds: Update to 11.17.14 Sharlatan Hellseher
2024-01-21 16:53 ` [bug#68641] [PATCH 06/19] gnu: python-drms: Update to 0.7.1 Sharlatan Hellseher
2024-01-21 16:53 ` [bug#68641] [PATCH 07/19] gnu: python-pyvo: Update to 1.5 Sharlatan Hellseher
2024-01-21 16:53 ` [bug#68641] [PATCH 08/19] gnu: python-stcal: Update to 1.5.2 Sharlatan Hellseher
2024-01-21 16:53 ` [bug#68641] [PATCH 09/19] gnu: python-sunpy: Update to 5.1.1 Sharlatan Hellseher
2024-01-21 16:53 ` [bug#68641] [PATCH 10/19] gnu: Add python-ndcube Sharlatan Hellseher
2024-01-21 16:53 ` [bug#68641] [PATCH 11/19] gnu: Add python-dust-extinction Sharlatan Hellseher
2024-01-21 16:53 ` [bug#68641] [PATCH 12/19] gnu: Add python-specutils Sharlatan Hellseher
2024-01-24 14:15   ` Maxim Cournoyer
2024-01-21 16:53 ` [bug#68641] [PATCH 13/19] gnu: python-synphot: Enable more options Sharlatan Hellseher
2024-01-24 14:16   ` Maxim Cournoyer
2024-01-21 16:53 ` [bug#68641] [PATCH 14/19] gnu: python-tweakwcs: Update to 0.8.6 Sharlatan Hellseher
2024-01-21 16:53 ` [bug#68641] [PATCH 15/19] gnu: python-skyfield: Update to 1.47 Sharlatan Hellseher
2024-01-21 16:53 ` [bug#68641] [PATCH 16/19] gnu: python-stsynphot: Fix build Sharlatan Hellseher
2024-01-21 16:53 ` [bug#68641] [PATCH 17/19] gnu: libpasastro: Use G-Expressions Sharlatan Hellseher
2024-01-24 11:58   ` Efraim Flashner
2024-01-21 16:53 ` Sharlatan Hellseher [this message]
2024-01-21 16:53 ` [bug#68641] [PATCH 19/19] gnu: libnova: " Sharlatan Hellseher
2024-01-24 14:20 ` [bug#68641] [PATCH 00/19] gnu: Astronomy 2024/01 updates Maxim Cournoyer
2024-01-24 22:19 ` [bug#68641] [PATCH 17/19] gnu: libpasastro: Use G-Expressions Sharlatan Hellseher
2024-01-24 22:37 ` bug#68641: [PATCH 00/19] gnu: Astronomy 2024/01 updates Sharlatan Hellseher
2024-01-24 23:27 ` [bug#68641] " Sharlatan Hellseher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9d938ac4ef5c10625840629f00f4a345f12cfd41.1705854493.git.sharlatanus@gmail.com \
    --to=sharlatanus@gmail.com \
    --cc=68641@debbugs.gnu.org \
    --cc=andreas@enge.fr \
    --cc=bavier@posteo.net \
    --cc=efraim@flashner.co.il \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).