From debbugs-submit-bounces@debbugs.gnu.org Thu May 26 22:04:32 2022 Received: (at 55253) by debbugs.gnu.org; 27 May 2022 02:04:32 +0000 Received: from localhost ([127.0.0.1]:60410 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nuPL4-00053H-GQ for submit@debbugs.gnu.org; Thu, 26 May 2022 22:04:31 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:38408) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nuPKv-00052k-1s for 55253@debbugs.gnu.org; Thu, 26 May 2022 22:04:27 -0400 Received: from [2600:3c03::f03c:92ff:fe54:31cf] (helo=localhost.localdomain) by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nuPKp-0004xi-Vk for 55253@debbugs.gnu.org; Thu, 26 May 2022 22:04:15 -0400 From: Jack Hill To: 55253@debbugs.gnu.org Subject: [PATCH v2 2/2] gnu: nginx-rtmp-module: Use gexps in phases. Date: Thu, 26 May 2022 22:04:04 -0400 Message-Id: <20220527020404.6603-2-jackhill@jackhill.us> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220527020404.6603-1-jackhill@jackhill.us> References: <20220527020404.6603-1-jackhill@jackhill.us> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 55253 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.5 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/web.scm (nginx-rtmp-module)[#:phases]: Use gexps and remove trailing #t. --- gnu/packages/web.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index e349a863d5..d321348eed 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -800,24 +800,22 @@ (define-public nginx-rtmp-modul [...] Content analysis details: (2.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [2600:3c03:0:0:f03c:92ff:fe54:31cf listed in] [zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/web.scm (nginx-rtmp-module)[#:phases]: Use gexps and remove trailing #t. --- gnu/packages/web.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index e349a863d5..d321348eed 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -800,24 +800,22 @@ (define-public nginx-rtmp-module ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'unpack-nginx-sources - (lambda* (#:key inputs native-inputs #:allow-other-keys) + (lambda _ (begin ;; The nginx source code is part of the module’s source. (format #t "decompressing nginx source code~%") - (invoke "tar" "xvf" (assoc-ref inputs "nginx-sources") + (invoke "tar" "xvf" #$(this-package-input "nginx-sources") ;; This package's LICENSE file would be ;; overwritten with the one from nginx when ;; unpacking the nginx source, so rename the nginx ;; one when unpacking. "--transform=s,/LICENSE$,/LICENSE.nginx," - "--strip-components=1") - #t))) + "--strip-components=1")))) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((modules-dir (string-append (assoc-ref outputs "out") + (lambda _ + (let ((modules-dir (string-append #$output "/etc/nginx/modules"))) - (install-file "objs/ngx_rtmp_module.so" modules-dir) - #t))) + (install-file "objs/ngx_rtmp_module.so" modules-dir)))) (delete 'fix-root-dirs) (delete 'install-man-page))))) (home-page "https://github.com/arut/nginx-rtmp-module") -- 2.36.1