From patchwork Fri Oct 25 15:42:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Konrad Hinsen X-Patchwork-Id: 15878 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 06D151768E; Tue, 29 Oct 2019 14:16:57 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_MSPIKE_H2,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6E89317607 for ; Tue, 29 Oct 2019 14:16:56 +0000 (GMT) Received: from localhost ([::1]:57480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iPSIp-0008N7-GP for patchwork@mira.cbaines.net; Tue, 29 Oct 2019 10:16:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59500) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iPSE9-0002Le-Hb for guix-patches@gnu.org; Tue, 29 Oct 2019 10:12:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iPSE7-0006fq-7o for guix-patches@gnu.org; Tue, 29 Oct 2019 10:12:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39606) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iPSE6-0006fX-Vx for guix-patches@gnu.org; Tue, 29 Oct 2019 10:12:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iPSE6-00026u-Ng for guix-patches@gnu.org; Tue, 29 Oct 2019 10:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37978] [PATCH] guix: new command "guix time-machine" Resent-From: Konrad Hinsen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Oct 2019 14:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 37978 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37978@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15723582718050 (code B ref -1); Tue, 29 Oct 2019 14:12:01 +0000 Received: (at submit) by debbugs.gnu.org; 29 Oct 2019 14:11:11 +0000 Received: from localhost ([127.0.0.1]:48427 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iPSDG-00025m-Nc for submit@debbugs.gnu.org; Tue, 29 Oct 2019 10:11:11 -0400 Received: from lists.gnu.org ([209.51.188.17]:32900) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iPSDF-00025e-BN for submit@debbugs.gnu.org; Tue, 29 Oct 2019 10:11:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58835) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iPSDC-00006w-N0 for guix-patches@gnu.org; Tue, 29 Oct 2019 10:11:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iPS5J-00036J-Jq for guix-patches@gnu.org; Tue, 29 Oct 2019 10:02:59 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:48655) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iPS5I-00035r-Nt for guix-patches@gnu.org; Tue, 29 Oct 2019 10:02:57 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 21260217DD; Tue, 29 Oct 2019 10:02:55 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Tue, 29 Oct 2019 10:02:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.net; h= from:to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=fm1; bh=2E1GIl9594m3wlk51NHCc7sodm YJJiQ6r/5fzOqj1AA=; b=TV4i/QkWyNta3MxEcuAEUhXmx0jlj5Lh6FIYWJX5go Bmg6+hUVrp84WJNmiWhGpGitLmY7ODpNj9tLGGt4c1+3z3rAfuDtDGnTLn/uN0cA UL//H+GTAzvOszIDsfGcr20SogyXoXWWM8f9q9hNfb7KCo1ytae5s+Es6cvL+twY 2AOVgrGJd+M80cCOmL95mkjZFU11HWN1RWrxEHg8sjpQrXkFQVwFwiDdroRYN5Co ZJDugFY8iUpEGWbmziP06aPIURNGoNlxOQXeUzyd9QwR0Ji6OLV9feH0E40JMAta qBsf5twDWtg4KYZEAQaYROn978Io2LvNOOShi6Ef/lDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=2E1GIl 9594m3wlk51NHCc7sodmYJJiQ6r/5fzOqj1AA=; b=saj1PhfK8Ozhq0sJBcznEi kgpJyIrIfzYMz6VUQykooLG2/1Z3VJikQfSzEurlKxUkJvkj6j4Gpp/4Ebz0C+7t qTVCT3ucPPYAkMZs5anPhgxdywlczgqW79zkdG78fX7NMa27xWIVE/ixSFRvfkA9 Jr77Ny9ciGJTtLD1bpsi+KSeGuKggJ1HN/UzFVf1s8xhAkTdFI0nBnlcgQX6eopg QI4RlIaQimUcOo+1IwBnehtsClqt9r/Cek3oLjmzQ660rJfCaR/E0GBkeFS1tUqN Kx0hxX0tDeDiW477hiLU5MWs7JsvaZYJiBpZFBlBXvo+WyPHcCOPpAXlanJpnFxg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedruddtuddgheelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkgggtgfesthhqredttd dtjeenucfhrhhomhepmfhonhhrrgguucfjihhnshgvnhcuoehkohhnrhgrugdrhhhinhhs vghnsehfrghsthhmrghilhdrnhgvtheqnecuffhomhgrihhnpehgnhhurdhorhhgnecukf hppeelvddrudeiledruddvjedrfeefnecurfgrrhgrmhepmhgrihhlfhhrohhmpehkohhn rhgrugdrhhhinhhsvghnsehfrghsthhmrghilhdrnhgvthenucevlhhushhtvghrufhiii gvpedt X-ME-Proxy: Received: from ordinateur-de-catherine--konrad.home (lfbn-1-4129-33.w92-169.abo.wanadoo.fr [92.169.127.33]) by mail.messagingengine.com (Postfix) with ESMTPA id E2F9880059; Tue, 29 Oct 2019 10:02:53 -0400 (EDT) From: Konrad Hinsen Date: Fri, 25 Oct 2019 17:42:21 +0200 Message-ID: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches * guix/scripts/time-machine.scm: New file. * guix/scripts/pull.scm: Export function channel-list. * guix/inferior.scm: New function cached-guix-filetree-for-channels. * doc/guix.texi: Document "git time-machine" --- doc/guix.texi | 47 +++++++++++++++- guix/inferior.scm | 38 +++++++++---- guix/scripts/pull.scm | 1 + guix/scripts/time-machine.scm | 101 ++++++++++++++++++++++++++++++++++ 4 files changed, 174 insertions(+), 13 deletions(-) create mode 100644 guix/scripts/time-machine.scm diff --git a/doc/guix.texi b/doc/guix.texi index 7cc33c6e22..a147f16088 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -247,6 +247,7 @@ Utilities * Invoking guix container:: Process isolation. * Invoking guix weather:: Assessing substitute availability. * Invoking guix processes:: Listing client processes. +* Invoking guix time-machine:: Running an older version of Guix. Invoking @command{guix build} @@ -4142,7 +4143,10 @@ say, on another machine, by providing a channel specification in @end lisp The @command{guix describe --format=channels} command can even generate this -list of channels directly (@pxref{Invoking guix describe}). +list of channels directly (@pxref{Invoking guix describe}). The resulting +file can be used with the -C options of @command{guix pull} +(@pxref{Invoking guix pull}) or @command{guix time-machine} +(@pxref{Invoking guix time-machine}). At this point the two machines run the @emph{exact same Guix}, with access to the @emph{exact same packages}. The output of @command{guix build gimp} on @@ -7894,6 +7898,7 @@ the Scheme programming interface of Guix in a convenient way. * Invoking guix container:: Process isolation. * Invoking guix weather:: Assessing substitute availability. * Invoking guix processes:: Listing client processes. +* Invoking guix time-machine:: Running an older version of Guix. @end menu @node Invoking guix build @@ -10563,6 +10568,46 @@ ClientPID: 19419 ClientCommand: cuirass --cache-directory /var/cache/cuirass @dots{} @end example +@node Invoking guix time-machine +@section Invoking @command{guix time-machine} + +@cindex @command{guix time-machine} +@cindex pinning, channels +@cindex replicating Guix +@cindex reproducibility, of Guix + +The @command{guix time-machine} command provides access to older +versions of Guix, for example to install older versions of packages, +or to reproduce a computation in an identical environment. The version +of Guix to be used is defined by a commit or by a channel +description file created by @command{guix describe} +(@pxref{Invoking guix describe}). + +The general syntax is: + +@example +guix time-machine @var{channels} -- @var{command} @var {arg}@dots{} +@end example + +where @var{command} and @var{arg}@dots{} are passed unmodified to the +@command{guix} command in its old version. The @var{channels} that define +this version can be specified using the following options: + +@table @code +@item --url=@var{url} +@itemx --commit=@var{commit} +@itemx --branch=@var{branch} +Use the @code{guix} channel from the specified @var{url}, at the +given @var{commit} (a valid Git commit ID represented as a hexadecimal +string), or @var{branch}. + +@item --channels=@var{file} +@itemx -C @var{file} +Read the list of channels from @var{file}. @var{file} must contain +Scheme code that evaluates to a list of channel objects. +@xref{Channels} for more information. +@end table + @node System Configuration @chapter System Configuration diff --git a/guix/inferior.scm b/guix/inferior.scm index b8e2f21f42..cb80bb43d5 100644 --- a/guix/inferior.scm +++ b/guix/inferior.scm @@ -89,6 +89,7 @@ gexp->derivation-in-inferior %inferior-cache-directory + cached-guix-filetree-for-channels inferior-for-channels)) ;;; Commentary: @@ -635,16 +636,13 @@ failing when GUIX is too old and lacks the 'guix repl' command." (make-parameter (string-append (cache-directory #:ensure? #f) "/inferiors"))) -(define* (inferior-for-channels channels - #:key - (cache-directory (%inferior-cache-directory)) - (ttl (* 3600 24 30))) - "Return an inferior for CHANNELS, a list of channels. Use the cache at -CACHE-DIRECTORY, where entries can be reclaimed after TTL seconds. This -procedure opens a new connection to the build daemon. - -This is a convenience procedure that people may use in manifests passed to -'guix package -m', for instance." +(define* (cached-guix-filetree-for-channels channels + #:key + (cache-directory (%inferior-cache-directory)) + (ttl (* 3600 24 30))) + "Return a directory containing a guix filetree defined by CHANNELS, a list of channels. +The directory is a subdirectory of CACHE-DIRECTORY, where entries can be reclaimed after TTL seconds. +This procedure opens a new connection to the build daemon." (with-store store (let () (define instances @@ -680,7 +678,7 @@ This is a convenience procedure that people may use in manifests passed to (file-expiration-time ttl)) (if (file-exists? cached) - (open-inferior cached) + cached (run-with-store store (mlet %store-monad ((profile (channel-instances->derivation instances))) @@ -689,4 +687,20 @@ This is a convenience procedure that people may use in manifests passed to (built-derivations (list profile)) (symlink* (derivation->output-path profile) cached) (add-indirect-root* cached) - (return (open-inferior cached))))))))) + (return cached)))))))) + +(define* (inferior-for-channels channels + #:key + (cache-directory (%inferior-cache-directory)) + (ttl (* 3600 24 30))) + "Return an inferior for CHANNELS, a list of channels. Use the cache at +CACHE-DIRECTORY, where entries can be reclaimed after TTL seconds. This +procedure opens a new connection to the build daemon. + +This is a convenience procedure that people may use in manifests passed to +'guix package -m', for instance." + (define cached + (cached-guix-filetree-for-channels channels + #:cache-directory cache-directory + #:ttl ttl)) + (open-inferior cached)) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 80d070652b..a508e817b2 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -56,6 +56,7 @@ #:use-module (ice-9 vlist) #:use-module (ice-9 format) #:export (display-profile-content + channel-list guix-pull)) diff --git a/guix/scripts/time-machine.scm b/guix/scripts/time-machine.scm new file mode 100644 index 0000000000..8e954d51e1 --- /dev/null +++ b/guix/scripts/time-machine.scm @@ -0,0 +1,101 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Konrad Hinsen +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix scripts time-machine) + #:use-module (guix ui) + #:use-module (guix scripts) + #:use-module (guix inferior) + #:use-module (guix channels) + #:use-module ((guix scripts pull) #:select (channel-list)) + #:use-module (ice-9 match) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-11) + #:use-module (srfi srfi-26) + #:use-module (srfi srfi-37) + #:export (guix-time-machine)) + + +;;; +;;; Command-line options. +;;; + +(define (show-help) + (display (G_ "Usage: guix time-machine [OPTION] -- COMMAND ARGS... +Execute COMMAND ARGS... in an older version of Guix.\n")) + (display (G_ " + -C, --channels=FILE deploy the channels defined in FILE")) + (display (G_ " + --url=URL use the Git repository at URL")) + (display (G_ " + --commit=COMMIT use the specified COMMIT")) + (display (G_ " + --branch=BRANCH use the tip of the specified BRANCH")) + (display (G_ " + -h, --help display this help and exit")) + (display (G_ " + -V, --version display version information and exit")) + (newline) + (show-bug-report-information)) + +(define %options + ;; Specifications of the command-line options. + (list (option '(#\C "channels") #t #f + (lambda (opt name arg result) + (alist-cons 'channel-file arg result))) + (option '("url") #t #f + (lambda (opt name arg result) + (alist-cons 'repository-url arg + (alist-delete 'repository-url result)))) + (option '("commit") #t #f + (lambda (opt name arg result) + (alist-cons 'ref `(commit . ,arg) result))) + (option '("branch") #t #f + (lambda (opt name arg result) + (alist-cons 'ref `(branch . ,arg) result))) + (option '(#\h "help") #f #f + (lambda args + (show-help) + (exit 0))) + (option '(#\V "version") #f #f + (lambda args + (show-version-and-exit "guix time-machine"))))) + +(define (parse-args args) + "Parse the list of command line arguments ARGS." + ;; The '--' token is used to separate the command to run from the rest of + ;; the operands. + (let-values (((args command) (break (cut string=? "--" <>) args))) + (let ((opts (parse-command-line args %options '(()) #:build-options? #f))) + (match command + (() opts) + (("--") opts) + (("--" command ...) (alist-cons 'exec command opts)))))) + + +;;; +;;; Entry point. +;;; + +(define (guix-time-machine . args) + (with-error-handling + (let* ((opts (parse-args args)) + (channels (channel-list opts)) + (command-line (assoc-ref opts 'exec)) + (directory (cached-guix-filetree-for-channels channels)) + (executable (string-append directory "/bin/guix"))) + (apply system* (cons executable command-line)))))