From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 6P4IEOva6mB0UAAAgWs5BA (envelope-from ) for ; Sun, 11 Jul 2021 13:50:03 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id sLLNC+va6mBDMAAAB5/wlQ (envelope-from ) for ; Sun, 11 Jul 2021 11:50:03 +0000 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 84D4B283E1 for ; Sun, 11 Jul 2021 13:50:02 +0200 (CEST) Received: from localhost ([::1]:53200 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2XyD-0006gA-Gh for larch@yhetil.org; Sun, 11 Jul 2021 07:50:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2XxO-0004MC-9T for guix-patches@gnu.org; Sun, 11 Jul 2021 07:49:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50788) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2XxO-0008OC-1K for guix-patches@gnu.org; Sun, 11 Jul 2021 07:49:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m2XxO-00075q-0k for guix-patches@gnu.org; Sun, 11 Jul 2021 07:49:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v5 12/20] openssl: Use G-exp machinery for referring to outputs. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Jul 2021 11:49:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162600411127086 (code B ref 49025); Sun, 11 Jul 2021 11:49:09 +0000 Received: (at 49025) by debbugs.gnu.org; 11 Jul 2021 11:48:31 +0000 Received: from localhost ([127.0.0.1]:34082 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2Xwk-00072i-Iz for submit@debbugs.gnu.org; Sun, 11 Jul 2021 07:48:31 -0400 Received: from xavier.telenet-ops.be ([195.130.132.52]:38290) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2XwK-0006xg-Uw for 49025@debbugs.gnu.org; Sun, 11 Jul 2021 07:48:20 -0400 Received: from localhost.localdomain ([213.119.242.127]) by xavier.telenet-ops.be with bizsmtp id Tnno2500V2ldwth01no4sB; Sun, 11 Jul 2021 13:48:04 +0200 From: Maxime Devos Date: Sun, 11 Jul 2021 13:47:15 +0200 Message-Id: <20210711114723.27568-13-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210711114723.27568-1-maximedevos@telenet.be> References: <419215938396207999184dafa43afaed6d7a0715.camel@telenet.be> <20210711114723.27568-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1626004084; bh=3B3QDGP7dkXVyEAZJY8WCsdDeSjbBRGSdZVIeTRN4/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iG4P4l8jHJS2IATGZtakvZPgCTM8MfCuGJzIcB784VHIU+YjOeVt+jKimD8YhwxK1 Zini3P0Q7uStU8kzdVMSK1ay8B3rwk0Al6cY+p1SHoqyLLoiDa/qEa2zrBXSOnxfOT 2nJyGpIHYu1VumoHqf+Ul312hzEpC+KyvzoaCjpXL71+HWZRGRWD3WVpE/6R784k6L dzc35W8yf+GSRHpBLHfI2AXtmuShhSsgLH0kwh3mSCruuySOf5uHuMM9QNhOOYxo1L 5mvwnnLXB4LiLIAZrBmb42b4rOxnNJpJgE72GlmzzLs6bvme1b00xGhQAXlzCRhk27 HtfoLpbXo1RXg== 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626004202; 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-cc: 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=3B3QDGP7dkXVyEAZJY8WCsdDeSjbBRGSdZVIeTRN4/s=; b=iXYWcBssL0yVT/lo5jo6jm+A2+33N69F0vVuWym8M73RSgOTK2dLJjBdzp3sGG5VchmXdT ZxGUEOkVHA4DyIJP/Xg+Vy2kPsjG1jwniEidYCGBkjaYsgMA4Ajvry/2s4H4vqCE0B/+mC dubA7hyVBUSq3bFi0rozELxQ9m6+zpKqo3RI0NgsnS/VjecM57F2kygVM3KDswQaOXvp1B azmidrdlzzNy1b+f8/aK+zRAok6anPOjm5benEoMke4g52x0hLqiEqBP/MlBTToO+90cyO lYH3R/97AUDOGWVBahz119xg5lbkBVe4nkpR1J/9Dj+ROR7/wcUAawPkH5BzkQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626004202; a=rsa-sha256; cv=none; b=V1m3eaAYyNjNpT/DMEU1Wa2LgFt7j7bNaOgEMMZuyERyN6nAr36kHyoSGuuV/V6U8S++dM Tw9PMC29+UXoBwGcFuEKQuNhaLl39ND0X9k5Zht3z1cMppwgnSNklrK2vyHo/QV+2APrLP QhY/JbVwLaEeOr4gauos44VKAKcDLRbajGT0WTfoSCMKsGJz5LwNIzi/sV/zm+Vkf3w4Xm c65cGK5qXhBMj3kE66Fth7aKsvc+BPMpLiBZ8IR0IVIBRIY43bCtUFL+QuXRdMqX1ep8pq h+qFV4AN1D773IGY3kCb/AJ4Irnp6Tux61LfYMf2Am7A5o3nJhWxok8opqRvCw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=iG4P4l8j; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=iG4P4l8j; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 84D4B283E1 X-Spam-Score: -0.31 X-Migadu-Scanner: scn1.migadu.com X-TUID: EF/64es79DWu This doesn't fix anything broken, just for simplifying the code a little while we're rebuilding the world anyway. IMHO this makes the code a little more readable. * gnu/packages/tls.scm (openssl)[arguments]<#:phases>: Don't refer to the association list 'outputs', use #$output, #$output:doc and #$output:static instead. --- gnu/packages/tls.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 0024709a96..fd4a8b07b2 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2021 Solene Rapenne ;;; Copyright © 2021 Brice Waegeneire +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -345,7 +346,7 @@ required structures.") #$@(if (%current-target-system) #~((add-before 'configure 'set-cross-compile - (lambda* (#:key target outputs #:allow-other-keys) + (lambda* (#:key target #:allow-other-keys) (setenv "CROSS_COMPILE" (string-append target "-")) (setenv "CONFIGURE_TARGET_ARCH" (cond @@ -369,8 +370,8 @@ required structures.") "linux-ppc")))))) #~()) (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) + (lambda _ + (let* ((out #$output) (lib (string-append out "/lib"))) ;; It's not a shebang so patch-source-shebangs misses it. (substitute* "config" @@ -396,23 +397,23 @@ required structures.") #~((getenv "CONFIGURE_TARGET_ARCH")) #~()))))) (add-after 'install 'move-static-libraries - (lambda* (#:key outputs #:allow-other-keys) + (lambda _ ;; Move static libraries to the "static" output. - (let* ((out (assoc-ref outputs "out")) + (let* ((out #$output) (lib (string-append out "/lib")) - (static (assoc-ref outputs "static")) + (static #$output:static) (slib (string-append static "/lib"))) (for-each (lambda (file) (install-file file slib) (delete-file file)) (find-files lib "\\.a$"))))) (add-after 'install 'move-extra-documentation - (lambda* (#:key outputs #:allow-other-keys) + (lambda _ ;; Move man3 pages and full HTML documentation to "doc". - (let* ((out (assoc-ref outputs "out")) + (let* ((out #$output) (man3 (string-append out "/share/man/man3")) (html (string-append out "/share/doc/openssl")) - (doc (assoc-ref outputs "doc")) + (doc #$output:doc) (man-target (string-append doc "/share/man/man3")) (html-target (string-append doc "/share/doc/openssl"))) (copy-recursively man3 man-target) @@ -421,13 +422,12 @@ required structures.") (delete-file-recursively html)))) (add-after 'install 'remove-miscellany - (lambda* (#:key outputs #:allow-other-keys) + (lambda _ ;; The 'misc' directory contains random undocumented shell and Perl ;; scripts. Remove them to avoid retaining a reference on Perl. - (let ((out (assoc-ref outputs "out"))) - (delete-file-recursively (string-append out "/share/openssl-" - #$(package-version this-package) - "/misc")))))))) + (delete-file-recursively (string-append #$output "/share/openssl-" + #$(package-version this-package) + "/misc"))))))) (native-search-paths (list (search-path-specification (variable "SSL_CERT_DIR") -- 2.32.0