From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id CPJyLp8rp2IhvgAAbAwnHQ (envelope-from ) for ; Mon, 13 Jun 2022 14:20:47 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id mB4+Lp8rp2JBpAAAauVa8A (envelope-from ) for ; Mon, 13 Jun 2022 14:20:47 +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 219473F629 for ; Mon, 13 Jun 2022 14:20:46 +0200 (CEST) Received: from localhost ([::1]:44038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0j3l-0000A6-4G for larch@yhetil.org; Mon, 13 Jun 2022 08:20:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0izD-0003yn-4u for guix-patches@gnu.org; Mon, 13 Jun 2022 08:16:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35325) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0izC-0008Ld-Po for guix-patches@gnu.org; Mon, 13 Jun 2022 08:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o0izC-0004DR-MA for guix-patches@gnu.org; Mon, 13 Jun 2022 08:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55941] [PATCH core-updates 3/3] services: pcscd: Use switch-symlinks from (guix build utils). Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Jun 2022 12:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55941 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55941@debbugs.gnu.org, Maxime Devos Cc: Arun Isaac Received: via spool by 55941-submit@debbugs.gnu.org id=B55941.165512254616163 (code B ref 55941); Mon, 13 Jun 2022 12:16:02 +0000 Received: (at 55941) by debbugs.gnu.org; 13 Jun 2022 12:15:46 +0000 Received: from localhost ([127.0.0.1]:57451 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o0iys-0004CT-R3 for submit@debbugs.gnu.org; Mon, 13 Jun 2022 08:15:46 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:46414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o0iye-0004Br-Mf for 55941@debbugs.gnu.org; Mon, 13 Jun 2022 08:15:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=VbqhoA6ff8iWGT2D2kFiygOwvvstSXmjUx4dA3fPRm4=; b=pjHPDLq9EljxT5Fwe/2pXL7Kz9 b7HEMwqIKNoPNIUB19k8AGUhkcLBywwMHvs80eQnnqFClJP/aYAnLqniRfFD7PBQeJmWuyd0EITrA OgND1HtFUylWAqGCkUpTq8qD0bosxpwo1C/cTLzM3vAkhLTrMTgoDAmr0wVSBcLYqpdYyFUkgghwV ZbA3WkcdcVEiI7vA/3Rv5mOTgMG38+78haTDFDherhBRE6rObVnCNoGE4EkHJaFJSKJX6PUSa6U91 9UI13ujDfi2T0ZFVKdTrMJ1ABuXBuAw+4F1gYdqZVa2kRfTFGN0RqJ74F0hHGHOcYrUlVcIZYJERz hyJ4zqAw==; Received: from [192.168.2.1] (port=5296 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1o0iyb-0004fy-Oa; Mon, 13 Jun 2022 17:45:25 +0530 From: Arun Isaac Date: Mon, 13 Jun 2022 17:45:23 +0530 Message-Id: <20220613121523.20327-3-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220613121523.20327-1-arunisaac@systemreboot.net> References: <20220613121523.20327-1-arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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=1655122847; 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=VbqhoA6ff8iWGT2D2kFiygOwvvstSXmjUx4dA3fPRm4=; b=GQtmyD+HS2rRcjG8Ut64gHYiYlFwJLO4yPT4dvldiNZRNC5vGsXqc3m3sRE6L59DpVgMSg mS2lqiJP8QjBqF7+RAzckKLkBMJWBVv77cBniN7ZzOq8IynqK2GwsOWCQdD8h6XMYecUCe 8RoPVyQ6myeOVPfFb2/hF2/+b1Q/1WwKRg51hP7p6oKxu9GbAj2TomNa/GmzbSLzowqwAD kGvpEii+IWOIXIwI7JbwhaNbk1RB0z5Igp2cztNjr3ZT2k/LLLg+7XNfbk/rLgO6Po9gbk qp77wkKH77wj38FyD+Bd9yfMHvmWvRv1dnCn0yCUHJDqx0GMPic3qjgyjPIxIw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1655122847; a=rsa-sha256; cv=none; b=aVFR3TMSBS7tsbGlk7DjUVC5IlN5VrJ23RGqy8sGdpaBYpm8Kjwr5FGN6eP/W3d4mpNBk7 7GhPbJP1Lj76dAkoqur6uitnjM1sod9Avg4kcB/OVR0F8LaFTC1caQiJsBbUkDY8z2QVMv WU75dafhpYATASMHeSlFichV/PYfH8HXQ5t66hABjizWj9MyKVLsJxAMXjkz+oMa65EIO4 /yDLvsd/lsPrHg7Yy3MsauLyZohk8mUum+K+++QwVJN6+UYLs2fSV/SyV+hKLZigb46FmG RNMdzykHrvaEaEWQhaUEZuJNGCxS04psaJs+q/TAPakvIqAIz+mRBxOEDg9Oxw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=systemreboot.net header.s=default header.b=pjHPDLq9; dmarc=fail reason="SPF not aligned (relaxed)" header.from=systemreboot.net (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: 7.01 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=systemreboot.net header.s=default header.b=pjHPDLq9; dmarc=fail reason="SPF not aligned (relaxed)" header.from=systemreboot.net (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: 219473F629 X-Spam-Score: 7.01 X-Migadu-Scanner: scn1.migadu.com X-TUID: LnSXh4GjZ/Jd switch-symlinks has been moved to (guix build utils). We need not duplicate it anymore. * gnu/services/security-token.scm (pcscd-activation): Use switch-symlinks from (guix build utils). --- gnu/services/security-token.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gnu/services/security-token.scm b/gnu/services/security-token.scm index 52afad84a6..2356273398 100644 --- a/gnu/services/security-token.scm +++ b/gnu/services/security-token.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2018, 2022 Arun Isaac ;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; Copyright © 2021 Brice Waegeneire ;;; @@ -74,12 +74,7 @@ (define pcscd-activation '((guix build utils))) #~(begin (use-modules (guix build utils)) - ;; XXX: We can't use (guix utils) because it requires a - ;; dynamically-linked Guile, hence the duplicate switch-symlinks. - (define (switch-symlinks link target) - (let ((pivot (string-append link ".new"))) - (symlink target pivot) - (rename-file pivot link))) + (mkdir-p "/var/lib") (switch-symlinks "/var/lib/pcsc" #$(directory-union -- 2.36.1