From patchwork Mon May 19 09:50:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 42748 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 E244E27BC4B; Mon, 19 May 2025 10:51:52 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, 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 00C3327BC4E for ; Mon, 19 May 2025 10:51:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uGx9K-0003yS-2L; Mon, 19 May 2025 05:51:10 -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 1uGx9I-0003y5-4m for guix-patches@gnu.org; Mon, 19 May 2025 05:51:08 -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 1uGx9G-0001po-SA; Mon, 19 May 2025 05:51:06 -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=17spmlx2jvVFmon0wWik5mH70YrXX0bY6FGy2m7lYNs=; b=gXYO8JDeMGhAhicAlw2JHhLGZDZNFUEbGWxUP8cdvqTeA3hP5EyxWbqc8gOuWcb05V6i2cFJuwycGDwAUUZUTFcjgVuCu9EseKCVy+LfFtOPSKLHiAnfGDwN/6Qt5bmX0hN8rd1Xuuu5h0z7NuHM5sEJ37vBgB3SOcgQmObaSxbdJmtU/W+6i5OHGdtEUgKbwW4lhe8QH5IQgPGZMwVAbXkQfnJ7ZrS+pdWxpAtGcU/5PcVXqok7w/TfHTKP96FskyaqijgqAUI+hljU4Fgzxtuct/9ll8idbxskwj5ubuy/bbgMauvG37SZWwEt7XgR+KTLtjS26hA6O9KmQ3rw8g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uGx9D-0005m8-0j; Mon, 19 May 2025 05:51:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78378] [PATCH v1 2/3] gexp: Add symlink-to procedure. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: sarg@sarg.org.ru, maxim.cournoyer@gmail.com, ludo@gnu.org, guix@cbaines.net, gabriel@erlikon.ch, dev@jpoiret.xyz, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Mon, 19 May 2025 09:51: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 , Sergey Trofimov , Maxim Cournoyer , Ludovic =?utf-8?q?Court=C3=A8s?= , Christopher Baines , Gabriel Wicki , Josselin Poiret , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Sergey Trofimov , Maxim Cournoyer , Ludovic =?utf-8?q?Court=C3=A8s?= , Christopher Baines , Gabriel Wicki , Josselin Poiret , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 78378-submit@debbugs.gnu.org id=B78378.174764824022147 (code B ref 78378); Mon, 19 May 2025 09:51:02 +0000 Received: (at 78378) by debbugs.gnu.org; 19 May 2025 09:50:40 +0000 Received: from localhost ([127.0.0.1]:37561 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uGx8p-0005l8-Rh for submit@debbugs.gnu.org; Mon, 19 May 2025 05:50:40 -0400 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]:54749) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uGx8j-0005kI-5i for 78378@debbugs.gnu.org; Mon, 19 May 2025 05:50:33 -0400 Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-5fc8c68dc9fso7903512a12.1 for <78378@debbugs.gnu.org>; Mon, 19 May 2025 02:50:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1747648226; x=1748253026; 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=17spmlx2jvVFmon0wWik5mH70YrXX0bY6FGy2m7lYNs=; b=SY0hQL1Ttgz0nsiJb2zr14PC1gcP02/mkGm6iVmc+cT2LBNqZXH5rKS/cxRyZPEDmr 1gE4AMP1plSn5nxjzzgOMju4CLgMluJ3A2cGf8xizf0WbzIeuWz7bAQSnFkocptehlr2 3R5ZlhemaqcrqRAdvLLR/4GPLEaM2woZ1/NDi6x0gG79L7JRxV0BgbaAEBxSNyPSLERa BF9erLnJd29dYM2z1BeEy18lQV2bHzQYspvdZ/aS3vwR1nmHjL0cEW8uleEgGPyWGtoT MIAQdOheGWbNV8Hs2dulxcDyNP1i3EsMNYdvoBSX5FltZNLJWib2Xu9aaMydD2Bmnc7d UhyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747648226; x=1748253026; 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=17spmlx2jvVFmon0wWik5mH70YrXX0bY6FGy2m7lYNs=; b=veLTEmPb6ENJHXBQZRqAFRssBq0yGv9Bz1cLWblAyqoZwrj8EAalSmWqNqKc4/jpWs D2MnG3/VlzKEFNGs015JcA5b9T5yiHFrOn955sSnPLj2Xld9fhk1xA7+8gnSTdVTb8z5 ZlcoEyq7SfOhRlrhWaz9LEvnYNqZwyLsZF71S+riCjD1wSRSzy1d+YgPAtNGw35fF+yI LoSstTPyFOGiEKyTtMeJbtyXDlwoSevTczEvXafAmj4ODeqXpLHQGemJUsJkh8C2+IjN G+oAUQUtlepBIQ7XzTbgFVPwT3Ddg4c5eIy/7ut+/L125VkDECBioNdLRbqfnynaBzXZ wsew== X-Gm-Message-State: AOJu0YxyLU4zGQH1yyDnNHwriNznUigR+50nghQyUdNYAf6OzgFmtNhY IjdJeXraaZRmxD4in906fR+xgWuFLdXQaCPGaZS/KsEX6TKmIZtnl7DjZVYVf80Jp3Alv5i/jgN XasC1sDttgA== X-Gm-Gg: ASbGncvVhNx4i/845UkNGa6X6dQ7+TcNfJxVJI7AYWyzzygy0dD1kCUdr9jvkHn9VZD vM8KPae/pUz3bRL8HzehGNRQ2s0EmkXC80wBLFJognGsauKP3mA4UBg5ImQ7YrhPlHzEMVdk1UW JpbsEcrL7H/0Gh8brXq9lELv9QwVS3KxG/9h1Hes2GyaPCpVNfdsWwUrbFtx5kDeH+RzmQ17v1E UTdzN6THs8LP1vZRRh088XUtfMS2Rk9Ha45leWM2yRHbQUucXYfpl6FapS8AAkOIeJI15Jx4Zq3 xODErf25jRUNKardBef3NEjpxHVJk7AEzFSA2hi5FcWnrQPE3OMuAUxBQbVg X-Google-Smtp-Source: AGHT+IFopxG1dF9ofAs1rFb+SJYtkNtj7keth1htjYw+b90y97ADjahTZjr9YmPg78OQZZm9o5ihsA== X-Received: by 2002:a17:907:1c2a:b0:ad2:40f4:c251 with SMTP id a640c23a62f3a-ad536bdff0bmr986460666b.35.1747648226561; Mon, 19 May 2025 02:50:26 -0700 (PDT) Received: from localhost ([2a02:2454:a095:5600:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ad52d4382d7sm560856166b.117.2025.05.19.02.50.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 May 2025 02:50:26 -0700 (PDT) From: Sergey Trofimov Date: Mon, 19 May 2025 11:50:09 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: <40e225a93a488b887fc770effe8f856c62620d28.1747647920.git.sarg@sarg.org.ru> References: <40e225a93a488b887fc770effe8f856c62620d28.1747647920.git.sarg@sarg.org.ru> 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 --- doc/guix.texi | 11 +++++++++++ guix/gexp.scm | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index ef8504bb3e..02f472246a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -12692,6 +12692,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 85d049e26a..5cb5e8e4e4 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 @@ -2182,6 +2183,10 @@ (define* (file-union name files #:key guile (dangling-symlinks? #f)) 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))