From unknown Sun Jun 22 11:40:31 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64551] [PATCH] svn-download: Use download-nar. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: mail@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Mon, 10 Jul 2023 09:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64551 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64551@debbugs.gnu.org Cc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by submit@debbugs.gnu.org id=B.168898086128387 (code B ref -1); Mon, 10 Jul 2023 09:22:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Jul 2023 09:21:01 +0000 Received: from localhost ([127.0.0.1]:47741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qIn4m-0007NZ-RB for submit@debbugs.gnu.org; Mon, 10 Jul 2023 05:21:01 -0400 Received: from lists.gnu.org ([209.51.188.17]:33066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qIn4l-0007NS-9F for submit@debbugs.gnu.org; Mon, 10 Jul 2023 05:20:59 -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 1qIn4k-0006gV-6X for guix-patches@gnu.org; Mon, 10 Jul 2023 05:20:59 -0400 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qIn4i-000776-4D for guix-patches@gnu.org; Mon, 10 Jul 2023 05:20:57 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:3a91:a0a4:ecee:f157]) by mira.cbaines.net (Postfix) with ESMTPSA id C5EA427BBE2 for ; Mon, 10 Jul 2023 10:20:54 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 84e6f761 for ; Mon, 10 Jul 2023 09:20:54 +0000 (UTC) From: Christopher Baines Date: Mon, 10 Jul 2023 10:20:54 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) This should help if there are issues fetching from the source repository. * guix/svn-download.scm (svn-fetch): Use download-nar and adjust accordingly. --- guix/svn-download.scm | 45 +++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/guix/svn-download.scm b/guix/svn-download.scm index 769571b5f6..6a53d5d2eb 100644 --- a/guix/svn-download.scm +++ b/guix/svn-download.scm @@ -23,6 +23,7 @@ (define-module (guix svn-download) #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix monads) + #:use-module (guix modules) #:use-module (guix packages) #:use-module (guix utils) #:use-module ((guix build svn) #:prefix build:) @@ -79,22 +80,38 @@ (define* (svn-fetch ref hash-algo hash "Return a fixed-output derivation that fetches REF, a object. The output is expected to have recursive hash HASH of type HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." + + (define guile-json + (module-ref (resolve-interface '(gnu packages guile)) 'guile-json-4)) + + (define guile-lzlib + (module-ref (resolve-interface '(gnu packages guile)) 'guile-lzlib)) + + (define guile-gnutls + (module-ref (resolve-interface '(gnu packages tls)) 'guile-gnutls)) + (define build - (with-imported-modules '((guix build svn) - (guix build utils)) - #~(begin - (use-modules (guix build svn) - (ice-9 match)) + (with-imported-modules + (source-module-closure '((guix build svn) + (guix build download-nar) + (guix build utils))) + (with-extensions (list guile-json guile-gnutls ;for (guix swh) + guile-lzlib) + #~(begin + (use-modules (guix build svn) + (guix build download-nar) + (ice-9 match)) - (svn-fetch (getenv "svn url") - (string->number (getenv "svn revision")) - #$output - #:svn-command #+(file-append svn "/bin/svn") - #:recursive? (match (getenv "svn recursive?") - ("yes" #t) - (_ #f)) - #:user-name (getenv "svn user name") - #:password (getenv "svn password"))))) + (or (svn-fetch (getenv "svn url") + (string->number (getenv "svn revision")) + #$output + #:svn-command #+(file-append svn "/bin/svn") + #:recursive? (match (getenv "svn recursive?") + ("yes" #t) + (_ #f)) + #:user-name (getenv "svn user name") + #:password (getenv "svn password")) + (download-nar #$output)))))) (mlet %store-monad ((guile (package->derivation guile system))) (gexp->derivation (or name "svn-checkout") build base-commit: 9c164d72b2bbdb1823befb32bede82f6af431750 prerequisite-patch-id: 08325c0c53413d75ee6dbb363626fd11858a2960 -- 2.41.0 From unknown Sun Jun 22 11:40:31 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64551] [PATCH] svn-download: Use download-nar. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 Jul 2023 21:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64551 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines Cc: Josselin Poiret , Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , 64551@debbugs.gnu.org, Ricardo Wurmus Received: via spool by 64551-submit@debbugs.gnu.org id=B64551.168902570829514 (code B ref 64551); Mon, 10 Jul 2023 21:49:02 +0000 Received: (at 64551) by debbugs.gnu.org; 10 Jul 2023 21:48:28 +0000 Received: from localhost ([127.0.0.1]:49311 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qIyk8-0007fw-63 for submit@debbugs.gnu.org; Mon, 10 Jul 2023 17:48:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34196) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qIyk6-0007fG-Ot for 64551@debbugs.gnu.org; Mon, 10 Jul 2023 17:48:27 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qIyjz-0007YR-Cc; Mon, 10 Jul 2023 17:48:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=qKPeMME8r7CcJQZXqlVS8RdNc/6LaKQKRHJPkJ+llQU=; b=NE44DbhAUlX4kUmY3U+r Sgwnu6/g2pXrn2Zn9+ynLnzTnMrFqf816F0qH0B44ukRjdwZ503HhWXB2VSyqGlIMD5+NJi3YIn+X jCVE2xMebVfDga/Er8aEBucIaHOrhBvoJH1gLTOegjMDs/MUqnT1riVo2EdFCRvfQ6GMtFaXsSsrG VdjrT71mA/h4U6aDtoiwj8HjgQtcCQZRtKInmXDELgrm78r0eK1cX3P+Yg9FzWfxnp6d0whxbLWZF uHt8r5FtZ9lxMuAH7vUKTSt9UfsnMCHqXpMUYyPB6trAvaAw2wu9g75rpGXIN+ZdrsDT1DdFvyIqW Mo5BGlY7mvmJVQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qIyjy-0003E2-Ju; Mon, 10 Jul 2023 17:48:18 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Duodi 22 Messidor an 231 de la =?UTF-8?Q?R=C3=A9volution,?= jour du Cumin X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 10 Jul 2023 23:48:16 +0200 In-Reply-To: (Christopher Baines's message of "Mon, 10 Jul 2023 10:20:54 +0100") Message-ID: <87zg435tgf.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi! Christopher Baines skribis: > This should help if there are issues fetching from the source repository. > > * guix/svn-download.scm (svn-fetch): Use download-nar and adjust accordin= gly. [=E2=80=A6] > + (with-imported-modules > + (source-module-closure '((guix build svn) > + (guix build download-nar) > + (guix build utils))) > + (with-extensions (list guile-json guile-gnutls ;for (guix swh) > + guile-lzlib) =E2=80=9C;for (guix build download-nar)=E2=80=9D rather. Otherwise LGTM, thanks! Ludo=E2=80=99. From unknown Sun Jun 22 11:40:31 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Christopher Baines Subject: bug#64551: closed (Re: [bug#64551] [PATCH] svn-download: Use download-nar.) Message-ID: References: <87cz0y4zdh.fsf@cbaines.net> X-Gnu-PR-Message: they-closed 64551 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 64551@debbugs.gnu.org Date: Tue, 11 Jul 2023 08:39:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1689064742-15741-1" This is a multi-part message in MIME format... ------------=_1689064742-15741-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #64551: [PATCH] svn-download: Use download-nar. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 64551@debbugs.gnu.org. --=20 64551: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D64551 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1689064742-15741-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 64551-done) by debbugs.gnu.org; 11 Jul 2023 08:38:11 +0000 Received: from localhost ([127.0.0.1]:49689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJ8sq-00044m-5L for submit@debbugs.gnu.org; Tue, 11 Jul 2023 04:38:11 -0400 Received: from mira.cbaines.net ([212.71.252.8]:42822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJ8so-00044e-8j for 64551-done@debbugs.gnu.org; Tue, 11 Jul 2023 04:38:06 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 7EDDB27BBE2; Tue, 11 Jul 2023 09:38:05 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 6a272d92; Tue, 11 Jul 2023 08:38:04 +0000 (UTC) References: <87zg435tgf.fsf@gnu.org> User-agent: mu4e 1.10.2; emacs 28.2 From: Christopher Baines To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#64551] [PATCH] svn-download: Use download-nar. Date: Tue, 11 Jul 2023 09:34:28 +0100 In-reply-to: <87zg435tgf.fsf@gnu.org> Message-ID: <87cz0y4zdh.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64551-done Cc: 64551-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Hi! > > Christopher Baines skribis: > >> This should help if there are issues fetching from the source repository. >> >> * guix/svn-download.scm (svn-fetch): Use download-nar and adjust accordi= ngly. > > [=E2=80=A6] > >> + (with-imported-modules >> + (source-module-closure '((guix build svn) >> + (guix build download-nar) >> + (guix build utils))) >> + (with-extensions (list guile-json guile-gnutls ;for (guix swh) >> + guile-lzlib) > > =E2=80=9C;for (guix build download-nar)=E2=80=9D rather. I copied this comment from (guix git-download), and I think it makes sense. There shouldn't be any need from (guix build download-nar) to have guile-json and guile-gnutls, it even specifically avoids using https for this reason. I think why these extra inputs is indeed just to import (guix swh as it's required by (guix build download). > Otherwise LGTM, thanks! Great, I've pushed this to tex-team-next now as I'm hoping this will help fix ci.guix.gnu.org building tex-team-next. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmStFOpfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xf9Og//cbZaYX1nfqGX2O4NyuXPVH2aAbs4yE3Y mr6bkyOuW3zTZa/jW3OiQEqgt/kz4wq0RpfsohgJkvFnafUmoeA88XIO3fASMk9R O5/dIQKAeC7SR/QCXjj5WMNeZLe/byMylP4sqZF4CqQXgimDFflvs4mvyhCR41R/ YBgXKOlKr0LFnq9PlW96FkLWJsoUFd4jYhKUfuxucDHGBq5yYwg9jmfQuHcD5v4H XIpKrB7D1xCm3rQQkOnynvpVmWFl5j78EYiAH73iIFIztHPBj/QEuUDZv9NTcjI+ BjvNKxO5On/mnEzwd9JtDmneE9CdIsi/6IJlYC8U8VzwNyqgD1EvPz54btC3e3Um JvST1yZhSNqJeNdL2eBlWd6fq/nsiEI+EuaVpWdG3SA3qDEQNOC70MSK2Nqz/tdD zCvZ7ktfq1iiem3WSmxIFbm+4qlpeONFaAbF3UEq03M7hOphnWJ3clXgwwfKP9Qa l7PueZWe4ykLQahT2rmt+6/QlfG20f1q0z0xXsi5XVuv927/d7fUic+Cqq6tbPUZ Jf0nHXQIlWC8u2IiQANY2zfMnGU/m6ZQfRtXb2mRj5aNVLSzxfGan7H6SEnyV8tz Y2PG9h5AE5YsoFEwI+nY9nIYjwTnPnpvli5vwMfhgqglDOW4sNJ+oeHnbF0Srewk k9GYkko7PE0= =m0QW -----END PGP SIGNATURE----- --=-=-=-- ------------=_1689064742-15741-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 10 Jul 2023 09:21:01 +0000 Received: from localhost ([127.0.0.1]:47741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qIn4m-0007NZ-RB for submit@debbugs.gnu.org; Mon, 10 Jul 2023 05:21:01 -0400 Received: from lists.gnu.org ([209.51.188.17]:33066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qIn4l-0007NS-9F for submit@debbugs.gnu.org; Mon, 10 Jul 2023 05:20:59 -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 1qIn4k-0006gV-6X for guix-patches@gnu.org; Mon, 10 Jul 2023 05:20:59 -0400 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qIn4i-000776-4D for guix-patches@gnu.org; Mon, 10 Jul 2023 05:20:57 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:3a91:a0a4:ecee:f157]) by mira.cbaines.net (Postfix) with ESMTPSA id C5EA427BBE2 for ; Mon, 10 Jul 2023 10:20:54 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 84e6f761 for ; Mon, 10 Jul 2023 09:20:54 +0000 (UTC) From: Christopher Baines To: guix-patches@gnu.org Subject: [PATCH] svn-download: Use download-nar. Date: Mon, 10 Jul 2023 10:20:54 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Christopher Baines , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) This should help if there are issues fetching from the source repository. * guix/svn-download.scm (svn-fetch): Use download-nar and adjust accordingly. --- guix/svn-download.scm | 45 +++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/guix/svn-download.scm b/guix/svn-download.scm index 769571b5f6..6a53d5d2eb 100644 --- a/guix/svn-download.scm +++ b/guix/svn-download.scm @@ -23,6 +23,7 @@ (define-module (guix svn-download) #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix monads) + #:use-module (guix modules) #:use-module (guix packages) #:use-module (guix utils) #:use-module ((guix build svn) #:prefix build:) @@ -79,22 +80,38 @@ (define* (svn-fetch ref hash-algo hash "Return a fixed-output derivation that fetches REF, a object. The output is expected to have recursive hash HASH of type HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." + + (define guile-json + (module-ref (resolve-interface '(gnu packages guile)) 'guile-json-4)) + + (define guile-lzlib + (module-ref (resolve-interface '(gnu packages guile)) 'guile-lzlib)) + + (define guile-gnutls + (module-ref (resolve-interface '(gnu packages tls)) 'guile-gnutls)) + (define build - (with-imported-modules '((guix build svn) - (guix build utils)) - #~(begin - (use-modules (guix build svn) - (ice-9 match)) + (with-imported-modules + (source-module-closure '((guix build svn) + (guix build download-nar) + (guix build utils))) + (with-extensions (list guile-json guile-gnutls ;for (guix swh) + guile-lzlib) + #~(begin + (use-modules (guix build svn) + (guix build download-nar) + (ice-9 match)) - (svn-fetch (getenv "svn url") - (string->number (getenv "svn revision")) - #$output - #:svn-command #+(file-append svn "/bin/svn") - #:recursive? (match (getenv "svn recursive?") - ("yes" #t) - (_ #f)) - #:user-name (getenv "svn user name") - #:password (getenv "svn password"))))) + (or (svn-fetch (getenv "svn url") + (string->number (getenv "svn revision")) + #$output + #:svn-command #+(file-append svn "/bin/svn") + #:recursive? (match (getenv "svn recursive?") + ("yes" #t) + (_ #f)) + #:user-name (getenv "svn user name") + #:password (getenv "svn password")) + (download-nar #$output)))))) (mlet %store-monad ((guile (package->derivation guile system))) (gexp->derivation (or name "svn-checkout") build base-commit: 9c164d72b2bbdb1823befb32bede82f6af431750 prerequisite-patch-id: 08325c0c53413d75ee6dbb363626fd11858a2960 -- 2.41.0 ------------=_1689064742-15741-1--