From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id sHzyMOt5x2C8ZQAAgWs5BA (envelope-from ) for ; Mon, 14 Jun 2021 17:46:51 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id UKSJLOt5x2A1PwAA1q6Kng (envelope-from ) for ; Mon, 14 Jun 2021 15:46:51 +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 ED7D134856 for ; Mon, 14 Jun 2021 17:46:50 +0200 (CEST) Received: from localhost ([::1]:53302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsonZ-0005nK-Sf for larch@yhetil.org; Mon, 14 Jun 2021 11:46:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsof8-00007e-Pd for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36012) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsof8-0007AT-GU for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsof8-0004Ez-E9 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 18/37] 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: Mon, 14 Jun 2021 15:38:06 +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 Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368507916186 (code B ref 49025); Mon, 14 Jun 2021 15:38:06 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:37:59 +0000 Received: from localhost ([127.0.0.1]:47539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsof1-0004D0-0h for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:59 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:41494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoez-0004AR-1i for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:57 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id H3dw2500A0mfAB4063dwx5; Mon, 14 Jun 2021 17:37:56 +0200 Message-ID: <9f50356b729d98eb09b66c55caa95791b1fe3209.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:37:56 +0200 In-Reply-To: References: Content-Type: multipart/mixed; boundary="=-C1zB4ihXX/E8Gsy5UlVk" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685076; bh=KLlMYyFZOSGpAA6P7XtX2q2k7QZAvy1ChdIPsS6tTa4=; h=Subject:From:To:Date:In-Reply-To:References; b=GPgH0CCc6v8RTapun7o/Wesv27Z+5cbQ6x+cfAqTOXHAZNvx+pfFoH33ienpB6Jvw 6dlIRHMSGoAhHab0fiVSVZyzKHZJ1QiNgNCM5WhF9PDCyOkQhexPzM+DOAiBJfIITS powMdPdFIASJCSNXLOmp93g4n5knno1NYDPulq3aRferel/SEjCDf8Pcnqp6sirdqQ Ymk2mzhiafHxH+bd8A6qYl2aA0e29uZaaL7eazsV1U2l951znT6BUEOu8TFRX9Xfqx o1VfPjA5TQsbc5vAc07RGSOFxKTRU6ePr06dCH3nC2quc3jEODFVpXOg2obzyl514+ PmQQFaJMSkE/g== 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=1623685611; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: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=KLlMYyFZOSGpAA6P7XtX2q2k7QZAvy1ChdIPsS6tTa4=; b=YW2iRETzFkPzBu4lXAc/SAARdY6rddnIgqENe6U27bHHAAjoVn087971nXFyUM+cjgm7Mq wTI68cd5b5aut/DrffHLGGyBogRHLBfRjnyflgBq5/KqFd2qdgYS5bVX+mSboNOY+ccEvh 3TXsKeJ0Zwi58VBorgt0AvO5K1sxtRxBLuptiICFUuDs17mamqj+TwpcI4qqdbRsU0TwnA y/zfffC55QVHVf6CyBndJNpSHLgKr6iajK48m/FbvQMhbezrz07AGlW7hlOiVz0g5kCn64 /oW2AzXxoqVNFDErd1Y02yS8MtmvSuquZPgC3/Cn+ZjyxQzDDkfn00rfdkL99w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1623685611; a=rsa-sha256; cv=none; b=LrcBVSgWxtYlJYqvnW/XHlLz5O1t851DDvCMBTvakZJGjQ++W6UHrsLdSQtvgs2kh6KBIu ZQYmIAGwdCbLyHAZDFrUcLkyju2APqrKaKeaPC8D5n+KznWk1HOPGEo+l0F+1cRaMweQ/S WSPf6THoWfnDZ6a1b5abC/hpmVgtYP/0pXYGLizrJDlNR2lVkDrMjCnErygTYVCFamCeDc 1VXFIdI0WEHkAQNhjnXqtq5Vu4PSTq1mCawZQlehjsLJEmGEl1SqKUGUE6lT4yoopGrpuU IR1QkD2sej6aTiTrREom/mWRvWGMtXzE6lbcTZqFNycAXwjvBv4W3twCh9zwLA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=GPgH0CCc; 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: -1.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=GPgH0CCc; 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: ED7D134856 X-Spam-Score: -1.33 X-Migadu-Scanner: scn0.migadu.com X-TUID: HzoW1koZYWvT --=-C1zB4ihXX/E8Gsy5UlVk Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit 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(-) --=-C1zB4ihXX/E8Gsy5UlVk Content-Disposition: attachment; filename="0018-openssl-Use-G-exp-machinery-for-referring-to-outputs.patch" Content-Transfer-Encoding: 8bit Content-Type: text/x-patch; name="0018-openssl-Use-G-exp-machinery-for-referring-to-outputs.patch"; charset="UTF-8" diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 9de9a78e84..90211c733d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -347,7 +348,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 @@ -371,8 +372,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" @@ -398,23 +399,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) @@ -423,13 +424,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") --=-C1zB4ihXX/E8Gsy5UlVk--