From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id cOB6L/4vdmKp5wAAbAwnHQ (envelope-from ) for ; Sat, 07 May 2022 10:38:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id QAB9Lv4vdmI1EwAAG6o9tA (envelope-from ) for ; Sat, 07 May 2022 10:38:22 +0200 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 90F831FDBF for ; Sat, 7 May 2022 10:38:22 +0200 (CEST) Received: from localhost ([::1]:46374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnFxF-000282-Bw for larch@yhetil.org; Sat, 07 May 2022 04:38:21 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1651912702; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=RCvckiZv6U/TDd3is15QIYIAdVK/Mam9eHnhFgFErKs=; b=BdIHGgq5dUFfGVPhxfvckafqkhF111mXVp+Cf6ZxQ8xDWMEC3fzm1N5jJu8zP/mdVyWedY ONqOU8q6BEDTBH1EisWiryLJvB32jLc0w/okFoE9qdr4qA+vt7FhjpzQsnVBB4PgZ/uzVR EcRor9Py9u42KXAnQH0pgFiXi6Rm7VAkgc3oh4nM5U/f4Yg9uQ+o2in90X2zXUIfSReq7J 1Rmv/hqqqkb6TMPikf8C5eXjPN378SmkZdl+qprN5IuFV3mXIzXyVPOBZzEYydXJGB6GYM LSF7x4KmKNhRcIZQ/bz3DNLhmOTNHVuxvLdfTI2W/fwqNBF8rDd6JMhAjvty6w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1651912702; a=rsa-sha256; cv=none; b=j5S5X1+sPouhF7wjcOD4DosPgEy3YZZM5z4sptq706bw4k/lpl6K+Pv2QLFBMckmmsv4Ec AjMYgLXNsXJW4wIzNMZc2MG9D27U0uFCPh3MT+hulMod7IpgtMwo0gMBa4md+jUP7KXLfI my4i9PQPLE41cw6ILeU6m9Da2tgtcpv4m7jH8rKp0U14o3BvBduh9kpuYbKFske9g+29pw cbDeLz/m8kqCftC93+6iSQ4IC8gq2ABN4kvBErnqWdvhIUyWVgsfBegKQ2ULfYyGnswL76 ddyRhMjkqxp+fHCazFMKoYNJotyiuy6ZnQUYZsUVWhjlrAgSLFROA5qdMMFYGw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b=c4CRhsDB; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 9.40 X-Spam: Yes Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b=c4CRhsDB; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 90F831FDBF X-Spam-Score: 9.40 X-Migadu-Spam: Yes X-Migadu-Scanner: scn0.migadu.com X-TUID: TGwqf4fmUYwv * 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 -- 2.35.1