From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 08 05:29:13 2022 Received: (at submit) by debbugs.gnu.org; 8 Jul 2022 09:29:13 +0000 Received: from localhost ([127.0.0.1]:58846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9kIT-0004i8-IR for submit@debbugs.gnu.org; Fri, 08 Jul 2022 05:29:13 -0400 Received: from lists.gnu.org ([209.51.188.17]:48636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9kIQ-0004hy-Nc for submit@debbugs.gnu.org; Fri, 08 Jul 2022 05:29:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9kIQ-0007c7-EX for guix-patches@gnu.org; Fri, 08 Jul 2022 05:29:10 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44442) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9kIP-0008U1-FU; Fri, 08 Jul 2022 05:29:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=Oc2fA7RfisGqH22qY8ZBRpsglJBFVAtEBvbAaZ77cSk=; b=Nxvizxjex1bzkJ KFOkCevIk1leBSvAqQN+aA/E2+zQg/1jzE11UONtNfmSX+T0FyDg0AxdhJaRUh2YZj3z9CnaP8QGP tgf/inPfCXzUUP7UTHYaRWHKjQlTB/6Cv0n26vH6U6hEcLv2UZufZro3oa6x5e+7g2us0y/EGg5IB KQImoFkdst+Ev9+D7qviD5EuhmWZNknnt1BKfoURbstVrYdTkfDJpmnFWpMpvtM9eXJA9RKmrKJYd 0IhHaL1zytRBH5kK+oLEK2uoC+mZvdWKnQqVYxPTLLwvggMkc7YBr+ZYW34UvqgxoO4JjRBGmkUCv +0ZvTtvqnmp51w11l6vA==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=39680 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o9kIO-0005lr-PC; Fri, 08 Jul 2022 05:29:09 -0400 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: guix-patches@gnu.org Subject: [PATCH] profiles: Remove support for reading versions 0 and 1. Date: Fri, 8 Jul 2022 11:27:50 +0200 Message-Id: <20220708092750.918-1-ludo@gnu.org> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 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 (---) Version 2 was introduced in commit dedb17ad010ee9ef67f3f4f3997dd17f226c8090 (May 2015), which made it into Guix 0.9.0. * guix/profiles.scm (find-package): Remove. (sexp->manifest)[infer-search-paths]: Remove. Remove clauses for versions 0 and 1. --- guix/profiles.scm | 65 +---------------------------------------------- 1 file changed, 1 insertion(+), 64 deletions(-) Hi, This change will make it impossible to read profiles created before 2015, which was way before 1.0. I’ll go ahead and apply it if there are no objections. Thanks, Ludo’. diff --git a/guix/profiles.scm b/guix/profiles.scm index 701852ae98..a21cc432dc 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -507,34 +507,8 @@ (define (entry->gexp entry) (mapm %state-monad entry->gexp entries) vlist-null)))))) -(define (find-package name version) - "Return a package from the distro matching NAME and possibly VERSION. This -procedure is here for backward-compatibility and will eventually vanish." - (define find-best-packages-by-name ;break abstractions - (module-ref (resolve-interface '(gnu packages)) - 'find-best-packages-by-name)) - - ;; Use 'find-best-packages-by-name' and not 'find-packages-by-name'; the - ;; former traverses the module tree only once and then allows for efficient - ;; access via a vhash. - (match (find-best-packages-by-name name version) - ((p _ ...) p) - (_ - (match (find-best-packages-by-name name #f) - ((p _ ...) p) - (_ #f))))) - (define (sexp->manifest sexp) "Parse SEXP as a manifest." - (define (infer-search-paths name version) - ;; Infer the search path specifications for NAME-VERSION by looking up a - ;; same-named package in the distro. Useful for the old manifest formats - ;; that did not store search path info. - (let ((package (find-package name version))) - (if package - (package-native-search-paths package) - '()))) - (define (infer-dependency item parent) ;; Return a for ITEM. (let-values (((name version) @@ -620,44 +594,7 @@ (define* (sexp->manifest-entry sexp #:optional (parent (delay #f))) (return entry))))))) (match sexp - (('manifest ('version 0) - ('packages ((name version output path) ...))) - (manifest - (map (lambda (name version output path) - (manifest-entry - (name name) - (version version) - (output output) - (item path) - (search-paths (infer-search-paths name version)))) - name version output path))) - - ;; Version 1 adds a list of propagated inputs to the - ;; name/version/output/path tuples. - (('manifest ('version 1) - ('packages ((name version output path deps) ...))) - (manifest - (map (lambda (name version output path deps) - ;; Up to Guix 0.7 included, dependencies were listed as ("gmp" - ;; "/gnu/store/...-gmp") for instance. Discard the 'label' in - ;; such lists. - (let ((deps (match deps - (((labels directories) ...) - directories) - ((directories ...) - directories)))) - (letrec* ((deps* (map (cute infer-dependency <> (delay entry)) - deps)) - (entry (manifest-entry - (name name) - (version version) - (output output) - (item path) - (dependencies deps*) - (search-paths - (infer-search-paths name version))))) - entry))) - name version output path deps))) + ;; Versions 0 and 1 are no longer produced since 2015. ;; Version 2 adds search paths and is slightly more verbose. (('manifest ('version 2 minor-version ...) base-commit: 43cf8861b8ff3e8b987b731f347e31ba8bdf00ae -- 2.36.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 08 18:02:02 2022 Received: (at 56446-done) by debbugs.gnu.org; 8 Jul 2022 22:02:03 +0000 Received: from localhost ([127.0.0.1]:33368 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9w30-0006l4-J3 for submit@debbugs.gnu.org; Fri, 08 Jul 2022 18:02:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9w2y-0006kU-LB for 56446-done@debbugs.gnu.org; Fri, 08 Jul 2022 18:02:00 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:54572) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9w2t-0004nm-Ce for 56446-done@debbugs.gnu.org; Fri, 08 Jul 2022 18:01:55 -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=pYQ1lS7I/2luwVQItyCLNxqmdFOusnBenOljP+vSPyU=; b=Nsjh3cd3J4vZEepXVQSd ElXPefXkcxBu5L074D8RYNkuidvsxIW5bCX8fP4+427yWB7wk9Pax3LHIFeLngiQ36obCjVEAARqO TF3zGEojGS8Q5fU8kH6NiqEs8B3lhwbfpOMomB/JY2GaetagHbmP34RSf/qUPSJXhZiEqdTru2N6Y 4YCcVMcLm96kXBcBGWv3g703EoZDhGuslzztSVTTQdmU3OgoEz2tLnNz0O/JIOuta04qmZZisZT76 27W8YeowtdIjfJmm0K9GyRJfwNqLaJ4zN8PbXTcjLWAs5KLyJZTNqh3uD+hF3GGBvHh1CT2MtxxDW pjsdj0QKqfGw7A==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:63275 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9w2s-0007Vd-Ft for 56446-done@debbugs.gnu.org; Fri, 08 Jul 2022 18:01:55 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: 56446-done@debbugs.gnu.org Subject: Re: bug#56446: [PATCH] profiles: Remove support for reading versions 0 and 1. References: <20220708092750.918-1-ludo@gnu.org> Date: Sat, 09 Jul 2022 00:01:53 +0200 In-Reply-To: <20220708092750.918-1-ludo@gnu.org> ("Ludovic =?utf-8?Q?Court?= =?utf-8?Q?=C3=A8s=22's?= message of "Fri, 8 Jul 2022 11:27:50 +0200") Message-ID: <87v8s7qn5a.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 56446-done 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 (---) Ludovic Court=C3=A8s skribis: > Version 2 was introduced in commit > dedb17ad010ee9ef67f3f4f3997dd17f226c8090 (May 2015), which made it into > Guix 0.9.0. > > * guix/profiles.scm (find-package): Remove. > (sexp->manifest)[infer-search-paths]: Remove. > Remove clauses for versions 0 and 1. Pushed as e7e04396c0e91569bf493e1352d6539babc15327. From unknown Tue Aug 19 21:02:57 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 06 Aug 2022 11:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator