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)) From patchwork Sun May 11 16:08:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 42527 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 4079D27BC4B; Sun, 11 May 2025 17:10:23 +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=ham 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 B3DB927BC49 for ; Sun, 11 May 2025 17:10:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uE9Fk-0000eh-F8; Sun, 11 May 2025 12:10:12 -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 1uE9Ff-0000dc-OT for guix-patches@gnu.org; Sun, 11 May 2025 12:10: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 1uE9Fe-0007Jr-Hd; Sun, 11 May 2025 12:10: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=mdskQKIIoSminOuv9j+kfMd2WgDop1LivqG6bQ6o550=; b=Zsej9180sup3rHOe0vOp90UbJVfPekX4jDGH27rtErd7uOJ4Hsfp1OFPzmxsyg2imN1W63oEsE5k7L4FfgnlTUUBXDzYwS60cXbO7PgabUZo/yd9/MMPvNQ1OSQgcK6dD5VFKck4UDjtXYMX8clSHXdlyw+Qo5dJqaf8XBoREWZTzJIGfpVDsKwXH8zE/E7zBGUTMFtAD8wzQFbvIqeQ3/K/cU/P0KFRWhAQr8xRxw1AmApS3/wHNe+gvY+/v4u+yPKKDQaW+HDyWN41gw73O5IiUu2wjijWDg0P8Nl0XlGj21gMGwMBy3/7LKJoL65MA3uuC3WbO0VNbrD3Xi796g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uE9Fa-0005SR-G1; Sun, 11 May 2025 12:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78378] [PATCH 2/2] home: services: Build "files" union allowing dangling symlinks. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, hako@ultrarare.space, janneke@gnu.org, ludo@gnu.org, tanguy@bioneland.org, 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 , Andrew Tropin , Hilton Chain , Janneke Nieuwenhuizen , Ludovic =?utf-8?q?Court=C3=A8s?= , Tanguy Le Carrour X-Debbugs-Original-Xcc: Andrew Tropin , Hilton Chain , Janneke Nieuwenhuizen , Ludovic =?utf-8?q?Court=C3=A8s?= , Tanguy Le Carrour Received: via spool by 78378-submit@debbugs.gnu.org id=B78378.174697975320764 (code B ref 78378); Sun, 11 May 2025 16:10:02 +0000 Received: (at 78378) by debbugs.gnu.org; 11 May 2025 16:09:13 +0000 Received: from localhost ([127.0.0.1]:38555 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uE9Em-0005Oa-67 for submit@debbugs.gnu.org; Sun, 11 May 2025 12:09:13 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:51655) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uE9Ei-0005Nu-Ad for 78378@debbugs.gnu.org; Sun, 11 May 2025 12:09:09 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-43d04ea9d9aso19087125e9.3 for <78378@debbugs.gnu.org>; Sun, 11 May 2025 09:09:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1746979742; x=1747584542; 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=mdskQKIIoSminOuv9j+kfMd2WgDop1LivqG6bQ6o550=; b=SQrkKsyWzFoy4i1DyGcQGHybUxEYPIfT2JUtMpBvZBop5eJPUMaT+h4u9bkSHCsiIN ZoihmRbYQju0VOZkfA2i3f622IoQ6deg/SQd0nXaDiwfKJnx3EPMOyJhb+m/CtZ0C4+N B59zzQHjm8UJC82UzW3QMc9OaoZluRZxK0HDsbQ+ZQl0pDhIqQHhVG+Vcbfxb81ibuYf V/rT0mQ4BWJC1oK1uMTYhmP7uA51/DU1NXhVVgPngLGu3/VXrUj2G+8syxfzfd2RZzXB SEt19jvwtcSk+qFDAWZEZlxmFe7NOLoAPdO3R+CoVj7xHhdhVRsQrhbavgH5p1L6ERvl p9dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746979742; x=1747584542; 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=mdskQKIIoSminOuv9j+kfMd2WgDop1LivqG6bQ6o550=; b=OvfEbVeRUhb9yUKuE4eUEGNdnG5PK0CvILJeJvxAWwXdAq4SFtCegVBAowWkNbkLdW XrEqw1myhmzmbiIiWXDFWs0oCHsOpouh937K4J5rhYTsQyXq/bBm2EZQHGq9teci4HRi dsr3yDMnsEYQy+1OCqz5vDVVrN/qyhZaQNU9gzOfn6S9llB7ow1DgYuY1sDPrKTp/cSk EoOyD7zd4e/u/m/6YUb2tLnXuftbid/7BlaAvIqCV4exj9VEfBS7yYhG1+wA7JOTOhMm zryhQh4BSYbdYM6laPMe4L5wT7h3mTeJaRU6enqBDWTwBlREw1cQbIetC11cS7qzIRQf onZw== X-Gm-Message-State: AOJu0YwqcjdQs6rP34bBucHNvBk8DL/Ddgnr3WtbQoV2Ll/FigslFMuu P/zvs/OiAkQASv0OZx1FgZ3STd80Uq4FdoY1IjfI4khzVuhJtzYo2pOgvCMytZlENCILNVkt8XI sBlpVIQ== X-Gm-Gg: ASbGncth+q4svgGCTbOusmNR5nmGDE93EHtrtqUTH7aXpyRBijWThdFrh7EbJgQZBhX P2hWaBAtdTjErASpzM84vaXPIBsvEcJRS2J//YqCQXINoGHDqObfl4zV3nJBygn3jJBxquqdtSi XP5C39BZuORNAszGuP/Iyor6Nfs2D8SjNlmdCPWbleR1nzW/Z4N+rL4QofM+E+pulhD1gNzHrV2 U0i0DDq5+oPDhbtcILeHl8tQgTrFExjmCRkdXzaIWoVuzlqtc1NkwgLMWG+6gwVLqzbIVaZN1Do 73AldYWdIiiK+EtT1GyzO3vu58aBKEEz7SmG5yUMjCI6YnDT X-Google-Smtp-Source: AGHT+IGa688OqUTDDFypz+B7z04KPq6idA5Gj7aPH6hmUXC6xmgzRQ5DTkWQHrZgmx1wftOZlsaPWQ== X-Received: by 2002:a05:600c:4e45:b0:43d:46de:b0eb with SMTP id 5b1f17b1804b1-442d6d44814mr90075195e9.12.1746979741757; Sun, 11 May 2025 09:09:01 -0700 (PDT) Received: from localhost ([2a02:2454:a095:5600:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442d687bdc0sm95318115e9.39.2025.05.11.09.09.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 May 2025 09:09:01 -0700 (PDT) From: Sergey Trofimov Date: Sun, 11 May 2025 18:08:03 +0200 Message-ID: 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 * gnu/home/services.scm (files->files-directory): Build file union without checking for existence of included items. * tests/guix-home.sh: Verify symlinking files out of store works. Change-Id: I94054003f4a6be944252ce7a397cf56f0b979554 --- gnu/home/services.scm | 16 +++++++++++++++- tests/guix-home.sh | 8 +++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/gnu/home/services.scm b/gnu/home/services.scm index 2342dc5e07..55f9365922 100644 --- a/gnu/home/services.scm +++ b/gnu/home/services.scm @@ -343,7 +343,21 @@ (define (files->files-directory files) ;; leading to a build failure of "files.drv". (assert-no-duplicates files) - (file-union "files" files)) + ;; Compute the file-union allowing dangling symlinks + ;; This enables creating symlinks to locations out of store + (computed-file + "files" + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils) + (ice-9 match)) + (mkdir #$output) + (chdir #$output) + (for-each (match-lambda + ((target source) + (mkdir-p (dirname target)) + (symlink source target))) + '#$files))))) ;; Used by symlink-manager (define home-files-directory "files") diff --git a/tests/guix-home.sh b/tests/guix-home.sh index dbfe7dbd48..b8d90196f1 100644 --- a/tests/guix-home.sh +++ b/tests/guix-home.sh @@ -73,7 +73,9 @@ trap 'chmod -Rf +w "$test_directory"; rm -rf "$test_directory"' EXIT (list `(".config/test.conf" ,(plain-file "tmp-file.txt" - "the content of ~/.config/test.conf")))) + "the content of ~/.config/test.conf")) + + `("symlink" ,(symlink-to "")))) (service home-bash-service-type (home-bash-configuration @@ -104,6 +106,7 @@ trap 'chmod -Rf +w "$test_directory"; rm -rf "$test_directory"' EXIT "# the content of bashrc-test-config.sh")))))))) EOF + sed -i "s,,$test_directory," home.scm echo -n "# dot-bashrc test file for guix home" > "dot-bashrc" # Check whether the graph commands work as expected. @@ -126,6 +129,7 @@ EOF guix home container home.scm -- cat '~/.config/test.conf' | \ grep "the content of" guix home container home.scm -- test -h '~/.bashrc' + guix home container home.scm -- test -h '~/symlink' test "$(guix home container home.scm -- id -u)" = 1000 guix home container home.scm -- test -f '$HOME/sample/home.scm' && false guix home container home.scm --expose="$PWD=$HOME/sample" -- \ @@ -153,6 +157,8 @@ EOF test -d "${HOME}/.guix-home" test -h "${HOME}/.bash_profile" test -h "${HOME}/.bashrc" + test -h "${HOME}/symlink" + test "$(readlink -f $HOME/symlink)" == "$test_directory" grep 'alias run="guix shell"' "$HOME/.bashrc" grep "alias path='echo \$PATH'" "$HOME/.bashrc" test "$(tail -n 2 "${HOME}/.bashrc")" == "\