From patchwork Sun Jan 21 16:53:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 59291 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 E8E1827BBEC; Sun, 21 Jan 2024 16:56:06 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=ham 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 8B4BB27BBE9 for ; Sun, 21 Jan 2024 16:56:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRb75-0004FM-9I; Sun, 21 Jan 2024 11:56:03 -0500 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 1rRb73-0004Ec-CF for guix-patches@gnu.org; Sun, 21 Jan 2024 11:56:01 -0500 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 1rRb72-0004cw-G5 for guix-patches@gnu.org; Sun, 21 Jan 2024 11:56:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRb74-0007k0-JW; Sun, 21 Jan 2024 11:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68641] [PATCH 18/19] gnu: stackistry: Use G-Expressions. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 21 Jan 2024 16:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68641 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68641@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Efraim Flashner , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier , Sharlatan Hellseher Received: via spool by 68641-submit@debbugs.gnu.org id=B68641.170585611229666 (code B ref 68641); Sun, 21 Jan 2024 16:56:02 +0000 Received: (at 68641) by debbugs.gnu.org; 21 Jan 2024 16:55:12 +0000 Received: from localhost ([127.0.0.1]:38852 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRb6G-0007iG-1w for submit@debbugs.gnu.org; Sun, 21 Jan 2024 11:55:12 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:47231) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRb5X-0007bN-8p for 68641@debbugs.gnu.org; Sun, 21 Jan 2024 11:54:28 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-40e9d288f45so29129235e9.2 for <68641@debbugs.gnu.org>; Sun, 21 Jan 2024 08:54:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705856058; x=1706460858; darn=debbugs.gnu.org; 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=KzbLhAiDjBTirs35iNLsmIZiMK5FtatOTurxlpc/2MQ=; b=GYX8RWJrcXb38n5veoqSm6s2zZKBTVU8O/XbhixxjhNwp5qN5XLSKVl/+y3qMKmplf rnKjA9PidyiZ05Wv9CXg7tYLDAHUnYvHyM4dU1+qR6zv2RkInHsDCe/2yyDR4NvUSjxJ wdY8GPSXYXoiBl/aLMTPrw8WTnr/27RxHBngxEClenm0TUPXZIaTkWNBtpgVaGZ8Rlku Tex0cKGVua2GdaKhnBmgdet8rUcxA5plkNZjeZV2M/xVzdbIJGfatnSu8bZ7STIsdO/X EeNG/PogAhKghnsqKcgJ2NNz6T87U7csSsUTTma6DbNYKUw9ys/9l26unNhdad+w7wcH 9HjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705856058; x=1706460858; 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=KzbLhAiDjBTirs35iNLsmIZiMK5FtatOTurxlpc/2MQ=; b=IAGGNYFIsT7AJoQ1Ej69DSi1tVRdocDeSHBMmj9GD1QuuFIc1OwgwhBV8aWr1vhiP7 GLAjLtmHHCHeLZuRbK0X6wuN8yU8RGUBfoCpGMYNK3GknEU7Yuya0Q8C2phusruaD6oL BH3xYvmaJzo92zKGMLU554rfy5q2FefGIXZ6GGS5XumDBgAhaKXiuaP71xqmixkBTEwV bhg0Ol62zQcqgeoZG8AG0SMSRvzv5aNXcY0PmcO6YVess+A6gJ4gYyOIoaGKswL5DM15 DY2LYDmw0J3b6bv1AClPS/cQdi7hURjwfFkHQxKSF9eo8cciArtvHapG6OUJTtqhmurb Vdhg== X-Gm-Message-State: AOJu0Yxj5OOuQ80ATrato6Ws9Rc+U90SQBwce9jAegjG4naplGIkS2OE RAkkQw46QOLkkMgk1+WKgp8Y3v+M5uqyGk9ZPXwXxaZxfOksHI2wJTw1CaCspBY= X-Google-Smtp-Source: AGHT+IFA75x+VWRrn3yfpXLlRqOq4coHlybZLL59IsMOm1zfszPaX9nN3UIY6JuVU+eSHQLQIKUJRQ== X-Received: by 2002:a05:600c:4fc7:b0:40e:3b99:6379 with SMTP id o7-20020a05600c4fc700b0040e3b996379mr1206075wmq.259.1705856057991; Sun, 21 Jan 2024 08:54:17 -0800 (PST) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id bi13-20020a05600c3d8d00b0040e8800fcf3sm16242222wmb.5.2024.01.21.08.54.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 08:54:17 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 21 Jan 2024 16:53:58 +0000 Message-ID: <9d938ac4ef5c10625840629f00f4a345f12cfd41.1705854493.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.41.0 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 (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