From patchwork Sun May 11 16:08:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 42528 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 DB35427BC4B; Sun, 11 May 2025 17:10:25 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 7EFE927BC49 for ; Sun, 11 May 2025 17:10:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uE9Fn-0000ih-Or; Sun, 11 May 2025 12:10:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uE9Fi-0000du-27 for guix-patches@gnu.org; Sun, 11 May 2025 12:10:10 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uE9Fh-0007Kg-N4; Sun, 11 May 2025 12:10:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=Ax91e9t/AlSRpm4kQJtUIFhEfbclQC5FYEIaAlzqJT4=; b=ZzK4sfEHwo5rxxyPwGHEF++pWxdjY5uvT+P74gfOZLUuVWjNapwNHTeIclCkKhEfKFTaYOgvHt0B30uJRu8KRlgpvpvoPgmATvAysbAtWeeeZB1ihhvqQCxvVDrz9+U3fLxDZXQ5jqu16hTgLeoKDkzdG+g82QtnP9iNGdpsuMVk5LNXlwTY18kPLProeJPV0x8UnlWMImN4oqLh0K3O+VqsaX3qm+dnDKh69KR57LqUKE7XfwaeI+V1I03FRYJiwXoWXIuG9gchix/PBniMu4SzNnNHrBc/KPonHIlTHmA+v3tyCXlcNsLaBYBmqO8692xZt86AAqL+k/X/z+0uPA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uE9Fa-0005SK-2c; Sun, 11 May 2025 12:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78378] [PATCH 1/2] gexp: Add symlink-to procedure. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, gabriel@erlikon.ch, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, maxim.cournoyer@gmail.com, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sun, 11 May 2025 16:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78378 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78378@debbugs.gnu.org Cc: Sergey Trofimov , Christopher Baines , Gabriel Wicki , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Maxim Cournoyer , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Gabriel Wicki , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Maxim Cournoyer , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 78378-submit@debbugs.gnu.org id=B78378.174697975220748 (code B ref 78378); Sun, 11 May 2025 16:10:02 +0000 Received: (at 78378) by debbugs.gnu.org; 11 May 2025 16:09:12 +0000 Received: from localhost ([127.0.0.1]:38553 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uE9El-0005OP-98 for submit@debbugs.gnu.org; Sun, 11 May 2025 12:09:12 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:48525) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uE9Eg-0005NZ-QK for 78378@debbugs.gnu.org; Sun, 11 May 2025 12:09:08 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3a1d8c09674so1641534f8f.1 for <78378@debbugs.gnu.org>; Sun, 11 May 2025 09:09:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1746979740; x=1747584540; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ax91e9t/AlSRpm4kQJtUIFhEfbclQC5FYEIaAlzqJT4=; b=PNEW0NjIjmiQDhaLEuy8w+Uy9NsC0ls2KYrpDoYZVxTQU+KDLpsuVjQ3k7RMH+elLt 8jXEIWrfh4RL4gXq2qIeoYbr+BHU5qySC33KGoSXwlOlE336Gbh7AmzHrpan5ODjsOxg ocp6zL54sfttROP0o5kWiUOdT0PZZ4ewnmlM2ik+XfYlk45cfzEQ4Wp9gawZDGIH/I5B KYL8eBedku4gCLEIi8OCdkIPuzcUua9bN2RWZURh4E4l6VX6oDqXnTViz7AV+WTa8/U5 AqeoKTwsLUjx/PQa9FX5ZyDBnRYfiRpfIxMns7m5ECdvSBkjm8tMWsf0xkjfA5TmQ5My ndVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746979740; x=1747584540; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ax91e9t/AlSRpm4kQJtUIFhEfbclQC5FYEIaAlzqJT4=; b=PWKvQgdE7SIPENDMMMzmfqMAM/Q3J3gzXH1hwP3YgYeBuEq50DKip4/FmLLg9ZVVNV BY61ikTzAzPJSPKL6HM3CM1UZF5VkETVV6pCr+gaq6J0XKNMaRhE2ips53+ovPS5/G7a 5WsQXiYZj8KgzYFlO7zOQKBXrJUeMYKsRYlUxQ0Ir8EGQRrWqyGNruEhx0MQPPwReRjT bXLMA+zpPaxGJEeJeaBJ86ug1I8M7HsTTwHkKNlbcfYYsbtHYKmEu8H6sO/BUg/vv794 YJsYukeaYvsN3PXtivtyTvBPPTxfyBryJZ94pBj31q3XW2RPRE1gQcAbnXoxypJ69Ozp NrsQ== X-Gm-Message-State: AOJu0YwW31VIaJQncDH6nHD22mU/AKwhHzeg5pijfbaKJN4UnfdoWi3D 5lx3D+i+S3NS+3RFs/CY1f/jUdHXW01BzYG1IrlDcZkZYw/UwEkL4y6pYuOI6whDEvKjQmQONmM OOmF0Vg== X-Gm-Gg: ASbGncuPwP9FUbGjek9Wrmf0xJxVgzm9994lJTBrqNolgG1VAPneu7AEEuOpFjr91MO IE077ha+MApmFwSuIV2K1T2VBoJaPLCw0l+xC9G6OiB7q58GO6kVWEE4ndQFD29pW49pgek4E9+ Mb5hWxh6rP2C2pNGiT7+y3zStXZbRxOnRronZD/IQ9qRLWb0Z3Rbb8FEYxJh7FHF10oXAzoCWX8 RGigkr7u0DWurx24Z214mIdlv3dr1oPJJfnWZZvYoGUDUD6Oo/4IMEeIBTV8W0SL7eMikZV5g/W dL+OzzXnsxCFFDhbzN5ST8vt2Lqg+ET3CdU7YgI5XE/BlS5N X-Google-Smtp-Source: AGHT+IGiKkAKdxjdRVasiBL2x+RmopYZceJWT8AQHYlPc0kixeFtXAgl5kg5cFvTJLlbyFxbgSECZQ== X-Received: by 2002:a05:6000:4287:b0:3a0:b635:ea40 with SMTP id ffacd0b85a97d-3a1f64a3e3dmr9042241f8f.55.1746979740134; Sun, 11 May 2025 09:09:00 -0700 (PDT) Received: from localhost ([2a02:2454:a095:5600:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442cd32f194sm140218445e9.10.2025.05.11.09.08.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 May 2025 09:08:59 -0700 (PDT) From: Sergey Trofimov Date: Sun, 11 May 2025 18:08:02 +0200 Message-ID: <043c83e23cd42da9c61d0e4f5bf5fb7299332a49.1746978699.git.sarg@sarg.org.ru> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/gexp.scm (symlink-to): New procedure. * doc/guix.texi (G-Expressions): Document it. Change-Id: I7c1ba3a29a4e5350cb4f196185b7171c4750b6b8 Reviewed-by: Maxim Cournoyer --- doc/guix.texi | 11 +++++++++++ guix/gexp.scm | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index cbc4dd0fc9..ebc8a5e5d3 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -12689,6 +12689,17 @@ G-Expressions This yields an @code{etc} directory containing these two files. @end deffn +@deffn {Procedure} symlink-to target +Return a @code{} that is a symbolic link to target. +Note, that the target does not need to exist at the build time. One of +uses is to put arbitrary symlinks into user's home: + +@lisp +(service home-files-service-type + `(("Sync" ,(symlink-to "/storage/Sync")))) +@end lisp +@end deffn + @deffn {Procedure} directory-union name things Return a directory that is the union of @var{things}, where @var{things} is a list of file-like objects denoting directories. For example: diff --git a/guix/gexp.scm b/guix/gexp.scm index 8dd746eee0..ef83c671ec 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -119,6 +119,7 @@ (define-module (guix gexp) file-union directory-union references-file + symlink-to imported-files imported-modules @@ -2181,6 +2182,10 @@ (define* (file-union name files #:key guile) files))))) #:guile guile)) +(define (symlink-to target) + "Return an object that is a symlink to TARGET." + (computed-file "link" (gexp (symlink (ungexp target) (ungexp output))))) + (define* (directory-union name things #:key (copy? #f) (quiet? #f) (resolve-collision 'resolve-collision/default))