From patchwork Sat May 7 08:37:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 39130 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 4FE9227BBEA; Sat, 7 May 2022 09:38:21 +0100 (BST) 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_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 2145127BBE9 for ; Sat, 7 May 2022 09:38:21 +0100 (BST) Received: from localhost ([::1]:46374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnFxE-000282-9K for patchwork@mira.cbaines.net; Sat, 07 May 2022 04:38:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnFwz-00024y-0C for guix-patches@gnu.org; Sat, 07 May 2022 04:38:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56499) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnFwx-0002kI-Nh for guix-patches@gnu.org; Sat, 07 May 2022 04:38:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nnFww-0003q6-MC for guix-patches@gnu.org; Sat, 07 May 2022 04:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55297] [PATCH 03/10] gnu: cuirass: Use $SSL_CERT_DIR. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 May 2022 08:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55297 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55297@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 55297-submit@debbugs.gnu.org id=B55297.165191266714656 (code B ref 55297); Sat, 07 May 2022 08:38:02 +0000 Received: (at 55297) by debbugs.gnu.org; 7 May 2022 08:37:47 +0000 Received: from localhost ([127.0.0.1]:50379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwg-0003oB-KT for submit@debbugs.gnu.org; Sat, 07 May 2022 04:37:47 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:44060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwe-0003nR-0l for 55297@debbugs.gnu.org; Sat, 07 May 2022 04:37:44 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by albert.telenet-ops.be with bizsmtp id Tkdi270084UW6Th06kdiWV; Sat, 07 May 2022 10:37:42 +0200 From: Maxime Devos Date: Sat, 7 May 2022 08:37:33 +0000 Message-Id: <20220507083740.59995-3-maximedevos@telenet.be> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220507083740.59995-1-maximedevos@telenet.be> References: <20220507083740.59995-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1651912662; bh=RCvckiZv6U/TDd3is15QIYIAdVK/Mam9eHnhFgFErKs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=c4CRhsDBivJczgpDGT7MX77J+tsCSn/K2L0c11rucZMcq1yY/s8iB8w+I9eaTHqGY m8xhWSIzFl5yZCui0BRpuWyBT7uk8X4r7ouPYdH5BMDeahNqMhaG4NnxzVh6AY9ypn P3nf2My7DCTyYi85S/vsxzAbcj6Pur7ggdcuvfxal0bvJrZyHyl0vdD1GclhXuhp3Y CsRZpfRdxReTR6XgonchrHaTV+qkDcdL2s/D9UV5z9MMmjNmKSmMTseDR4hNObDqxk tPqKNSgucfWybmAj2VEwXxHS970W6Seb93tPuzgE6XG70/srkg0GOxQj8Yz+H+nRMx OiTaGwnivEBwA== 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ci.scm (cuirass)[native-search-paths]: Use the $SSL_CERT_DIR from (guix search-paths) instead of a local copy. --- gnu/packages/ci.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index a2dce71d40..ab421fe870 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -28,6 +28,7 @@ (define-module (gnu packages ci) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix download) + #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR)) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages boost) @@ -52,7 +53,8 @@ (define-module (gnu packages ci) #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (guix build-system cmake) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR))) (define-public cuirass (let ((commit "9f08035f942a1e78f92e2db886d7837b0ab98b2f") @@ -173,9 +175,7 @@ (define-public cuirass (file-type 'regular) (separator #f) ;single entry (files '("etc/ssl/certs/ca-certificates.crt"))) - (search-path-specification - (variable "SSL_CERT_DIR") - (files '("etc/ssl/certs"))))) + $SSL_CERT_DIR)) (synopsis "Continuous integration system") (description "Cuirass is a continuous integration tool using GNU Guix. It is