From unknown Thu Sep 11 18:07:20 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#28273] [PATCH] gnu: Fix current-guix. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Aug 2017 06:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 28273 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 28273@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.150398938310894 (code B ref -1); Tue, 29 Aug 2017 06:50:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Aug 2017 06:49:43 +0000 Received: from localhost ([127.0.0.1]:60055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmaLH-0002pe-6g for submit@debbugs.gnu.org; Tue, 29 Aug 2017 02:49:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50762) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmaLF-0002pP-VG for submit@debbugs.gnu.org; Tue, 29 Aug 2017 02:49:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dmaL9-0001uH-ST for submit@debbugs.gnu.org; Tue, 29 Aug 2017 02:49:36 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:45548) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dmaL9-0001ty-PC for submit@debbugs.gnu.org; Tue, 29 Aug 2017 02:49:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dmaL8-0005zc-HI for guix-patches@gnu.org; Tue, 29 Aug 2017 02:49:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dmaL5-0001pE-Um for guix-patches@gnu.org; Tue, 29 Aug 2017 02:49:34 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:39431 helo=mira.cbaines.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dmaL5-0001oS-OB for guix-patches@gnu.org; Tue, 29 Aug 2017 02:49:31 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id DA82513D261; Tue, 29 Aug 2017 07:49:30 +0100 (BST) Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id B616213D260 for ; Tue, 29 Aug 2017 07:49:30 +0100 (BST) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id a5a8a697 for ; Tue, 29 Aug 2017 06:49:30 +0000 (UTC) From: Christopher Baines Date: Tue, 29 Aug 2017 07:49:30 +0100 Message-Id: <20170829064930.19849-1-mail@cbaines.net> X-Mailer: git-send-email 2.14.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) 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: -4.0 (----) Without this change, I get errors like: ERROR: In procedure string-drop: ERROR: Value out of range 0 to 35: 51 * gnu/packages/package-management.scm (current-guix): Pass exactly the same path to git-predicate and local-file, to ensure that the select? function is compatible. --- gnu/packages/package-management.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 67a956dea..a6c97e618 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -312,10 +312,11 @@ generated file." #t))) (define-public current-guix - (let ((select? (delay (or (git-predicate - (string-append (current-source-directory) - "/../..")) - source-file?)))) + (let* ((repository-root (canonicalize-path + (string-append (current-source-directory) + "/../.."))) + (select? (delay (or (git-predicate repository-root) + source-file?)))) (lambda () "Return a package representing Guix built from the current source tree. This works by adding the current source tree to the store (after filtering it @@ -323,7 +324,7 @@ out) and returning a package that uses that as its 'source'." (package (inherit guix) (version (string-append (package-version guix) "+")) - (source (local-file "../.." "guix-current" + (source (local-file repository-root "guix-current" #:recursive? #t #:select? (force select?))))))) -- 2.14.1 From unknown Thu Sep 11 18:07:20 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#28273] Fix current-guix References: <20170829064930.19849-1-mail@cbaines.net> In-Reply-To: <20170829064930.19849-1-mail@cbaines.net> Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Aug 2017 07:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 28273 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 28273@debbugs.gnu.org Received: via spool by 28273-submit@debbugs.gnu.org id=B28273.150399000912033 (code B ref 28273); Tue, 29 Aug 2017 07:01:02 +0000 Received: (at 28273) by debbugs.gnu.org; 29 Aug 2017 07:00:09 +0000 Received: from localhost ([127.0.0.1]:60064 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmaVN-000380-Ed for submit@debbugs.gnu.org; Tue, 29 Aug 2017 03:00:09 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:39812 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmaVM-00037t-6T for 28273@debbugs.gnu.org; Tue, 29 Aug 2017 03:00:08 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id ADFEE13D262; Tue, 29 Aug 2017 08:00:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 92FAF13D261 for <28273@debbugs.gnu.org>; Tue, 29 Aug 2017 08:00:07 +0100 (BST) Date: Tue, 29 Aug 2017 08:00:04 +0100 From: Christopher Baines Message-ID: <20170829080004.26bf784f@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/Mk.8Ch+QLHX_LANh14RSaZW"; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) 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: -0.0 (/) --Sig_/Mk.8Ch+QLHX_LANh14RSaZW Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable You can check if this works for you by running:=20 guix build -e "((@ (gnu packages package-management) current-guix))" --Sig_/Mk.8Ch+QLHX_LANh14RSaZW Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlmlEPRfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XdhYBAAjGA5ajdDaM0T9ei2b+gtIEjrHY3nACWPVPrNn7kOKkVa2NNxumg5tS9h H/6mJMMYQDNbBf40xtdK1lz5NVYDKGsQHytgZcRU6x64pDTwzf1Zkf6jZg8a657L dlR/Z3wov4vXGN7J5tVer+KH+P9L/QnfUneLFESc5Y+Ca2P60bI3f0Ue3LLxWfuq ETHydr/7nX/A79/ntdEjDTZios7Pkr8IvGNK+AsD8M4/YccjwsVRSgLQ44tXL3gu CYLPrEk9/CJh+cA1Lq2NXiYbnTorOG2hl/WfqhoaR58goPoUVs4CtSE1TGukQSRf emRIXPI53Le6ZbagfRZ3hSg8fAuo59oDmcDrxAz4/O84TEvJNi429LX6jFC5S9KG 2y8xeBOp1n8opSYbHfYFjhPPp4SPZg/0aC4xyofNWWgf8iJrrEF9wnrNJr3yg9vm zB1PecjPYpCuA7LrlI57Vp1ozj4qKQmWLQwKD5tlPgKsmbpPwwXVpozm+KDuqCLP MuKlho5Ac7jGlOq7+8gD/72ZzXJDe8UCpjZBLatPrziEXA8iIWVC718cRNyrccRU g1ZBBfZHtu2duxuPG0jOdrpusZwGWUwLi7KOFVCLW0+fxr88fgYtJJr3MxoArQYV 1B55qOgZ1D46no2+fFnBi1dQtt4wp/Y7DT87VW/zkwJv4VjE4hs= =WFmB -----END PGP SIGNATURE----- --Sig_/Mk.8Ch+QLHX_LANh14RSaZW-- From unknown Thu Sep 11 18:07:20 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#28273] [PATCH] gnu: Fix current-guix. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Aug 2017 13:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 28273 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines Cc: 28273@debbugs.gnu.org Received: via spool by 28273-submit@debbugs.gnu.org id=B28273.15041855302585 (code B ref 28273); Thu, 31 Aug 2017 13:19:01 +0000 Received: (at 28273) by debbugs.gnu.org; 31 Aug 2017 13:18:50 +0000 Received: from localhost ([127.0.0.1]:36518 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dnPMv-0000fc-Tc for submit@debbugs.gnu.org; Thu, 31 Aug 2017 09:18:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35752) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dnPMu-0000fQ-FO for 28273@debbugs.gnu.org; Thu, 31 Aug 2017 09:18:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnPMl-0001Yg-9f for 28273@debbugs.gnu.org; Thu, 31 Aug 2017 09:18:43 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_40,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:34080) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnPMl-0001YY-62; Thu, 31 Aug 2017 09:18:39 -0400 Received: from [193.50.110.184] (port=46332 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dnPMk-0006bF-Lu; Thu, 31 Aug 2017 09:18:38 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20170829064930.19849-1-mail@cbaines.net> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 14 Fructidor an 225 de la =?UTF-8?Q?R=C3=A9volution?= 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-unknown-linux-gnu Date: Thu, 31 Aug 2017 15:18:37 +0200 In-Reply-To: <20170829064930.19849-1-mail@cbaines.net> (Christopher Baines's message of "Tue, 29 Aug 2017 07:49:30 +0100") Message-ID: <87val3ri36.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) 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: -5.0 (-----) Christopher Baines skribis: > Without this change, I get errors like: > ERROR: In procedure string-drop: > ERROR: Value out of range 0 to 35: 51 > > * gnu/packages/package-management.scm (current-guix): Pass exactly the sa= me > path to git-predicate and local-file, to ensure that the select? functi= on is > compatible. Good catch, LGTM. I think that fundamentally, we should arrange for =E2=80=98git-predicate=E2= =80=99 to not do any string prefix comparison. That=E2=80=99s bound to fail. If we could somehow restrict it to comparing inode numbers, that=E2=80=99d be perfect. Ludo=E2=80=99. From unknown Thu Sep 11 18:07:20 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#28273: closed (Re: [bug#28273] [PATCH] gnu: Fix current-guix.) Message-ID: References: <20170831220421.5ba1287c@cbaines.net> <20170829064930.19849-1-mail@cbaines.net> X-Gnu-PR-Message: they-closed 28273 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 28273@debbugs.gnu.org Date: Thu, 31 Aug 2017 21:05:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1504213502-10046-1" This is a multi-part message in MIME format... ------------=_1504213502-10046-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #28273: [PATCH] gnu: Fix current-guix. 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 28273@debbugs.gnu.org. --=20 28273: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D28273 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1504213502-10046-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 28273-done) by debbugs.gnu.org; 31 Aug 2017 21:04:30 +0000 Received: from localhost ([127.0.0.1]:38168 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dnWda-0002bC-6Y for submit@debbugs.gnu.org; Thu, 31 Aug 2017 17:04:30 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:42369 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dnWdX-0002b0-DV for 28273-done@debbugs.gnu.org; Thu, 31 Aug 2017 17:04:28 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 8625C13D286; Thu, 31 Aug 2017 22:04:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 7344313D285; Thu, 31 Aug 2017 22:04:25 +0100 (BST) Date: Thu, 31 Aug 2017 22:04:21 +0100 From: Christopher Baines To: ludo@gnu.org (Ludovic =?UTF-8?B?Q291cnTDqHM=?=) Subject: Re: [bug#28273] [PATCH] gnu: Fix current-guix. Message-ID: <20170831220421.5ba1287c@cbaines.net> In-Reply-To: <87val3ri36.fsf@gnu.org> References: <20170829064930.19849-1-mail@cbaines.net> <87val3ri36.fsf@gnu.org> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/Iu8/r5IjtX6K59udHNXgJjG"; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 28273-done Cc: 28273-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: -0.0 (/) --Sig_/Iu8/r5IjtX6K59udHNXgJjG Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Thu, 31 Aug 2017 15:18:37 +0200 ludo@gnu.org (Ludovic Court=C3=A8s) wrote: > Christopher Baines skribis: >=20 > > Without this change, I get errors like: > > ERROR: In procedure string-drop: > > ERROR: Value out of range 0 to 35: 51 > > > > * gnu/packages/package-management.scm (current-guix): Pass exactly > > the same path to git-predicate and local-file, to ensure that the > > select? function is compatible. =20 >=20 > Good catch, LGTM. Great, I've merged this now. > I think that fundamentally, we should arrange for =E2=80=98git-predicate= =E2=80=99 to > not do any string prefix comparison. That=E2=80=99s bound to fail. If we > could somehow restrict it to comparing inode numbers, that=E2=80=99d be > perfect. Hmm, yeah, that might work well... I think the structure would simplify to: - taking the list of files, creating a list of directories (rather than a tree) - combining these lists - finding each inode for every file and directory The predicate could then check if the provided inode is known, without switching on the type as it does at the moment. I'll put it on my list of things to look at :) --Sig_/Iu8/r5IjtX6K59udHNXgJjG Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlmoedVfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XfGCw//ej1ePV0FXY74v0kH6LbzRPXNTdMaNCeKthzV0GZEpb6D1F9liHJtsiQf QOMpFlRvYxBuv9SfQXLWsW7gaPHA21oHiZMzzbD6Fxmbm0R62F7E13siFVqkBnis K4PP2Nfcy1As4aX5Y+j+t/OPQxageowJzGmWOKpGdg6DvKeUjAj1D1wufRbh5Lpd 3aHZrwa/yylwTefor7GOyEhXPzKDbNCyppWts4FMccKtBedpPs7qF4AeYcTy1Bks Mc9c4HB4TMDNrqon4IauI43VS7FNySItR92ObpdQBchoqb4C0241+KMmBCg6ng8A 2Sv5fGEvyD+Vz+1C4eShVTylRLe8kGJGI5pXnDIW07dLPQLGUT0XGZIxu5mLVV7j 2BYcVhbI9MJNDrN5J0HxCnkqsMOBAZMlx02xGVoap1WSpDvDA6RDi5y9noQm/237 Y8cyl631pHgIoBvIyb5i4gAxtuMnvnU7FBXEXAGPTXx2A1BTvIxTvgfrVeVqGnyY fVWImAVme6LUNEpJg5Kg1WMXG3be5U5vrNG6Gw1NpSO/FZTv1Uy9C87NUinDTGX0 g1cPW7ZdEsFusPc8G6mjDj2/Qa6SJk/dvluPjGDaGGHd9U3yVUrvQ0uNYUuIkofZ CjYDUwNMSqAkh6flV7XzOL+sXdeSk/ooxqljqQKZBs0/IWbCnyg= =01KS -----END PGP SIGNATURE----- --Sig_/Iu8/r5IjtX6K59udHNXgJjG-- ------------=_1504213502-10046-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 29 Aug 2017 06:49:43 +0000 Received: from localhost ([127.0.0.1]:60055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmaLH-0002pe-6g for submit@debbugs.gnu.org; Tue, 29 Aug 2017 02:49:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50762) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmaLF-0002pP-VG for submit@debbugs.gnu.org; Tue, 29 Aug 2017 02:49:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dmaL9-0001uH-ST for submit@debbugs.gnu.org; Tue, 29 Aug 2017 02:49:36 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:45548) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dmaL9-0001ty-PC for submit@debbugs.gnu.org; Tue, 29 Aug 2017 02:49:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dmaL8-0005zc-HI for guix-patches@gnu.org; Tue, 29 Aug 2017 02:49:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dmaL5-0001pE-Um for guix-patches@gnu.org; Tue, 29 Aug 2017 02:49:34 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:39431 helo=mira.cbaines.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dmaL5-0001oS-OB for guix-patches@gnu.org; Tue, 29 Aug 2017 02:49:31 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id DA82513D261; Tue, 29 Aug 2017 07:49:30 +0100 (BST) Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id B616213D260 for ; Tue, 29 Aug 2017 07:49:30 +0100 (BST) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id a5a8a697 for ; Tue, 29 Aug 2017 06:49:30 +0000 (UTC) From: Christopher Baines To: guix-patches@gnu.org Subject: [PATCH] gnu: Fix current-guix. Date: Tue, 29 Aug 2017 07:49:30 +0100 Message-Id: <20170829064930.19849-1-mail@cbaines.net> X-Mailer: git-send-email 2.14.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) 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: -4.0 (----) Without this change, I get errors like: ERROR: In procedure string-drop: ERROR: Value out of range 0 to 35: 51 * gnu/packages/package-management.scm (current-guix): Pass exactly the same path to git-predicate and local-file, to ensure that the select? function is compatible. --- gnu/packages/package-management.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 67a956dea..a6c97e618 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -312,10 +312,11 @@ generated file." #t))) (define-public current-guix - (let ((select? (delay (or (git-predicate - (string-append (current-source-directory) - "/../..")) - source-file?)))) + (let* ((repository-root (canonicalize-path + (string-append (current-source-directory) + "/../.."))) + (select? (delay (or (git-predicate repository-root) + source-file?)))) (lambda () "Return a package representing Guix built from the current source tree. This works by adding the current source tree to the store (after filtering it @@ -323,7 +324,7 @@ out) and returning a package that uses that as its 'source'." (package (inherit guix) (version (string-append (package-version guix) "+")) - (source (local-file "../.." "guix-current" + (source (local-file repository-root "guix-current" #:recursive? #t #:select? (force select?))))))) -- 2.14.1 ------------=_1504213502-10046-1--