* [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile
@ 2021-01-16 18:29 Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 1/8] profiles: Add 'manifest->code' Ludovic Courtès
2021-01-27 13:14 ` bug#45919: [PATCH 0/8] Exporting a manifest and channels from a profile Ludovic Courtès
0 siblings, 2 replies; 37+ messages in thread
From: Ludovic Courtès @ 2021-01-16 18:29 UTC (permalink / raw)
To: 45919
Hi there!
Here’s a simple but oft-requested feature (I remember discussing
with Pierre and Simon a year ago at the Guix Days about ways to
implement it—time flies!): these patches provide ‘guix package
--export-manifest’ and ‘--export-channels’. These options spit
a manifest and a channel spec, respectively, with the goal of
helping users who wish to migrate to the declarative model.
‘--export-manifest’ honors transformations: if entries in the
profile have associated transformations, those are preserved in
the generated manifest. It also honors version specifiers (to
some extent); for example, if you have guile@2.2 in your profile,
it’ll put “guile@2.2” in the manifest, where “2.2” is the
shortest prefix to disambiguate it from the other available
versions of “guile”.
‘--export-channels’ does what you expect. When several commits
of the same channel were used to build your profile, it picks
the last one and adds the other one in a comment.
There’s a catch though: it’s easy to get a large number of
commits. For example, my main profile contains ~300 packages.
I usually upgrade everything at once, so you’d expect to see
a single commit for the ‘guix’ channel. But that’s not the
case: when running ‘guix upgrade’, entries that do not need
to be upgraded are left unchanged, and thus they carry their
original commit. For my profile, the result is:
--8<---------------cut here---------------start------------->8---
$ guix package --export-channels
;; This channel file can be passed to 'guix pull -C' or to
;; 'guix time-machine -C' to obtain the Guix revision that was
;; used to populate this profile.
(list
;; Note: these other commits were also used to install some of the packages in this profile:
;; "458cb25b9e7e7c954f468023abea2bebb5d8c75b"
;; "4969b51d175497bfcc354c91803e9d70542b7113"
;; "3d85c3ec652feb22824f355538b51e6955ded361"
;; "3462678bc346c2f6ea81245d6842264b6dccd945"
;; "74eeb11daee906cb012f10b6bb3afd254f9ea5c2"
;; "e1f5c2292b88525414b5d0336a00bfa6741d4f14"
;; "3bdb2a026bc9d3967a31a2ccbcd670c018f85d3d"
;; "bf986c3e4325594c1c6a43cf0b67b92262842863"
;; "7607ace5091aea0157ba5c8a508129cc5fc4f931"
;; "98b89f432103b66efacee0bcba41a94148b8e870"
;; "7090159c23d6345992ab976d71fefeb1583cfcdf"
;; "c6872990b51971922f3064cba54ab752fcdc1559"
;; "6ee7468758d7c043692ae8c0b5e130fa4eabe94c"
;; "9744cc7b4636fafb772c94adb8f05961b5b39f16"
;; "d8feee9f18ede0d1ea4d0e4876f09a0dab770295"
;; "b76b1d3fb65fec98b96a2b4cfa984316dd956a29"
(channel
(name 'guix)
(url "/home/ludo/src/guix")
(commit
"c6ca0fceb715340cfb2ba01bfec128aa8d385b92")
(introduction
(make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad"
(openpgp-fingerprint
"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))
)
--8<---------------cut here---------------end--------------->8---
The long commit list doesn’t look great, but in fact the chosen
commit is almost certainly good enough.
I looked into ‘guix package’ to see if we could update provenance
data for manifest entries that are not upgraded because they’re
already up-to-date (so that we end up with fewer different commits),
and it’s tricky to do that, and maybe not desirable. So I left it
at that.
Anyway, for me the goal of these options is not “disassemble” the
profile and provide its exact source code, but rather to help
migrate to the declarative model. I think it does a good job
at that.
Thoughts?
Ludo’.
Ludovic Courtès (8):
profiles: Add 'manifest->code'.
utils: Add 'version-unique-prefix'.
guix package: Add '--export-manifest'.
channels: Factorize 'manifest-entry-channel' and channel
serialization.
channels: Add the channel name to channel sexps.
guix describe: Use 'manifest-entry-channel'.
channels: Add 'channel->code'.
guix package: Add '--export-channels'.
build-aux/build-self.scm | 3 +
doc/guix.texi | 45 +++++++++++++
guix/build/profiles.scm | 6 +-
guix/channels.scm | 134 ++++++++++++++++++++++++++------------
guix/describe.scm | 34 +++++++++-
guix/profiles.scm | 86 +++++++++++++++++++++++-
guix/scripts/describe.scm | 52 +++++----------
guix/scripts/package.scm | 118 ++++++++++++++++++++++++++++++++-
guix/utils.scm | 35 +++++++++-
tests/guix-package.sh | 10 ++-
tests/profiles.scm | 30 ++++++++-
tests/utils.scm | 8 ++-
12 files changed, 471 insertions(+), 90 deletions(-)
--
2.30.0
^ permalink raw reply [flat|nested] 37+ messages in thread
* [bug#45919] [PATCH 1/8] profiles: Add 'manifest->code'.
2021-01-16 18:29 [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile Ludovic Courtès
@ 2021-01-16 18:34 ` Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 2/8] utils: Add 'version-unique-prefix' Ludovic Courtès
` (6 more replies)
2021-01-27 13:14 ` bug#45919: [PATCH 0/8] Exporting a manifest and channels from a profile Ludovic Courtès
1 sibling, 7 replies; 37+ messages in thread
From: Ludovic Courtès @ 2021-01-16 18:34 UTC (permalink / raw)
To: 45919
* guix/profiles.scm (manifest->code): New procedure.
* tests/profiles.scm ("manifest->code, simple")
("manifest->code, simple, versions")
("manifest->code, transformations"): New tests.
---
guix/profiles.scm | 86 +++++++++++++++++++++++++++++++++++++++++++++-
tests/profiles.scm | 30 +++++++++++++++-
2 files changed, 114 insertions(+), 2 deletions(-)
diff --git a/guix/profiles.scm b/guix/profiles.scm
index 59a313ea08..ea8bc6e593 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
@@ -107,6 +107,8 @@
manifest-search-paths
check-for-collisions
+ manifest->code
+
manifest-transaction
manifest-transaction?
manifest-transaction-install
@@ -667,6 +669,88 @@ including the search path specification for $PATH."
(append-map manifest-entry-search-paths
(manifest-entries manifest)))))
+(define* (manifest->code manifest
+ #:key (entry-package-version (const "")))
+ "Return an sexp representing code to build an approximate version of
+MANIFEST; the code is wrapped in a top-level 'begin' form. Call
+ENTRY-PACKAGE-VERSION to determine the version number to use in the spec for a
+given entry; it can be set to 'manifest-entry-version' for fully-specified
+version numbers, or to some other procedure to disambiguate versions for
+packages for which several versions are available."
+ (define (entry-transformations entry)
+ ;; Return the transformations that apply to ENTRY.
+ (assoc-ref (manifest-entry-properties entry) 'transformations))
+
+ (define transformation-procedures
+ ;; List of transformation options/procedure name pairs.
+ (let loop ((entries (manifest-entries manifest))
+ (counter 1)
+ (result '()))
+ (match entries
+ (() result)
+ ((entry . tail)
+ (match (entry-transformations entry)
+ (#f
+ (loop tail counter result))
+ (options
+ (if (assoc-ref result options)
+ (loop tail counter result)
+ (loop tail (+ 1 counter)
+ (alist-cons options
+ (string->symbol
+ (format #f "transform~a" counter))
+ result)))))))))
+
+ (define (qualified-name entry)
+ ;; Return the name of ENTRY possibly with "@" followed by a version.
+ (match (entry-package-version entry)
+ ("" (manifest-entry-name entry))
+ (version (string-append (manifest-entry-name entry)
+ "@" version))))
+
+ (if (null? transformation-procedures)
+ `(begin ;simplest case
+ (specifications->manifest
+ (list ,@(map (lambda (entry)
+ (match (manifest-entry-output entry)
+ ("out" (qualified-name entry))
+ (output (string-append (qualified-name entry)
+ ":" output))))
+ (manifest-entries manifest)))))
+ (let* ((transform (lambda (options exp)
+ (if (not options)
+ exp
+ (let ((proc (assoc-ref transformation-procedures
+ options)))
+ `(,proc ,exp))))))
+ `(begin ;transformations apply
+ (use-modules (guix transformations))
+
+ ,@(map (match-lambda
+ ((options . name)
+ `(define ,name
+ (options->transformation ',options))))
+ transformation-procedures)
+
+ (packages->manifest
+ (list ,@(map (lambda (entry)
+ (define options
+ (entry-transformations entry))
+
+ (define name
+ (qualified-name entry))
+
+ (match (manifest-entry-output entry)
+ ("out"
+ (transform options
+ `(specification->package ,name)))
+ (output
+ `(list ,(transform
+ options
+ `(specification->package ,name))
+ ,output))))
+ (manifest-entries manifest))))))))
+
\f
;;;
;;; Manifest transactions.
diff --git a/tests/profiles.scm b/tests/profiles.scm
index 2dec42bec1..ce77711d63 100644
--- a/tests/profiles.scm
+++ b/tests/profiles.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
;;;
;;; This file is part of GNU Guix.
@@ -154,6 +154,34 @@
(manifest-entries (manifest-add (manifest '())
(list guile-2.0.9 guile-2.0.9))))
+(test-equal "manifest->code, simple"
+ '(begin
+ (specifications->manifest (list "guile" "guile:debug" "glibc")))
+ (manifest->code (manifest (list guile-2.0.9 guile-2.0.9:debug glibc))))
+
+(test-equal "manifest->code, simple, versions"
+ '(begin
+ (specifications->manifest (list "guile@2.0.9" "guile@2.0.9:debug"
+ "glibc@2.19")))
+ (manifest->code (manifest (list guile-2.0.9 guile-2.0.9:debug glibc))
+ #:entry-package-version manifest-entry-version))
+
+(test-equal "manifest->code, transformations"
+ '(begin
+ (use-modules (guix transformations))
+
+ (define transform1
+ (options->transformation '((foo . "bar"))))
+
+ (packages->manifest
+ (list (transform1 (specification->package "guile"))
+ (specification->package "glibc"))))
+ (manifest->code (manifest (list (manifest-entry
+ (inherit guile-2.0.9)
+ (properties `((transformations
+ . ((foo . "bar"))))))
+ glibc))))
+
(test-assert "manifest-perform-transaction"
(let* ((m0 (manifest (list guile-2.0.9 guile-2.0.9:debug)))
(t1 (manifest-transaction
--
2.30.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#45919] [PATCH 2/8] utils: Add 'version-unique-prefix'.
2021-01-16 18:34 ` [bug#45919] [PATCH 1/8] profiles: Add 'manifest->code' Ludovic Courtès
@ 2021-01-16 18:34 ` Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 3/8] guix package: Add '--export-manifest' Ludovic Courtès
` (5 subsequent siblings)
6 siblings, 0 replies; 37+ messages in thread
From: Ludovic Courtès @ 2021-01-16 18:34 UTC (permalink / raw)
To: 45919
* guix/utils.scm (version-unique-prefix): New procedure.
* tests/utils.scm ("version-unique-prefix"): New test.
---
guix/utils.scm | 35 ++++++++++++++++++++++++++++++++++-
tests/utils.scm | 8 +++++++-
2 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/guix/utils.scm b/guix/utils.scm
index f8b05e7e80..a85e2f495c 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
@@ -88,6 +88,7 @@
version-major+minor+point
version-major+minor
version-major
+ version-unique-prefix
guile-version>?
version-prefix?
string-replace-substring
@@ -589,6 +590,38 @@ minor version numbers from version-string."
"Return the major version number as string from the version-string."
(version-prefix version-string 1))
+(define (version-unique-prefix version versions)
+ "Return the shortest version prefix to unambiguously identify VERSION among
+VERSIONS. For example:
+
+ (version-unique-prefix \"2.0\" '(\"3.0\" \"2.0\"))
+ => \"2\"
+
+ (version-unique-prefix \"2.2\" '(\"3.0.5\" \"2.0.9\" \"2.2.7\"))
+ => \"2.2\"
+
+ (version-unique-prefix \"27.1\" '(\"27.1\"))
+ => \"\"
+"
+ (define not-dot
+ (char-set-complement (char-set #\.)))
+
+ (define other-versions
+ (delete version versions))
+
+ (let loop ((prefix '())
+ (components (string-tokenize version not-dot)))
+ (define prefix-str
+ (string-join prefix "."))
+
+ (if (any (cut string-prefix? prefix-str <>) other-versions)
+ (match components
+ ((head . tail)
+ (loop `(,@prefix ,head) tail))
+ (()
+ version))
+ prefix-str)))
+
(define (version>? a b)
"Return #t when A denotes a version strictly newer than B."
(eq? '> (version-compare a b)))
diff --git a/tests/utils.scm b/tests/utils.scm
index 9bce446d98..62ec7e8b4c 100644
--- a/tests/utils.scm
+++ b/tests/utils.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;;
@@ -78,6 +78,12 @@
(not (version-prefix? "4.1" "4.16.2"))
(not (version-prefix? "4.1" "4"))))
+(test-equal "version-unique-prefix"
+ '("2" "2.2" "")
+ (list (version-unique-prefix "2.0" '("3.0" "2.0"))
+ (version-unique-prefix "2.2" '("3.0.5" "2.0.9" "2.2.7"))
+ (version-unique-prefix "27.1" '("27.1"))))
+
(test-equal "string-tokenize*"
'(("foo")
("foo" "bar" "baz")
--
2.30.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#45919] [PATCH 3/8] guix package: Add '--export-manifest'.
2021-01-16 18:34 ` [bug#45919] [PATCH 1/8] profiles: Add 'manifest->code' Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 2/8] utils: Add 'version-unique-prefix' Ludovic Courtès
@ 2021-01-16 18:34 ` Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 4/8] channels: Factorize 'manifest-entry-channel' and channel serialization Ludovic Courtès
` (4 subsequent siblings)
6 siblings, 0 replies; 37+ messages in thread
From: Ludovic Courtès @ 2021-01-16 18:34 UTC (permalink / raw)
To: 45919
* guix/scripts/package.scm (export-manifest): New procedure.
(show-help, %options): Add '--export-manifest'.
(process-query): Honor it.
* guix/build/profiles.scm (build-profile): Mention it.
* tests/guix-package.sh: Test it.
* doc/guix.texi (Invoking guix package): Document it.
---
doc/guix.texi | 21 +++++++++++++++
guix/build/profiles.scm | 6 +++--
guix/scripts/package.scm | 57 +++++++++++++++++++++++++++++++++++++++-
tests/guix-package.sh | 10 ++++++-
4 files changed, 90 insertions(+), 4 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index cea7f8a8cf..e524464e9f 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -3269,6 +3269,9 @@ objects, like this:
'("emacs" "guile@@2.2" "guile@@2.2:debug"))
@end lisp
+@xref{export-manifest, @option{--export-manifest}}, to learn how to
+obtain a manifest file from an existing profile.
+
@item --roll-back
@cindex rolling back
@cindex undoing transactions
@@ -3571,6 +3574,24 @@ zeroth generation is never deleted.
Note that deleting generations prevents rolling back to them.
Consequently, this command must be used with care.
+@cindex manifest, exporting
+@anchor{export-manifest}
+@item --export-manifest
+Write to standard output a manifest suitable for @option{--manifest}
+corresponding to the chosen profile(s).
+
+This option is meant to help you migrate from the ``imperative''
+operating mode---running @command{guix install}, @command{guix upgrade},
+etc.---to the declarative mode that @option{--manifest} offers.
+
+Be aware that the resulting manifest @emph{approximates} what your
+profile actually contains; for instance, depending on how your profile
+was created, it can refer to packages or package versions that are not
+exactly what you specified.
+
+Keep in mind that a manifest is purely symbolic: it only contains
+package names and possibly versions, and their meaning varies over time.
+
@end table
Finally, since @command{guix package} may actually start build
diff --git a/guix/build/profiles.scm b/guix/build/profiles.scm
index 67ee9b665a..b42f498a80 100644
--- a/guix/build/profiles.scm
+++ b/guix/build/profiles.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -169,7 +169,9 @@ SEARCH-PATHS."
(lambda (p)
(display "\
;; This file was automatically generated and is for internal use only.
-;; It cannot be passed to the '--manifest' option.\n\n"
+;; It cannot be passed to the '--manifest' option.
+;; Run 'guix package --export-manifest' if to export a file suitable
+;; for '--manifest'.\n\n"
p)
(pretty-print manifest p)))
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index 6faf2adb7a..2b52016c67 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2013, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2016 Alex Kost <alezost@gmail.com>
@@ -48,6 +48,7 @@
#:select (directory-exists? mkdir-p))
#:use-module (ice-9 format)
#:use-module (ice-9 match)
+ #:autoload (ice-9 pretty-print) (pretty-print)
#:use-module (ice-9 regex)
#:use-module (ice-9 vlist)
#:use-module (srfi srfi-1)
@@ -320,6 +321,48 @@ GUIX_PROFILE=\"~a\"
Alternately, see @command{guix package --search-paths -p ~s}.")
profile profile)))))
+\f
+;;;
+;;; Export a manifest.
+;;;
+
+(define* (export-manifest manifest
+ #:optional (port (current-output-port)))
+ "Write to PORT a manifest corresponding to MANIFEST."
+ (define (version-spec entry)
+ (let ((name (manifest-entry-name entry)))
+ (match (map package-version (find-packages-by-name name))
+ ((_)
+ ;; A single version of NAME is available, so do not specify the
+ ;; version number, even if the available version doesn't match ENTRY.
+ "")
+ (versions
+ ;; If ENTRY uses the latest version, don't specify any version.
+ ;; Otherwise return the shortest unique version prefix. Note that
+ ;; this is based on the currently available packages, which could
+ ;; differ from the packages available in the revision that was used
+ ;; to build MANIFEST.
+ (let ((current (manifest-entry-version entry)))
+ (if (every (cut version>? current <>)
+ (delete current versions))
+ ""
+ (version-unique-prefix (manifest-entry-version entry)
+ versions)))))))
+
+ (match (manifest->code manifest
+ #:entry-package-version version-spec)
+ (('begin exp ...)
+ (format port (G_ "\
+;; This \"manifest\" file can be passed to 'guix package -m' to reproduce
+;; the content of your profile. This is \"symbolic\": it only specifies
+;; package names. To reproduce the exact same profile, you also need to
+;; capture the channels being used, as returned by \"guix describe\".
+;; See the \"Replicating Guix\" section in the manual.\n"))
+ (for-each (lambda (exp)
+ (newline port)
+ (pretty-print exp port))
+ exp))))
+
\f
;;;
;;; Command-line options.
@@ -373,6 +416,8 @@ Install, remove, or upgrade packages in a single transaction.\n"))
(display (G_ "
-S, --switch-generation=PATTERN
switch to a generation matching PATTERN"))
+ (display (G_ "
+ --export-manifest print a manifest for the chosen profile"))
(display (G_ "
-p, --profile=PROFILE use PROFILE instead of the user's default profile"))
(display (G_ "
@@ -507,6 +552,10 @@ kind of search path~%")
(values (cons `(query search-paths ,kind)
result)
#f))))
+ (option '("export-manifest") #f #f
+ (lambda (opt name arg result arg-handler)
+ (values (cons `(query export-manifest) result)
+ #f)))
(option '(#\p "profile") #t #f
(lambda (opt name arg result arg-handler)
(values (alist-cons 'profile (canonicalize-profile arg)
@@ -827,6 +876,12 @@ processed, #f otherwise."
(format #t "~{~a~%~}" settings)
#t))
+ (('export-manifest)
+ (let* ((manifest (concatenate-manifests
+ (map profile-manifest profiles))))
+ (export-manifest manifest (current-output-port))
+ #t))
+
(_ #f))))
diff --git a/tests/guix-package.sh b/tests/guix-package.sh
index 3e5fa71d20..7eaad6823f 100644
--- a/tests/guix-package.sh
+++ b/tests/guix-package.sh
@@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
#
# This file is part of GNU Guix.
@@ -395,6 +395,14 @@ EOF
guix package --bootstrap -m "$module_dir/manifest.scm"
guix package -I | grep guile
test `guix package -I | wc -l` -eq 1
+
+# Export a manifest, instantiate it, and make sure we get the same profile.
+profile_directory="$(readlink -f "$default_profile")"
+guix package --export-manifest > "$tmpfile"
+guix package --rollback --bootstrap
+guix package --bootstrap -m "$tmpfile"
+test "$(readlink -f "$default_profile")" = "$profile_directory"
+
guix package --rollback --bootstrap
# Applying two manifests.
--
2.30.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#45919] [PATCH 4/8] channels: Factorize 'manifest-entry-channel' and channel serialization.
2021-01-16 18:34 ` [bug#45919] [PATCH 1/8] profiles: Add 'manifest->code' Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 2/8] utils: Add 'version-unique-prefix' Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 3/8] guix package: Add '--export-manifest' Ludovic Courtès
@ 2021-01-16 18:34 ` Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 5/8] channels: Add the channel name to channel sexps Ludovic Courtès
` (3 subsequent siblings)
6 siblings, 0 replies; 37+ messages in thread
From: Ludovic Courtès @ 2021-01-16 18:34 UTC (permalink / raw)
To: 45919
* guix/channels.scm (sexp->channel, manifest-entry-channel): New
procedures.
(profile-channels): Replace lambda by 'manifest-entry-channel'.
(channel-instance->sexp): New procedure.
(channel-instances->manifest)[instance->entry]: Use
'channel-instance->sexp' instead of inline code.
---
guix/channels.scm | 106 +++++++++++++++++++++++++++-------------------
1 file changed, 63 insertions(+), 43 deletions(-)
diff --git a/guix/channels.scm b/guix/channels.scm
index 0c84eed477..65a0d849ec 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;;
@@ -802,13 +802,35 @@ derivation."
(derivation-input-derivation input))))
(derivation-inputs drv))))
+(define (channel-instance->sexp instance)
+ "Return an sexp representation of INSTANCE, a channel instance."
+ (let* ((commit (channel-instance-commit instance))
+ (channel (channel-instance-channel instance))
+ (intro (channel-introduction channel)))
+ `(repository
+ (version 0)
+ (url ,(channel-url channel))
+ (branch ,(channel-branch channel))
+ (commit ,commit)
+ ,@(if intro
+ `((introduction
+ (channel-introduction
+ (version 0)
+ (commit
+ ,(channel-introduction-first-signed-commit
+ intro))
+ (signer
+ ,(openpgp-format-fingerprint
+ (channel-introduction-first-commit-signer
+ intro))))))
+ '()))))
+
(define (channel-instances->manifest instances)
"Return a profile manifest with entries for all of INSTANCES, a list of
channel instances."
(define (instance->entry instance drv)
- (let* ((commit (channel-instance-commit instance))
- (channel (channel-instance-channel instance))
- (intro (channel-introduction channel)))
+ (let ((commit (channel-instance-commit instance))
+ (channel (channel-instance-channel instance)))
(manifest-entry
(name (symbol->string (channel-name channel)))
(version (string-take commit 7))
@@ -819,23 +841,7 @@ channel instances."
drv)
drv))
(properties
- `((source (repository
- (version 0)
- (url ,(channel-url channel))
- (branch ,(channel-branch channel))
- (commit ,commit)
- ,@(if intro
- `((introduction
- (channel-introduction
- (version 0)
- (commit
- ,(channel-introduction-first-signed-commit
- intro))
- (signer
- ,(openpgp-format-fingerprint
- (channel-introduction-first-commit-signer
- intro))))))
- '()))))))))
+ `((source ,(channel-instance->sexp instance)))))))
(mlet* %store-monad ((derivations (channel-instance-derivations instances))
(entries -> (map instance->entry instances derivations)))
@@ -900,31 +906,45 @@ to 'latest-channel-instances'."
validate-pull)))
(channel-instances->derivation instances)))
+(define* (sexp->channel sexp #:optional (name 'channel))
+ "Read SEXP, a provenance sexp as created by 'channel-instance->sexp',
+and return a channel called NAME. Return #f if the sexp does not have the
+expected structure."
+ (match sexp
+ (('repository ('version 0)
+ ('url url)
+ ('branch branch)
+ ('commit commit)
+ rest ...)
+ (channel (name name)
+ (url url)
+ (commit commit)
+ (introduction
+ (match (assq 'introduction rest)
+ (#f #f)
+ (('introduction intro)
+ (sexp->channel-introduction intro))))))
+
+ (_ #f)))
+
+(define (manifest-entry-channel entry)
+ "Return the channel ENTRY corresponds to, or #f if that information is
+missing or unreadable. ENTRY must be an entry created by
+'channel-instances->manifest', with the 'source' property."
+ (let ((name (string->symbol (manifest-entry-name entry))))
+ (match (assq-ref (manifest-entry-properties entry) 'source)
+ ((sexp)
+ (sexp->channel sexp name))
+ (_
+ ;; No channel information for this manifest entry.
+ ;; XXX: Pre-0.15.0 Guix did not provide that information,
+ ;; but there's not much we can do in that case.
+ #f))))
+
(define (profile-channels profile)
"Return the list of channels corresponding to entries in PROFILE. If
PROFILE is not a profile created by 'guix pull', return the empty list."
- (filter-map (lambda (entry)
- (match (assq 'source (manifest-entry-properties entry))
- (('source ('repository ('version 0)
- ('url url)
- ('branch branch)
- ('commit commit)
- rest ...))
- (channel (name (string->symbol
- (manifest-entry-name entry)))
- (url url)
- (commit commit)
- (introduction
- (match (assq 'introduction rest)
- (#f #f)
- (('introduction intro)
- (sexp->channel-introduction intro))))))
-
- ;; No channel information for this manifest entry.
- ;; XXX: Pre-0.15.0 Guix did not provide that information,
- ;; but there's not much we can do in that case.
- (_ #f)))
-
+ (filter-map manifest-entry-channel
;; Show most recently installed packages last.
(reverse
(manifest-entries (profile-manifest profile)))))
--
2.30.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#45919] [PATCH 5/8] channels: Add the channel name to channel sexps.
2021-01-16 18:34 ` [bug#45919] [PATCH 1/8] profiles: Add 'manifest->code' Ludovic Courtès
` (2 preceding siblings ...)
2021-01-16 18:34 ` [bug#45919] [PATCH 4/8] channels: Factorize 'manifest-entry-channel' and channel serialization Ludovic Courtès
@ 2021-01-16 18:34 ` Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 6/8] guix describe: Use 'manifest-entry-channel' Ludovic Courtès
` (2 subsequent siblings)
6 siblings, 0 replies; 37+ messages in thread
From: Ludovic Courtès @ 2021-01-16 18:34 UTC (permalink / raw)
To: 45919
* guix/channels.scm (channel-instance->sexp): Add 'name'.
(sexp->channel): Extract the name from SEXP, using the optional argument
as a fallback.
---
guix/channels.scm | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/guix/channels.scm b/guix/channels.scm
index 65a0d849ec..6449221c3f 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -812,6 +812,7 @@ derivation."
(url ,(channel-url channel))
(branch ,(channel-branch channel))
(commit ,commit)
+ (name ,(channel-name channel))
,@(if intro
`((introduction
(channel-introduction
@@ -907,16 +908,22 @@ to 'latest-channel-instances'."
(channel-instances->derivation instances)))
(define* (sexp->channel sexp #:optional (name 'channel))
- "Read SEXP, a provenance sexp as created by 'channel-instance->sexp',
-and return a channel called NAME. Return #f if the sexp does not have the
-expected structure."
+ "Read SEXP, a provenance sexp as created by 'channel-instance->sexp'; use
+NAME as the channel name if SEXP does not specify it. Return #f if the sexp
+does not have the expected structure."
(match sexp
(('repository ('version 0)
('url url)
('branch branch)
('commit commit)
rest ...)
- (channel (name name)
+ ;; Historically channel sexps did not include the channel name. It's OK
+ ;; for channels created by 'channel-instances->manifest' because the
+ ;; entry name is the channel name, but it was missing for entries created
+ ;; by 'manifest-entry-with-provenance'.
+ (channel (name (match (assq 'name rest)
+ (#f name)
+ (('name name) name)))
(url url)
(commit commit)
(introduction
--
2.30.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#45919] [PATCH 6/8] guix describe: Use 'manifest-entry-channel'.
2021-01-16 18:34 ` [bug#45919] [PATCH 1/8] profiles: Add 'manifest->code' Ludovic Courtès
` (3 preceding siblings ...)
2021-01-16 18:34 ` [bug#45919] [PATCH 5/8] channels: Add the channel name to channel sexps Ludovic Courtès
@ 2021-01-16 18:34 ` Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 7/8] channels: Add 'channel->code' Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 8/8] guix package: Add '--export-channels' Ludovic Courtès
6 siblings, 0 replies; 37+ messages in thread
From: Ludovic Courtès @ 2021-01-16 18:34 UTC (permalink / raw)
To: 45919
* guix/channels.scm (manifest-entry-channel): Export.
* guix/scripts/describe.scm (display-profile-content): Use it.
---
guix/channels.scm | 1 +
guix/scripts/describe.scm | 30 ++++++++++++------------------
2 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/guix/channels.scm b/guix/channels.scm
index 6449221c3f..743b4a25b7 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -91,6 +91,7 @@
ensure-forward-channel-update
profile-channels
+ manifest-entry-channel
channel-news-entry?
channel-news-entry-commit
diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm
index c3667516eb..b7ec029ba8 100644
--- a/guix/scripts/describe.scm
+++ b/guix/scripts/describe.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
;;;
@@ -237,23 +237,17 @@ way and displaying details about the channel's source code."
(format #t " ~a ~a~%"
(manifest-entry-name entry)
(manifest-entry-version entry))
- (match (assq 'source (manifest-entry-properties entry))
- (('source ('repository ('version 0)
- ('url url)
- ('branch branch)
- ('commit commit)
- _ ...))
- (let ((channel (channel (name 'nameless)
- (url url)
- (branch branch)
- (commit commit))))
- (format #t (G_ " repository URL: ~a~%") url)
- (when branch
- (format #t (G_ " branch: ~a~%") branch))
- (format #t (G_ " commit: ~a~%")
- (if (supports-hyperlinks?)
- (channel-commit-hyperlink channel commit)
- commit))))
+ (match (manifest-entry-channel entry)
+ ((? channel? channel)
+ (format #t (G_ " repository URL: ~a~%")
+ (channel-url channel))
+ (when (channel-branch channel)
+ (format #t (G_ " branch: ~a~%")
+ (channel-branch channel)))
+ (format #t (G_ " commit: ~a~%")
+ (if (supports-hyperlinks?)
+ (channel-commit-hyperlink channel)
+ (channel-commit channel))))
(_ #f)))
;; Show most recently installed packages last.
--
2.30.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#45919] [PATCH 7/8] channels: Add 'channel->code'.
2021-01-16 18:34 ` [bug#45919] [PATCH 1/8] profiles: Add 'manifest->code' Ludovic Courtès
` (4 preceding siblings ...)
2021-01-16 18:34 ` [bug#45919] [PATCH 6/8] guix describe: Use 'manifest-entry-channel' Ludovic Courtès
@ 2021-01-16 18:34 ` Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 8/8] guix package: Add '--export-channels' Ludovic Courtès
6 siblings, 0 replies; 37+ messages in thread
From: Ludovic Courtès @ 2021-01-16 18:34 UTC (permalink / raw)
To: 45919
* guix/channels.scm (channel->code): New procedure, taken from...
* guix/scripts/describe.scm (channel->sexp): ... here.
Adjust callers accordingly.
---
guix/channels.scm | 19 +++++++++++++++++++
guix/scripts/describe.scm | 22 +++-------------------
2 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/guix/channels.scm b/guix/channels.scm
index 743b4a25b7..cdef77637d 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -92,6 +92,7 @@
profile-channels
manifest-entry-channel
+ channel->code
channel-news-entry?
channel-news-entry-commit
@@ -957,6 +958,24 @@ PROFILE is not a profile created by 'guix pull', return the empty list."
(reverse
(manifest-entries (profile-manifest profile)))))
+(define* (channel->code channel #:key (include-introduction? #t))
+ "Return code (an sexp) to build CHANNEL. When INCLUDE-INTRODUCTION? is
+true, include its introduction, if any."
+ (let ((intro (and include-introduction?
+ (channel-introduction channel))))
+ `(channel
+ (name ',(channel-name channel))
+ (url ,(channel-url channel))
+ (commit ,(channel-commit channel))
+ ,@(if intro
+ `((introduction (make-channel-introduction
+ ,(channel-introduction-first-signed-commit intro)
+ (openpgp-fingerprint
+ ,(openpgp-format-fingerprint
+ (channel-introduction-first-commit-signer
+ intro))))))
+ '()))))
+
\f
;;;
;;; News.
diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm
index b7ec029ba8..e47d207ee0 100644
--- a/guix/scripts/describe.scm
+++ b/guix/scripts/describe.scm
@@ -113,22 +113,6 @@ Display information about the channels currently in use.\n"))
(_
(warning (G_ "'GUIX_PACKAGE_PATH' is set but it is not captured~%")))))))
-(define* (channel->sexp channel #:key (include-introduction? #t))
- (let ((intro (and include-introduction?
- (channel-introduction channel))))
- `(channel
- (name ',(channel-name channel))
- (url ,(channel-url channel))
- (commit ,(channel-commit channel))
- ,@(if intro
- `((introduction (make-channel-introduction
- ,(channel-introduction-first-signed-commit intro)
- (openpgp-fingerprint
- ,(openpgp-format-fingerprint
- (channel-introduction-first-commit-signer
- intro))))))
- '()))))
-
(define (channel->json channel)
(scm->json-string
(let ((intro (channel-introduction channel)))
@@ -183,7 +167,7 @@ string is ~a.~%")
(format #t (G_ " branch: ~a~%") (reference-shorthand head))
(format #t (G_ " commit: ~a~%") commit))
('channels
- (pretty-print `(list ,(channel->sexp (channel (name 'guix)
+ (pretty-print `(list ,(channel->code (channel (name 'guix)
(url (dirname directory))
(commit commit))))))
('json
@@ -213,9 +197,9 @@ in the format specified by FMT."
('human
(display-profile-content profile number))
('channels
- (pretty-print `(list ,@(map channel->sexp channels))))
+ (pretty-print `(list ,@(map channel->code channels))))
('channels-sans-intro
- (pretty-print `(list ,@(map (cut channel->sexp <>
+ (pretty-print `(list ,@(map (cut channel->code <>
#:include-introduction? #f)
channels))))
('json
--
2.30.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#45919] [PATCH 8/8] guix package: Add '--export-channels'.
2021-01-16 18:34 ` [bug#45919] [PATCH 1/8] profiles: Add 'manifest->code' Ludovic Courtès
` (5 preceding siblings ...)
2021-01-16 18:34 ` [bug#45919] [PATCH 7/8] channels: Add 'channel->code' Ludovic Courtès
@ 2021-01-16 18:34 ` Ludovic Courtès
6 siblings, 0 replies; 37+ messages in thread
From: Ludovic Courtès @ 2021-01-16 18:34 UTC (permalink / raw)
To: 45919
* guix/channels.scm (sexp->channel): Export.
* guix/describe.scm: Use (guix channels).
(manifest-entry-provenance): New procedure.
* guix/scripts/package.scm (channel=?, export-channels): New
procedures.
(show-help, %options): Add '--export-channels'.
(process-query): Honor it.
* build-aux/build-self.scm (build-program)[select?]: Exclude (guix
channels) to account for the (guix describe) change above.
* doc/guix.texi (Invoking guix package): Document it.
---
build-aux/build-self.scm | 3 ++
doc/guix.texi | 24 ++++++++++++++++
guix/channels.scm | 1 +
guix/describe.scm | 34 ++++++++++++++++++++--
guix/scripts/package.scm | 61 ++++++++++++++++++++++++++++++++++++++++
5 files changed, 121 insertions(+), 2 deletions(-)
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index 4b6e2bfae5..d5bc5fb46e 100644
--- a/build-aux/build-self.scm
+++ b/build-aux/build-self.scm
@@ -245,8 +245,11 @@ interface (FFI) of Guile.")
"Return a program that computes the derivation to build Guix from SOURCE."
(define select?
;; Select every module but (guix config) and non-Guix modules.
+ ;; Also exclude (guix channels): it is autoloaded by (guix describe), but
+ ;; only for peripheral functionality.
(match-lambda
(('guix 'config) #f)
+ (('guix 'channels) #f)
(('guix _ ...) #t)
(('gnu _ ...) #t)
(_ #f)))
diff --git a/doc/guix.texi b/doc/guix.texi
index e524464e9f..cfb2f8a296 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -3591,7 +3591,31 @@ exactly what you specified.
Keep in mind that a manifest is purely symbolic: it only contains
package names and possibly versions, and their meaning varies over time.
+If you wish to ``pin'' channels to the revisions that were used to build
+the profile(s), see @option{--export-channels} below.
+@cindex pinning, channel revisions of a profile
+@item --export-channels
+Write to standard output the list of channels used by the chosen
+profile(s), in a format suitable for @command{guix pull --channels} or
+@command{guix time-machine --channels} (@pxref{Channels}).
+
+Together with @option{--export-manifest}, this option provides
+information allowing you to replicate the current profile
+(@pxref{Replicating Guix}).
+
+However, note that the output of this command @emph{approximates} what
+was actually used to build this profile. In particular, a single
+profile might have been built from several different revisions of the
+same channel. In that case, @option{--export-manifest} chooses the last
+one and writes the list of other revisions in a comment. If you really
+need to pick packages from different channel revisions, you can use
+inferiors in your manifest to do so (@pxref{Inferiors}).
+
+Together with @option{--export-manifest}, this is a good starting point
+if you are willing to migrate from the ``imperative'' model to the fully
+declarative model consisting of a manifest file along with a channels
+file pinning the exact channel revision(s) you want.
@end table
Finally, since @command{guix package} may actually start build
diff --git a/guix/channels.scm b/guix/channels.scm
index cdef77637d..e7e1eb6fd0 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -92,6 +92,7 @@
profile-channels
manifest-entry-channel
+ sexp->channel
channel->code
channel-news-entry?
diff --git a/guix/describe.scm b/guix/describe.scm
index 05bf99eb58..ac89fc0d7c 100644
--- a/guix/describe.scm
+++ b/guix/describe.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -23,6 +23,7 @@
#:use-module ((guix utils) #:select (location-file))
#:use-module ((guix store) #:select (%store-prefix store-path?))
#:use-module ((guix config) #:select (%state-directory))
+ #:autoload (guix channels) (sexp->channel)
#:use-module (srfi srfi-1)
#:use-module (ice-9 match)
#:export (current-profile
@@ -31,7 +32,8 @@
package-path-entries
package-provenance
- manifest-entry-with-provenance))
+ manifest-entry-with-provenance
+ manifest-entry-provenance))
;;; Commentary:
;;;
@@ -166,3 +168,31 @@ there."
(#f properties)
(sexp `((provenance ,@sexp)
,@properties)))))))))
+
+(define (manifest-entry-provenance entry)
+ "Return the list of channels ENTRY comes from. Return the empty list if
+that information is missing."
+ (match (assq-ref (manifest-entry-properties entry) 'provenance)
+ ((main extras ...)
+ ;; XXX: Until recently, channel sexps lacked the channel name. For
+ ;; entries created by 'manifest-entry-with-provenance', the first sexp
+ ;; is known to be the 'guix channel, and for the other ones, invent a
+ ;; fallback name (it's OK as the name is just a "pet name").
+ (match (sexp->channel main 'guix)
+ (#f '())
+ (channel
+ (let loop ((extras extras)
+ (counter 1)
+ (channels (list channel)))
+ (match extras
+ (()
+ (reverse channels))
+ ((head . tail)
+ (let* ((name (string->symbol
+ (format #f "channel~a" counter)))
+ (extra (sexp->channel head name)))
+ (if extra
+ (loop tail (+ 1 counter) (cons extra channels))
+ (loop tail counter channels)))))))))
+ (_
+ '())))
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index 2b52016c67..8234a1703d 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -43,6 +43,7 @@
#:use-module (guix scripts build)
#:use-module (guix transformations)
#:use-module (guix describe)
+ #:autoload (guix channels) (channel-name channel-commit channel->code)
#:autoload (guix store roots) (gc-roots user-owned?)
#:use-module ((guix build utils)
#:select (directory-exists? mkdir-p))
@@ -363,6 +364,54 @@ Alternately, see @command{guix package --search-paths -p ~s}.")
(pretty-print exp port))
exp))))
+(define (channel=? a b)
+ (and (channel-commit a) (channel-commit b)
+ (string=? (channel-commit a) (channel-commit b))))
+
+(define* (export-channels manifest
+ #:optional (port (current-output-port)))
+ (define channels
+ (delete-duplicates
+ (append-map manifest-entry-provenance (manifest-entries manifest))
+ channel=?))
+
+ (define channel-names
+ (delete-duplicates (map channel-name channels)))
+
+ (define table
+ (fold (lambda (channel table)
+ (vhash-consq (channel-name channel) channel table))
+ vlist-null
+ channels))
+
+ (when (null? channels)
+ (leave (G_ "no provenance information for this profile~%")))
+
+ (format port (G_ "\
+;; This channel file can be passed to 'guix pull -C' or to
+;; 'guix time-machine -C' to obtain the Guix revision that was
+;; used to populate this profile.\n"))
+ (newline port)
+ (display "(list\n" port)
+ (for-each (lambda (name)
+ (define indent " ")
+ (match (vhash-foldq* cons '() name table)
+ ((channel extra ...)
+ (unless (null? extra)
+ (display indent port)
+ (format port (G_ "\
+;; Note: these other commits were also used to install \
+some of the packages in this profile:~%"))
+ (for-each (lambda (channel)
+ (format port "~a;; ~s~%"
+ indent (channel-commit channel)))
+ extra))
+ (pretty-print (channel->code channel) port
+ #:per-line-prefix indent))))
+ channel-names)
+ (display ")\n" port)
+ #t)
+
\f
;;;
;;; Command-line options.
@@ -418,6 +467,8 @@ Install, remove, or upgrade packages in a single transaction.\n"))
switch to a generation matching PATTERN"))
(display (G_ "
--export-manifest print a manifest for the chosen profile"))
+ (display (G_ "
+ --export-channels print channels for the chosen profile"))
(display (G_ "
-p, --profile=PROFILE use PROFILE instead of the user's default profile"))
(display (G_ "
@@ -556,6 +607,10 @@ kind of search path~%")
(lambda (opt name arg result arg-handler)
(values (cons `(query export-manifest) result)
#f)))
+ (option '("export-channels") #f #f
+ (lambda (opt name arg result arg-handler)
+ (values (cons `(query export-channels) result)
+ #f)))
(option '(#\p "profile") #t #f
(lambda (opt name arg result arg-handler)
(values (alist-cons 'profile (canonicalize-profile arg)
@@ -882,6 +937,12 @@ processed, #f otherwise."
(export-manifest manifest (current-output-port))
#t))
+ (('export-channels)
+ (let ((manifest (concatenate-manifests
+ (map profile-manifest profiles))))
+ (export-channels manifest (current-output-port))
+ #t))
+
(_ #f))))
--
2.30.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* Re: bug#45919: [PATCH 0/8] Exporting a manifest and channels from a profile
2021-01-16 18:29 [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 1/8] profiles: Add 'manifest->code' Ludovic Courtès
@ 2021-01-27 13:14 ` Ludovic Courtès
2021-01-27 21:02 ` [bug#45919] " zimoun
2021-01-28 17:04 ` bug#45919: " Pierre Neidhardt
1 sibling, 2 replies; 37+ messages in thread
From: Ludovic Courtès @ 2021-01-27 13:14 UTC (permalink / raw)
To: 45919; +Cc: guix-devel
Hi there!
Ludovic Courtès <ludo@gnu.org> skribis:
> Here’s a simple but oft-requested feature (I remember discussing
> with Pierre and Simon a year ago at the Guix Days about ways to
> implement it—time flies!): these patches provide ‘guix package
> --export-manifest’ and ‘--export-channels’. These options spit
> a manifest and a channel spec, respectively, with the goal of
> helping users who wish to migrate to the declarative model.
I’m rather happy with this patch set but since this is something we’ve
discussed several times in the past, I think it’d be great if those
interested could chime in and comment:
https://issues.guix.gnu.org/45919
I’ll leave a few more days and then… push!
TIA,
Ludo’.
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile
2021-01-27 13:14 ` bug#45919: [PATCH 0/8] Exporting a manifest and channels from a profile Ludovic Courtès
@ 2021-01-27 21:02 ` zimoun
2021-01-28 15:54 ` Ludovic Courtès
2021-01-28 17:57 ` [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile Bengt Richter
2021-01-28 17:04 ` bug#45919: " Pierre Neidhardt
1 sibling, 2 replies; 37+ messages in thread
From: zimoun @ 2021-01-27 21:02 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel, 45919
Hi Ludo,
On Wed, 27 Jan 2021 at 14:14, Ludovic Courtès <ludo@gnu.org> wrote:
> Ludovic Courtès <ludo@gnu.org> skribis:
>
>> Here’s a simple but oft-requested feature (I remember discussing
>> with Pierre and Simon a year ago at the Guix Days about ways to
>> implement it—time flies!): these patches provide ‘guix package
>> --export-manifest’ and ‘--export-channels’. These options spit
>> a manifest and a channel spec, respectively, with the goal of
>> helping users who wish to migrate to the declarative model.
>
> I’m rather happy with this patch set but since this is something we’ve
> discussed several times in the past, I think it’d be great if those
> interested could chime in and comment:
>
> https://issues.guix.gnu.org/45919
>
> I’ll leave a few more days and then… push!
You are looking at me? :-)
Well, the feature is nice! At first, I thought that it could be a bit
smarter than using only one commit. But as you said, the aim is for
transitioning. Maybe a future improvement should to list somewhere in
the comments which commit provides which set of packages. It could
help… or not. :-)
Using Docker, it works. Let describe how in case people are interested.
On machine A, I have:
--8<---------------cut here---------------start------------->8---
$ guix describe -f channels
(list (channel
(name 'guix)
(url "https://git.savannah.gnu.org/git/guix.git")
(commit
"cb68ae668af2ade4b0777d82f227e5462768e9e5")
(introduction
(make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad"
(openpgp-fingerprint
"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA")))))
$ cat ~/.config/guix/manifests/python.scm
(specifications->manifest
(append
'("python"
)
(map
(lambda (pkg)
(string-append "python-" pkg))
'("ipython"
"numpy"
"matplotlib"
"scipy"
"biopython"
))))
--8<---------------cut here---------------end--------------->8---
And I generate a Docker pack with:
--8<---------------cut here---------------start------------->8---
$ guix pack -f docker --save-provenance -m ~/.config/guix/manifests/python.scm
/gnu/store/wxymmnxdvdvf08ifsfy39xjaxilhrigk-docker-pack.tar.gz
--8<---------------cut here---------------end--------------->8---
Then on machine B, after fetching this tarball, I run:
--8<---------------cut here---------------start------------->8---
$ docker load < /tmp/img/wxymmnxdvdvf08ifsfy39xjaxilhrigk-docker-pack.tar.gz
$ docker images
REPOSITORY TAG IMAGE ID CREATED SIZE
python-python-ipython-python-numpy latest 49ddfedf1e27 51 years ago 1.45GB
--8<---------------cut here---------------end--------------->8---
And it works as expected:
--8<---------------cut here---------------start------------->8---
$ docker run -ti python-python-ipython-python-numpy:latest python3
Python 3.8.2 (default, Jan 1 1970, 00:00:01)
[GCC 7.5.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import this
The Zen of Python, by Tim Peters
Beautiful is better than ugly.
Explicit is better than implicit.
Simple is better than complex.
Complex is better than complicated.
Flat is better than nested.
Sparse is better than dense.
Readability counts.
Special cases aren't special enough to break the rules.
Although practicality beats purity.
Errors should never pass silently.
Unless explicitly silenced.
In the face of ambiguity, refuse the temptation to guess.
There should be one-- and preferably only one --obvious way to do it.
Although that way may not be obvious at first unless you're Dutch.
Now is better than never.
Although never is often better than *right* now.
If the implementation is hard to explain, it's a bad idea.
If the implementation is easy to explain, it may be a good idea.
Namespaces are one honking great idea -- let's do more of those!
>>> import numpy as np
>>> A = np.array([[1,0,1],[0,1,0],[0,0,1]])
>>> _, s, _ = np.linalg.svd(A); s; abs(s[0] - 1./s[2])
array([1.61803399, 1. , 0.61803399])
0.0
>>>
--8<---------------cut here---------------end--------------->8---
Neat!
So far, so good. Well, let extract the ’manifest’ from this Docker
blob.
--8<---------------cut here---------------start------------->8---
$ docker export -o /tmp/img/re-pack.tar $(docker ps -a --format "{{.ID}}" | head -n1)
$ tar -xf /tmp/img/re-pack.tar $(tar -tf /tmp/img/re-pack.tar | grep 'profile/manifest')
$ cat gnu/store/7frdchgf5sqw8b83azsml3lw0h52gfbk-profile/manifest | grep -E "(\(\"python|cb68ae)" | head -n5
(("python"
"cb68ae668af2ade4b0777d82f227e5462768e9e5")
("python-ipython"
(("python-backcall"
("python-pyzmq"
--8<---------------cut here---------------end--------------->8---
Now, a trick to get the channels and specifications:
--8<---------------cut here---------------start------------->8---
$ ./pre-inst-env guix package -p /tmp/img/gnu/store/7frdchgf5sqw8b83azsml3lw0h52gfbk-profile --export-channels
;; This channel file can be passed to 'guix pull -C' or to
;; 'guix time-machine -C' to obtain the Guix revision that was
;; used to populate this profile.
(list
(channel
(name 'guix)
(url "https://git.savannah.gnu.org/git/guix.git")
(commit
"cb68ae668af2ade4b0777d82f227e5462768e9e5")
(introduction
(make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad"
(openpgp-fingerprint
"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))
)
$ ./pre-inst-env guix package -p /tmp/img/gnu/store/7frdchgf5sqw8b83azsml3lw0h52gfbk-profile --export-manifest
$ ./pre-inst-env guix package -p /tmp/img/gnu/store/7frdchgf5sqw8b83azsml3lw0h52gfbk-profile --export-manifest
;; This "manifest" file can be passed to 'guix package -m' to reproduce
;; the content of your profile. This is "symbolic": it only specifies
;; package names. To reproduce the exact same profile, you also need to
;; capture the channels being used, as returned by "guix describe".
;; See the "Replicating Guix" section in the manual.
(specifications->manifest
(list "python"
"python-ipython"
"python-numpy"
"python-matplotlib"
"python-scipy"
"python-biopython"))
--8<---------------cut here---------------end--------------->8---
Awesome!
The unexpected is this channels and manifests files do not reproduce the
same Docker pack tarball:
--8<---------------cut here---------------start------------->8---
$ guix describe
Generation 99 Jan 05 2021 16:56:39 (current)
guix-past 829923f
repository URL: https://gitlab.inria.fr/guix-hpc/guix-past
branch: master
commit: 829923f01f894f1e687735627025ada26230832f
guix-bimsb a8b539d
repository URL: https://github.com/BIMSBbioinfo/guix-bimsb
branch: master
commit: a8b539d61a359060c35f3cb34c7edd1d9d14241d
bimsb-nonfree 4084e63
repository URL: https://github.com/BIMSBbioinfo/guix-bimsb-nonfree.git
branch: master
commit: 4084e63c9c0d662780870aded9f5a6ca1b063780
guix-science cf87b05
repository URL: https://github.com/guix-science/guix-science.git
branch: master
commit: cf87b0501c4a38b96edf41025a27bf1cb91f521a
guix 957f0c4
repository URL: https://git.savannah.gnu.org/git/guix.git
branch: master
commit: 957f0c40327ce00f53db22737e3775ce616ac258
$ guix time-machine -C /tmp/img/channels.scm -- pack -f docker --save-provenance -m /tmp/img/manifest.scm
Updating channel 'guix' from Git repository at 'https://git.savannah.gnu.org/git/guix.git'...
/gnu/store/xzk604g8gysv4azn7sf9nylr6iah97gl-docker-pack.tar.gz
--8<---------------cut here---------------end--------------->8---
To compare with
/gnu/store/wxymmnxdvdvf08ifsfy39xjaxilhrigk-docker-pack.tar.gz.
On a third machine, I get:
/gnu/store/wxymmnxdvdvf08ifsfy39xjaxilhrigk-docker-pack.tar.gz
Well, that’s another story and I have not inspected yet the
derivations and what could be wrong on the machine B.
Cheers,
simon
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile
2021-01-27 21:02 ` [bug#45919] " zimoun
@ 2021-01-28 15:54 ` Ludovic Courtès
2021-02-01 22:37 ` Unreproducible “guix pack -f docker” because config.scm-builder zimoun
2021-01-28 17:57 ` [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile Bengt Richter
1 sibling, 1 reply; 37+ messages in thread
From: Ludovic Courtès @ 2021-01-28 15:54 UTC (permalink / raw)
To: zimoun; +Cc: guix-devel, 45919
Hi,
zimoun <zimon.toutoune@gmail.com> skribis:
> On Wed, 27 Jan 2021 at 14:14, Ludovic Courtès <ludo@gnu.org> wrote:
>> Ludovic Courtès <ludo@gnu.org> skribis:
>>
>>> Here’s a simple but oft-requested feature (I remember discussing
>>> with Pierre and Simon a year ago at the Guix Days about ways to
>>> implement it—time flies!): these patches provide ‘guix package
>>> --export-manifest’ and ‘--export-channels’. These options spit
>>> a manifest and a channel spec, respectively, with the goal of
>>> helping users who wish to migrate to the declarative model.
>>
>> I’m rather happy with this patch set but since this is something we’ve
>> discussed several times in the past, I think it’d be great if those
>> interested could chime in and comment:
>>
>> https://issues.guix.gnu.org/45919
>>
>> I’ll leave a few more days and then… push!
>
> You are looking at me? :-)
Yes, but not just. :-)
> Well, the feature is nice! At first, I thought that it could be a bit
> smarter than using only one commit. But as you said, the aim is for
> transitioning. Maybe a future improvement should to list somewhere in
> the comments which commit provides which set of packages. It could
> help… or not. :-)
>
> Using Docker, it works. Let describe how in case people are interested.
[...]
> Awesome!
Woow, thanks for explaining the experiment, it’s a nice one! Would be
worth turning into a blog post, maybe for hpc.guix.info?
> The unexpected is this channels and manifests files do not reproduce the
> same Docker pack tarball:
>
> $ guix describe
> Generation 99 Jan 05 2021 16:56:39 (current)
> guix-past 829923f
> repository URL: https://gitlab.inria.fr/guix-hpc/guix-past
> branch: master
> commit: 829923f01f894f1e687735627025ada26230832f
> guix-bimsb a8b539d
> repository URL: https://github.com/BIMSBbioinfo/guix-bimsb
> branch: master
> commit: a8b539d61a359060c35f3cb34c7edd1d9d14241d
> bimsb-nonfree 4084e63
> repository URL: https://github.com/BIMSBbioinfo/guix-bimsb-nonfree.git
> branch: master
> commit: 4084e63c9c0d662780870aded9f5a6ca1b063780
> guix-science cf87b05
> repository URL: https://github.com/guix-science/guix-science.git
> branch: master
> commit: cf87b0501c4a38b96edf41025a27bf1cb91f521a
> guix 957f0c4
> repository URL: https://git.savannah.gnu.org/git/guix.git
> branch: master
> commit: 957f0c40327ce00f53db22737e3775ce616ac258
>
> $ guix time-machine -C /tmp/img/channels.scm -- pack -f docker --save-provenance -m /tmp/img/manifest.scm
> Updating channel 'guix' from Git repository at 'https://git.savannah.gnu.org/git/guix.git'...
> /gnu/store/xzk604g8gysv4azn7sf9nylr6iah97gl-docker-pack.tar.gz
>
> To compare with
> /gnu/store/wxymmnxdvdvf08ifsfy39xjaxilhrigk-docker-pack.tar.gz.
>
> On a third machine, I get:
> /gnu/store/wxymmnxdvdvf08ifsfy39xjaxilhrigk-docker-pack.tar.gz
>
> Well, that’s another story and I have not inspected yet the
> derivations and what could be wrong on the machine B.
You’d have to check the differences. It may be that provenance data
differs, for example because the second attempt includes data about
channels that are actually unused. (That’s the whole problem of
provenance data: it’s not a one-to-one mapping and it’s not a bijection
either.)
Thanks for trying it out!
Ludo’.
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: bug#45919: [PATCH 0/8] Exporting a manifest and channels from a profile
2021-01-27 13:14 ` bug#45919: [PATCH 0/8] Exporting a manifest and channels from a profile Ludovic Courtès
2021-01-27 21:02 ` [bug#45919] " zimoun
@ 2021-01-28 17:04 ` Pierre Neidhardt
2021-01-29 17:57 ` [bug#45919] " Pierre Neidhardt
1 sibling, 1 reply; 37+ messages in thread
From: Pierre Neidhardt @ 2021-01-28 17:04 UTC (permalink / raw)
To: Ludovic Courtès, 45919; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 932 bytes --]
Hi Ludo!
Ludovic Courtès <ludo@gnu.org> writes:
> Ludovic Courtès <ludo@gnu.org> skribis:
>
>> Here’s a simple but oft-requested feature (I remember discussing
>> with Pierre and Simon a year ago at the Guix Days about ways to
>> implement it—time flies!): these patches provide ‘guix package
>> --export-manifest’ and ‘--export-channels’. These options spit
>> a manifest and a channel spec, respectively, with the goal of
>> helping users who wish to migrate to the declarative model.
>
> I’m rather happy with this patch set but since this is something we’ve
> discussed several times in the past, I think it’d be great if those
> interested could chime in and comment:
>
> https://issues.guix.gnu.org/45919
>
> I’ll leave a few more days and then… push!
Thanks a lot for working on this, I'll try to give it a shot tomorrow! :)
--
Pierre Neidhardt
https://ambrevar.xyz/
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 511 bytes --]
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile
2021-01-27 21:02 ` [bug#45919] " zimoun
2021-01-28 15:54 ` Ludovic Courtès
@ 2021-01-28 17:57 ` Bengt Richter
2021-01-29 19:13 ` zimoun
1 sibling, 1 reply; 37+ messages in thread
From: Bengt Richter @ 2021-01-28 17:57 UTC (permalink / raw)
To: zimoun; +Cc: guix-devel, 45919
Hi zimoun,
Thank you for your tutorial-style and resource-reference-footnoted posts!
I don't know about others, but I save many on my hard disk as reference examples.
I hope this provides positive feedback for your efforts.
Thank you.
On +2021-01-27 22:02:53 +0100, zimoun wrote:
> Hi Ludo,
>
> On Wed, 27 Jan 2021 at 14:14, Ludovic Courtès <ludo@gnu.org> wrote:
> > Ludovic Courtès <ludo@gnu.org> skribis:
> >
> >> Here’s a simple but oft-requested feature (I remember discussing
> >> with Pierre and Simon a year ago at the Guix Days about ways to
> >> implement it—time flies!): these patches provide ‘guix package
> >> --export-manifest’ and ‘--export-channels’. These options spit
> >> a manifest and a channel spec, respectively, with the goal of
> >> helping users who wish to migrate to the declarative model.
> >
> > I’m rather happy with this patch set but since this is something we’ve
> > discussed several times in the past, I think it’d be great if those
> > interested could chime in and comment:
> >
> > https://issues.guix.gnu.org/45919
> >
> > I’ll leave a few more days and then… push!
>
> You are looking at me? :-)
>
> Well, the feature is nice! At first, I thought that it could be a bit
> smarter than using only one commit. But as you said, the aim is for
> transitioning. Maybe a future improvement should to list somewhere in
> the comments which commit provides which set of packages. It could
> help… or not. :-)
>
> Using Docker, it works. Let describe how in case people are interested.
>
>
> On machine A, I have:
>
> --8<---------------cut here---------------start------------->8---
> $ guix describe -f channels
> (list (channel
> (name 'guix)
> (url "https://git.savannah.gnu.org/git/guix.git")
> (commit
> "cb68ae668af2ade4b0777d82f227e5462768e9e5")
> (introduction
> (make-channel-introduction
> "9edb3f66fd807b096b48283debdcddccfea34bad"
> (openpgp-fingerprint
> "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA")))))
>
> $ cat ~/.config/guix/manifests/python.scm
> (specifications->manifest
> (append
> '("python"
> )
> (map
> (lambda (pkg)
> (string-append "python-" pkg))
> '("ipython"
> "numpy"
> "matplotlib"
> "scipy"
> "biopython"
> ))))
> --8<---------------cut here---------------end--------------->8---
>
> And I generate a Docker pack with:
>
> --8<---------------cut here---------------start------------->8---
> $ guix pack -f docker --save-provenance -m ~/.config/guix/manifests/python.scm
> /gnu/store/wxymmnxdvdvf08ifsfy39xjaxilhrigk-docker-pack.tar.gz
> --8<---------------cut here---------------end--------------->8---
>
>
> Then on machine B, after fetching this tarball, I run:
>
> --8<---------------cut here---------------start------------->8---
> $ docker load < /tmp/img/wxymmnxdvdvf08ifsfy39xjaxilhrigk-docker-pack.tar.gz
> $ docker images
> REPOSITORY TAG IMAGE ID CREATED SIZE
> python-python-ipython-python-numpy latest 49ddfedf1e27 51 years ago 1.45GB
> --8<---------------cut here---------------end--------------->8---
>
> And it works as expected:
>
> --8<---------------cut here---------------start------------->8---
> $ docker run -ti python-python-ipython-python-numpy:latest python3
> Python 3.8.2 (default, Jan 1 1970, 00:00:01)
> [GCC 7.5.0] on linux
> Type "help", "copyright", "credits" or "license" for more information.
> >>> import this
> The Zen of Python, by Tim Peters
>
> Beautiful is better than ugly.
> Explicit is better than implicit.
> Simple is better than complex.
> Complex is better than complicated.
> Flat is better than nested.
> Sparse is better than dense.
> Readability counts.
> Special cases aren't special enough to break the rules.
> Although practicality beats purity.
> Errors should never pass silently.
> Unless explicitly silenced.
> In the face of ambiguity, refuse the temptation to guess.
> There should be one-- and preferably only one --obvious way to do it.
> Although that way may not be obvious at first unless you're Dutch.
> Now is better than never.
> Although never is often better than *right* now.
> If the implementation is hard to explain, it's a bad idea.
> If the implementation is easy to explain, it may be a good idea.
> Namespaces are one honking great idea -- let's do more of those!
> >>> import numpy as np
> >>> A = np.array([[1,0,1],[0,1,0],[0,0,1]])
> >>> _, s, _ = np.linalg.svd(A); s; abs(s[0] - 1./s[2])
> array([1.61803399, 1. , 0.61803399])
> 0.0
> >>>
> --8<---------------cut here---------------end--------------->8---
>
> Neat!
>
> So far, so good. Well, let extract the ’manifest’ from this Docker
> blob.
>
> --8<---------------cut here---------------start------------->8---
> $ docker export -o /tmp/img/re-pack.tar $(docker ps -a --format "{{.ID}}" | head -n1)
> $ tar -xf /tmp/img/re-pack.tar $(tar -tf /tmp/img/re-pack.tar | grep 'profile/manifest')
> $ cat gnu/store/7frdchgf5sqw8b83azsml3lw0h52gfbk-profile/manifest | grep -E "(\(\"python|cb68ae)" | head -n5
> (("python"
> "cb68ae668af2ade4b0777d82f227e5462768e9e5")
> ("python-ipython"
> (("python-backcall"
> ("python-pyzmq"
> --8<---------------cut here---------------end--------------->8---
>
> Now, a trick to get the channels and specifications:
>
> --8<---------------cut here---------------start------------->8---
> $ ./pre-inst-env guix package -p /tmp/img/gnu/store/7frdchgf5sqw8b83azsml3lw0h52gfbk-profile --export-channels
> ;; This channel file can be passed to 'guix pull -C' or to
> ;; 'guix time-machine -C' to obtain the Guix revision that was
> ;; used to populate this profile.
>
> (list
> (channel
> (name 'guix)
> (url "https://git.savannah.gnu.org/git/guix.git")
> (commit
> "cb68ae668af2ade4b0777d82f227e5462768e9e5")
> (introduction
> (make-channel-introduction
> "9edb3f66fd807b096b48283debdcddccfea34bad"
> (openpgp-fingerprint
> "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))
> )
>
> $ ./pre-inst-env guix package -p /tmp/img/gnu/store/7frdchgf5sqw8b83azsml3lw0h52gfbk-profile --export-manifest
> $ ./pre-inst-env guix package -p /tmp/img/gnu/store/7frdchgf5sqw8b83azsml3lw0h52gfbk-profile --export-manifest
> ;; This "manifest" file can be passed to 'guix package -m' to reproduce
> ;; the content of your profile. This is "symbolic": it only specifies
> ;; package names. To reproduce the exact same profile, you also need to
> ;; capture the channels being used, as returned by "guix describe".
> ;; See the "Replicating Guix" section in the manual.
>
> (specifications->manifest
> (list "python"
> "python-ipython"
> "python-numpy"
> "python-matplotlib"
> "python-scipy"
> "python-biopython"))
> --8<---------------cut here---------------end--------------->8---
>
> Awesome!
>
>
> The unexpected is this channels and manifests files do not reproduce the
> same Docker pack tarball:
>
> --8<---------------cut here---------------start------------->8---
> $ guix describe
> Generation 99 Jan 05 2021 16:56:39 (current)
> guix-past 829923f
> repository URL: https://gitlab.inria.fr/guix-hpc/guix-past
> branch: master
> commit: 829923f01f894f1e687735627025ada26230832f
> guix-bimsb a8b539d
> repository URL: https://github.com/BIMSBbioinfo/guix-bimsb
> branch: master
> commit: a8b539d61a359060c35f3cb34c7edd1d9d14241d
> bimsb-nonfree 4084e63
> repository URL: https://github.com/BIMSBbioinfo/guix-bimsb-nonfree.git
> branch: master
> commit: 4084e63c9c0d662780870aded9f5a6ca1b063780
> guix-science cf87b05
> repository URL: https://github.com/guix-science/guix-science.git
> branch: master
> commit: cf87b0501c4a38b96edf41025a27bf1cb91f521a
> guix 957f0c4
> repository URL: https://git.savannah.gnu.org/git/guix.git
> branch: master
> commit: 957f0c40327ce00f53db22737e3775ce616ac258
>
> $ guix time-machine -C /tmp/img/channels.scm -- pack -f docker --save-provenance -m /tmp/img/manifest.scm
> Updating channel 'guix' from Git repository at 'https://git.savannah.gnu.org/git/guix.git'...
> /gnu/store/xzk604g8gysv4azn7sf9nylr6iah97gl-docker-pack.tar.gz
> --8<---------------cut here---------------end--------------->8---
>
> To compare with
> /gnu/store/wxymmnxdvdvf08ifsfy39xjaxilhrigk-docker-pack.tar.gz.
>
> On a third machine, I get:
> /gnu/store/wxymmnxdvdvf08ifsfy39xjaxilhrigk-docker-pack.tar.gz
>
> Well, that’s another story and I have not inspected yet the
> derivations and what could be wrong on the machine B.
>
>
> Cheers,
> simon
>
KUTGW ;-)
--
Regards,
Bengt Richter
^ permalink raw reply [flat|nested] 37+ messages in thread
* [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile
2021-01-28 17:04 ` bug#45919: " Pierre Neidhardt
@ 2021-01-29 17:57 ` Pierre Neidhardt
2021-01-29 18:57 ` zimoun
2021-01-30 13:55 ` Ludovic Courtès
0 siblings, 2 replies; 37+ messages in thread
From: Pierre Neidhardt @ 2021-01-29 17:57 UTC (permalink / raw)
To: Ludovic Courtès, 45919; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 1371 bytes --]
Hi again!
I just had a cursory look, and my main concern is that maybe exposing
commands is one more thing to learn for the user, and one more step to
run to get a simple file.
Instead, what about doing what system profiles already do with
/run/current-system/channels.scm
/run/current-system/configuration.scm
and store the result of the proposed commands directly in
$PROFILE/channels.scm and $PROFILE/manifest-spec.scm, on each profile
upgrade?
We could add a warning comment at the top, explaining the limitations of
these files (that it does not represent the profile faithfully).
Thoughts?
Last, just a nit: what about listing the packages corresponding to the
commented commits next to them? For instance
--8<---------------cut here---------------start------------->8---
(list
;; Note: these other commits were also used to install some of the packages in this profile:
;; "458cb25b9e7e7c954f468023abea2bebb5d8c75b" monolith obs calibre
;; "4969b51d175497bfcc354c91803e9d70542b7113" 0ad augustus
;; "3d85c3ec652feb22824f355538b51e6955ded361" nyxt
;; ...
;; "b76b1d3fb65fec98b96a2b4cfa984316dd956a29" tectonic
(channel
(name 'guix)
...
--8<---------------cut here---------------end--------------->8---
Thanks for working on this, Ludo!
Cheers!
--
Pierre Neidhardt
https://ambrevar.xyz/
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 511 bytes --]
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile
2021-01-29 17:57 ` [bug#45919] " Pierre Neidhardt
@ 2021-01-29 18:57 ` zimoun
2021-01-29 21:51 ` Pierre Neidhardt
2021-01-30 13:55 ` Ludovic Courtès
1 sibling, 1 reply; 37+ messages in thread
From: zimoun @ 2021-01-29 18:57 UTC (permalink / raw)
To: Pierre Neidhardt, Ludovic Courtès, 45919; +Cc: guix-devel
Hi Pierre and Ludo,
On Fri, 29 Jan 2021 at 18:57, Pierre Neidhardt <mail@ambrevar.xyz> wrote:
> Hi again!
>
> I just had a cursory look, and my main concern is that maybe exposing
> commands is one more thing to learn for the user, and one more step to
> run to get a simple file.
>
> Instead, what about doing what system profiles already do with
>
> /run/current-system/channels.scm
> /run/current-system/configuration.scm
>
> and store the result of the proposed commands directly in
> $PROFILE/channels.scm and $PROFILE/manifest-spec.scm, on each profile
> upgrade?
If I understand correctly, Pierre, you are proposing 2 things: 1) only
one command and 2) export by default in $PROFILE. Right?
Yeah, sounds a good idea to me. Even if #2 seems a bit of re-work for
the patch set. :-)
> Last, just a nit: what about listing the packages corresponding to the
> commented commits next to them? For instance
>
> --8<---------------cut here---------------start------------->8---
> (list
> ;; Note: these other commits were also used to install some of the packages in this profile:
> ;; "458cb25b9e7e7c954f468023abea2bebb5d8c75b" monolith obs calibre
> ;; "4969b51d175497bfcc354c91803e9d70542b7113" 0ad augustus
> ;; "3d85c3ec652feb22824f355538b51e6955ded361" nyxt
> ;; ...
> ;; "b76b1d3fb65fec98b96a2b4cfa984316dd956a29" tectonic
> (channel
> (name 'guix)
> ...
> --8<---------------cut here---------------end--------------->8---
I agree. I did the same note. :-)
Cheers,
simon
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile
2021-01-28 17:57 ` [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile Bengt Richter
@ 2021-01-29 19:13 ` zimoun
0 siblings, 0 replies; 37+ messages in thread
From: zimoun @ 2021-01-29 19:13 UTC (permalink / raw)
To: Bengt Richter; +Cc: guix-devel, 45919
Hi Bengt,
On Thu, 28 Jan 2021 at 18:57, Bengt Richter <bokr@bokr.com> wrote:
> Thank you for your tutorial-style and resource-reference-footnoted
> posts!
Thanks! I am happy if it helps. «Déformation professionnelle»¹ :-)
Cheers,
simon
¹: French pun with «professional training» and «stretched profession».
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile
2021-01-29 18:57 ` zimoun
@ 2021-01-29 21:51 ` Pierre Neidhardt
2021-01-30 14:31 ` zimoun
0 siblings, 1 reply; 37+ messages in thread
From: Pierre Neidhardt @ 2021-01-29 21:51 UTC (permalink / raw)
To: zimoun, Ludovic Courtès, 45919; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 1221 bytes --]
zimoun <zimon.toutoune@gmail.com> writes:
>> I just had a cursory look, and my main concern is that maybe exposing
>> commands is one more thing to learn for the user, and one more step to
>> run to get a simple file.
>>
>> Instead, what about doing what system profiles already do with
>>
>> /run/current-system/channels.scm
>> /run/current-system/configuration.scm
>>
>> and store the result of the proposed commands directly in
>> $PROFILE/channels.scm and $PROFILE/manifest-spec.scm, on each profile
>> upgrade?
>
> If I understand correctly, Pierre, you are proposing 2 things: 1) only
> one command and 2) export by default in $PROFILE. Right?
>
> Yeah, sounds a good idea to me. Even if #2 seems a bit of re-work for
> the patch set. :-)
Sorry, misunderstanding :)
I'm proposing:
1) Zero command :p
2) On every profile modification (install, upgrade, removal), store the
channel description and the manifest specification (as produced by this
patch commands) to $GUIX_PROFILE/channels.scm and
$GUIX_PROFILE/manifest-spec.scm, respectively.
($GUIX_PROFILE being the target profile, of course.)
Does that make more sense?
--
Pierre Neidhardt
https://ambrevar.xyz/
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 511 bytes --]
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: bug#45919: [PATCH 0/8] Exporting a manifest and channels from a profile
2021-01-29 17:57 ` [bug#45919] " Pierre Neidhardt
2021-01-29 18:57 ` zimoun
@ 2021-01-30 13:55 ` Ludovic Courtès
2021-01-31 17:26 ` Pierre Neidhardt
1 sibling, 1 reply; 37+ messages in thread
From: Ludovic Courtès @ 2021-01-30 13:55 UTC (permalink / raw)
To: Pierre Neidhardt; +Cc: guix-devel, 45919
Hi Pierre,
Pierre Neidhardt <mail@ambrevar.xyz> skribis:
> I just had a cursory look, and my main concern is that maybe exposing
> commands is one more thing to learn for the user, and one more step to
> run to get a simple file.
>
> Instead, what about doing what system profiles already do with
>
> /run/current-system/channels.scm
> /run/current-system/configuration.scm
>
> and store the result of the proposed commands directly in
> $PROFILE/channels.scm and $PROFILE/manifest-spec.scm, on each profile
> upgrade?
>
> We could add a warning comment at the top, explaining the limitations of
> these files (that it does not represent the profile faithfully).
>
> Thoughts?
Here are practical issues that come to mind:
• It would only work for newer profiles, created after the feature has
been implemented (maybe that’s okay).
• The generated files might use APIs that, in the meantime, got
deprecated or changed somehow. This is in contrast with
‘--export-profile’, which interprets ‘manifest’ (a versioned file
format) and produces code that can use the API du jour.
• One would still have to learn about these two files, and pick the
right “manifest” file.
• For users of ‘-m my-manifest.scm’, we would need to store
‘my-manifest.scm’ as is instead of generating an approximation
thereof.
We already discussed these issues at length earlier. :-) Again, I agree
that following what we do with /run/current-system would be nice, but
the situation is different due to imperative operations.
Hmm, needs more thought…
> Last, just a nit: what about listing the packages corresponding to the
> commented commits next to them? For instance
>
> (list
> ;; Note: these other commits were also used to install some of the packages in this profile:
> ;; "458cb25b9e7e7c954f468023abea2bebb5d8c75b" monolith obs calibre
> ;; "4969b51d175497bfcc354c91803e9d70542b7113" 0ad augustus
> ;; "3d85c3ec652feb22824f355538b51e6955ded361" nyxt
> ;; ...
> ;; "b76b1d3fb65fec98b96a2b4cfa984316dd956a29" tectonic
> (channel
> (name 'guix)
> ...
Would be nice.
Thanks for your feedback!
Ludo’.
^ permalink raw reply [flat|nested] 37+ messages in thread
* [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile
2021-01-29 21:51 ` Pierre Neidhardt
@ 2021-01-30 14:31 ` zimoun
2021-01-30 21:23 ` bug#45919: " Ludovic Courtès
0 siblings, 1 reply; 37+ messages in thread
From: zimoun @ 2021-01-30 14:31 UTC (permalink / raw)
To: Pierre Neidhardt, Ludovic Courtès, 45919; +Cc: guix-devel
Hi,
On Fri, 29 Jan 2021 at 22:51, Pierre Neidhardt <mail@ambrevar.xyz> wrote:
> Sorry, misunderstanding :)
Have a drink together is missing because these times we have
communication issues. :-)
> I'm proposing:
>
> 1) Zero command :p
>
> 2) On every profile modification (install, upgrade, removal), store the
> channel description and the manifest specification (as produced by this
> patch commands) to $GUIX_PROFILE/channels.scm and
> $GUIX_PROFILE/manifest-spec.scm, respectively.
>
> ($GUIX_PROFILE being the target profile, of course.)
>
> Does that make more sense?
Yes, but it needs a lot of re-work and change, IMHO. And we ends with 3
files: $GUIX_PROFILE/manifest capturing the states of $GUIX_PROFILE and
the 2 others deducing an approximation of these states. Well, IMHO,
automatically produce this approximation at each «action» on the profile
adds complexity and I am not convinced it is worth.
Cheers,
simon
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: bug#45919: [PATCH 0/8] Exporting a manifest and channels from a profile
2021-01-30 14:31 ` zimoun
@ 2021-01-30 21:23 ` Ludovic Courtès
2021-01-31 5:08 ` Ryan Prior
0 siblings, 1 reply; 37+ messages in thread
From: Ludovic Courtès @ 2021-01-30 21:23 UTC (permalink / raw)
To: zimoun; +Cc: guix-devel, 45919
Hi,
zimoun <zimon.toutoune@gmail.com> skribis:
> Yes, but it needs a lot of re-work and change, IMHO. And we ends with 3
> files: $GUIX_PROFILE/manifest capturing the states of $GUIX_PROFILE and
> the 2 others deducing an approximation of these states. Well, IMHO,
> automatically produce this approximation at each «action» on the profile
> adds complexity and I am not convinced it is worth.
Yeah.
Actually, part of the code would be shared anyway, so we could always go
with ‘--export-manifest’ first and think about adding the extra files
later. (Though I’m still unsure about these extra files, TBH.)
Ludo’.
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: bug#45919: [PATCH 0/8] Exporting a manifest and channels from a profile
2021-01-30 21:23 ` bug#45919: " Ludovic Courtès
@ 2021-01-31 5:08 ` Ryan Prior
2021-02-01 13:30 ` Ludovic Courtès
0 siblings, 1 reply; 37+ messages in thread
From: Ryan Prior @ 2021-01-31 5:08 UTC (permalink / raw)
To: zimoun, Ludovic Courtès
Cc: Development of GNU Guix and the GNU System distribution, 45919
[-- Attachment #1: Type: text/plain, Size: 1479 bytes --]
On January 30, 2021, "Ludovic Courtès" <ludo@gnu.org> wrote:
> Actually, part of the code would be shared anyway, so we could always
> go
> with ‘--export-manifest’ first and think about adding the extra files
> later. (Though I’m still unsure about these extra files, TBH.)
I do like the extra files. It feels cozy to me, like you have your
little profile directory and it has a manifest and a list of channels in
it, that makes it feel more complete. Like having the family pictures on
the wall.
The question of what happens if you don't update a profile for a long
time and how Guix handles those files moves on is a good one. I think
those files should have an indication in there of what version of Guix
was used to produce them, such that you can time-machine back to ensure
you're compatible.
I don't think there's much drawback to having both the auto-generated
files and a command that generates them. That seems more discoverable -
you might happen across the files when you poke into a profile, or you
might notice the command while reading the docs or the help output.
Glad to see this capability land any which way, this is something that
comes up often!
While we're considering putting a manifest in the profile, is this a
good time to also bring up the idea of renaming the "manifest" file? It
confuses more people all the time. I'd be inclined to rename it
"profile-metadata" or "lockfile".
[-- Attachment #2: Type: text/html, Size: 3805 bytes --]
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: bug#45919: [PATCH 0/8] Exporting a manifest and channels from a profile
2021-01-30 13:55 ` Ludovic Courtès
@ 2021-01-31 17:26 ` Pierre Neidhardt
2021-02-01 13:25 ` Ludovic Courtès
0 siblings, 1 reply; 37+ messages in thread
From: Pierre Neidhardt @ 2021-01-31 17:26 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel, 45919
[-- Attachment #1: Type: text/plain, Size: 2071 bytes --]
Hi!
Ludovic Courtès <ludo@gnu.org> writes:
> Here are practical issues that come to mind:
>
> • It would only work for newer profiles, created after the feature has
> been implemented (maybe that’s okay).
Indeed, I think it's OK! :)
> • The generated files might use APIs that, in the meantime, got
> deprecated or changed somehow. This is in contrast with
> ‘--export-profile’, which interprets ‘manifest’ (a versioned file
> format) and produces code that can use the API du jour.
/run/current-system/configuration.scm suffers from the same problem.
But with the manifest we could do better, we could include a version
number one way or another.
Besides, since it comes together with channels.scm, we know which Guix
was used, so we always have access to the Guix with the right API to
install the manifest.
All in all, I think this is not a problem.
> • One would still have to learn about these two files, and pick the
> right “manifest” file.
I think it would be easier than a command. See below.
> • For users of ‘-m my-manifest.scm’, we would need to store
> ‘my-manifest.scm’ as is instead of generating an approximation
> thereof.
Which seems easy to do, isn't it?
Another use-case which I find useful and comes close to this feature is
that of channel/manifest versioning, in the sense of keeping these files
under version control for instance in a Git repository. This can be
useful to keep the history of everything, even deleted generations, or
even in case of hardware failure.
To that end, it'd be nice if we could export these files automatically
to a designated location.
Example: I update ~/my-profile and it automatically produces / overwrite
~/repos/guix-profile-metadata.git/my-profile/channels.scm and
~/repos/guix-profile-metadata.git/my-profile/manifest.scm.
This way I can commit these 2 files in my guix-profile-metadata.git
repository.
Food for thoughts :)
--
Pierre Neidhardt
https://ambrevar.xyz/
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 511 bytes --]
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: bug#45919: [PATCH 0/8] Exporting a manifest and channels from a profile
2021-01-31 17:26 ` Pierre Neidhardt
@ 2021-02-01 13:25 ` Ludovic Courtès
2021-02-01 15:32 ` Pierre Neidhardt
0 siblings, 1 reply; 37+ messages in thread
From: Ludovic Courtès @ 2021-02-01 13:25 UTC (permalink / raw)
To: Pierre Neidhardt; +Cc: guix-devel, 45919
Hi,
Pierre Neidhardt <mail@ambrevar.xyz> skribis:
> Ludovic Courtès <ludo@gnu.org> writes:
[...]
>> • The generated files might use APIs that, in the meantime, got
>> deprecated or changed somehow. This is in contrast with
>> ‘--export-profile’, which interprets ‘manifest’ (a versioned file
>> format) and produces code that can use the API du jour.
>
> /run/current-system/configuration.scm suffers from the same problem.
Not really because it’s precisely the file that you gave to build the
system. So you know you can run:
cd /run/current-system
guix time-machine -C channels.scm -- system reconfigure configuration.scm
and it’ll work (modulo the documented caveats).
> But with the manifest we could do better, we could include a version
> number one way or another.
> Besides, since it comes together with channels.scm, we know which Guix
> was used, so we always have access to the Guix with the right API to
> install the manifest.
Right.
>> • One would still have to learn about these two files, and pick the
>> right “manifest” file.
>
> I think it would be easier than a command. See below.
>
>> • For users of ‘-m my-manifest.scm’, we would need to store
>> ‘my-manifest.scm’ as is instead of generating an approximation
>> thereof.
>
> Which seems easy to do, isn't it?
I take it that you’re volunteering? :-)
Nothing’s difficult, but in this case we’d need to pass the original
manifest down to ‘profile-generation’. Requires some redesign.
> Another use-case which I find useful and comes close to this feature is
> that of channel/manifest versioning, in the sense of keeping these files
> under version control for instance in a Git repository. This can be
> useful to keep the history of everything, even deleted generations, or
> even in case of hardware failure.
>
> To that end, it'd be nice if we could export these files automatically
> to a designated location.
>
> Example: I update ~/my-profile and it automatically produces / overwrite
> ~/repos/guix-profile-metadata.git/my-profile/channels.scm and
> ~/repos/guix-profile-metadata.git/my-profile/manifest.scm.
>
> This way I can commit these 2 files in my guix-profile-metadata.git
> repository.
I guess you could do that either with ‘cp
~/.guix-profile/{channels,manifest.scm …’ or with ‘guix package
--export-manifest … > …’.
But again, that’s not really the goal here. The goal is to help users
willing to migrate from the “imperative” mode to the declarative mode.
Once you’re using a manifest, probably you’ll want to put that under
version control, but that’s already the case.
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: bug#45919: [PATCH 0/8] Exporting a manifest and channels from a profile
2021-01-31 5:08 ` Ryan Prior
@ 2021-02-01 13:30 ` Ludovic Courtès
0 siblings, 0 replies; 37+ messages in thread
From: Ludovic Courtès @ 2021-02-01 13:30 UTC (permalink / raw)
To: Ryan Prior; +Cc: Development of GNU Guix and the GNU System distribution, 45919
Hi,
Ryan Prior <ryanprior@hey.com> skribis:
> I don't think there's much drawback to having both the auto-generated
> files and a command that generates them. That seems more discoverable -
> you might happen across the files when you poke into a profile, or you
> might notice the command while reading the docs or the help output.
Note that the ‘manifest’ file starts with a comment. This patch set
updates this comment so it mentions ‘--export-channels’.
> Glad to see this capability land any which way, this is something that
> comes up often!
Heh, good. :-)
> While we're considering putting a manifest in the profile, is this a
> good time to also bring up the idea of renaming the "manifest" file? It
> confuses more people all the time. I'd be inclined to rename it
> "profile-metadata" or "lockfile".
It’s the kind of thing that can’t really be changed, or at least not
without a looong transition period, because older ‘guix package’
commands wouldn’t recognize profiles that lack a ‘manifest’ file.
Thanks for your feedback,
Ludo’.
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: bug#45919: [PATCH 0/8] Exporting a manifest and channels from a profile
2021-02-01 13:25 ` Ludovic Courtès
@ 2021-02-01 15:32 ` Pierre Neidhardt
2021-02-01 17:04 ` Ludovic Courtès
0 siblings, 1 reply; 37+ messages in thread
From: Pierre Neidhardt @ 2021-02-01 15:32 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel, 45919
[-- Attachment #1: Type: text/plain, Size: 1760 bytes --]
Ludovic Courtès <ludo@gnu.org> writes:
> Hi,
>
> Pierre Neidhardt <mail@ambrevar.xyz> skribis:
>
>> Ludovic Courtès <ludo@gnu.org> writes:
>
> [...]
>
>>> • The generated files might use APIs that, in the meantime, got
>>> deprecated or changed somehow. This is in contrast with
>>> ‘--export-profile’, which interprets ‘manifest’ (a versioned file
>>> format) and produces code that can use the API du jour.
>>
>> /run/current-system/configuration.scm suffers from the same problem.
>
> Not really because it’s precisely the file that you gave to build the
> system. So you know you can run:
>
> cd /run/current-system
> guix time-machine -C channels.scm -- system reconfigure configuration.scm
>
> and it’ll work (modulo the documented caveats).
Ha, actually no, it won't always work! :)
Configuration.scm is only the file passed to `guix system reconfigure`,
but is this file inherits from other user Guile modules, then the
configuration.scm won't be sufficient to regenerate the system.
You could argue that it's a user problem, but still, there is an
"impurity" here! :p
> But again, that’s not really the goal here. The goal is to help users
> willing to migrate from the “imperative” mode to the declarative mode.
Sure, but my thinking is that we could hit two birds we one stone here.
If we only think one half of the problem, we might end up with too many
commands or an interface that's not flexible enough.
> Once you’re using a manifest, probably you’ll want to put that under
> version control, but that’s already the case.
The channels.scm files are missing though.
My two cents! :)
Cheers!
--
Pierre Neidhardt
https://ambrevar.xyz/
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 511 bytes --]
^ permalink raw reply [flat|nested] 37+ messages in thread
* bug#45919: [PATCH 0/8] Exporting a manifest and channels from a profile
2021-02-01 15:32 ` Pierre Neidhardt
@ 2021-02-01 17:04 ` Ludovic Courtès
0 siblings, 0 replies; 37+ messages in thread
From: Ludovic Courtès @ 2021-02-01 17:04 UTC (permalink / raw)
To: Pierre Neidhardt, zimoun; +Cc: guix-devel, 45919-done
Hi!
So I went ahead and pushed this patch series as
15078567c17851ef0f2b017119f305e0d5e8a140.
We can always improve from here, and hopefully getting actual user
feedback will help us see the pros and cons of this option.
Thanks!
Ludo’.
^ permalink raw reply [flat|nested] 37+ messages in thread
* Unreproducible “guix pack -f docker” because config.scm-builder
2021-01-28 15:54 ` Ludovic Courtès
@ 2021-02-01 22:37 ` zimoun
2021-02-02 14:48 ` zimoun
2021-02-02 18:12 ` Ludovic Courtès
0 siblings, 2 replies; 37+ messages in thread
From: zimoun @ 2021-02-01 22:37 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
Hi Ludo,
On Thu, 28 Jan 2021 at 16:54, Ludovic Courtès <ludo@gnu.org> wrote:
>> $ guix time-machine -C /tmp/img/channels.scm -- pack -f docker --save-provenance -m /tmp/img/manifest.scm
>> Updating channel 'guix' from Git repository at 'https://git.savannah.gnu.org/git/guix.git'...
>> /gnu/store/xzk604g8gysv4azn7sf9nylr6iah97gl-docker-pack.tar.gz
>>
>> To compare with
>> /gnu/store/wxymmnxdvdvf08ifsfy39xjaxilhrigk-docker-pack.tar.gz.
>>
>> On a third machine, I get:
>> /gnu/store/wxymmnxdvdvf08ifsfy39xjaxilhrigk-docker-pack.tar.gz
>>
>> Well, that’s another story and I have not inspected yet the
>> derivations and what could be wrong on the machine B.
>
> You’d have to check the differences. It may be that provenance data
> differs, for example because the second attempt includes data about
> channels that are actually unused. (That’s the whole problem of
> provenance data: it’s not a one-to-one mapping and it’s not a bijection
> either.)
After inspecting the derivations, the issue is from the file
’config.scm-builder’ which differs by:
(define-public %sysconfdir "/usr/local/etc")
vs
(define-public %sysconfdir "/etc")
What did I do wrong? From where does this difference come? How can I
fix it?
Below, the different commands to spot out the issue.
Cheers,
simon
Machine A
--8<---------------cut here---------------start------------->8---
$ guix describe
Generation 101 Jan 29 2021 16:22:06 (current)
guix b9a54aa
repository URL: https://git.savannah.gnu.org/git/guix.git
branch: master
commit: b9a54aad0ba282ac78931b67e679bd0132419364
$ guix describe -f channels > /tmp/channels.scm
$ guix pack -f docker hello
/gnu/store/9vhl75vx60l56992hgy5818ndic608p5-docker-pack.tar.gz
$ guix time-machine -C /tmp/channels.scm -- pack -f docker hello
/gnu/store/9vhl75vx60l56992hgy5818ndic608p5-docker-pack.tar.gz
$ guix gc --derivers /gnu/store/9vhl75vx60l56992hgy5818ndic608p5-docker-pack.tar.gz
/gnu/store/ih94c9ny68dfalrym9m1vz4wa40rpgvs-docker-pack.tar.gz.drv
--8<---------------cut here---------------end--------------->8---
07fwgiz56f7dk760qpplnfaxribglqc7-config.scm-builder:
(define-public %sysconfdir "/usr/local/etc")
Machine B (and C)
--8<---------------cut here---------------start------------->8---
$ guix describe
Génération 7 28 janv. 2021 01:51:17 (actuelle)
guix 0f20b3f
URL du dépôt : https://git.savannah.gnu.org/git/guix.git
branche: master
commit : 0f20b3fa2050ba6e442e340a204516b9375cd231
$ cat /tmp/channels.scm
(list (channel
(name 'guix)
(url "https://git.savannah.gnu.org/git/guix.git")
(commit
"b9a54aad0ba282ac78931b67e679bd0132419364")
(introduction
(make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad"
(openpgp-fingerprint
"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA")))))
$ guix time-machine -C /tmp/channels.scm -- pack -f docker hello
Mise à jour du canal « guix » depuis le dépôt Git «https://git.savannah.gnu.org/git/guix.git »...
/gnu/store/nkvlqwzvxdlhzlc7vhfcngxc19x2ay2f-docker-pack.tar.gz
$ guix pull --commit=b9a54aad0ba282ac78931b67e679bd0132419364
$ guix describe
Génération 8 01 févr. 2021 17:00:18 (actuelle)
guix b9a54aa
URL du dépôt : https://git.savannah.gnu.org/git/guix.git
commit : b9a54aad0ba282ac78931b67e679bd0132419364
$ guix pack -f docker hello
/gnu/store/nkvlqwzvxdlhzlc7vhfcngxc19x2ay2f-docker-pack.tar.gz
$ guix gc --derivers /gnu/store/nkvlqwzvxdlhzlc7vhfcngxc19x2ay2f-docker-pack.tar.gz
/gnu/store/323k33sfx869d0nkh69ary8sj6xiy4s4-docker-pack.tar.gz.drv
--8<---------------cut here---------------end--------------->8---
00cy802583sb82kcpzfd1sz1xwff9hln-config.scm-builder:
(define-public %sysconfdir "/etc")
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: Unreproducible “guix pack -f docker” because config.scm-builder
2021-02-01 22:37 ` Unreproducible “guix pack -f docker” because config.scm-builder zimoun
@ 2021-02-02 14:48 ` zimoun
2021-02-02 18:12 ` Ludovic Courtès
1 sibling, 0 replies; 37+ messages in thread
From: zimoun @ 2021-02-02 14:48 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
Hi,
In case someone reads and is interested by the fix.
On Mon, 1 Feb 2021 at 23:42, zimoun <zimon.toutoune@gmail.com> wrote:
> After inspecting the derivations, the issue is from the file
> ’config.scm-builder’ which differs by:
>
> (define-public %sysconfdir "/usr/local/etc")
>
> vs
>
> (define-public %sysconfdir "/etc")
Ludo explained the issue on IRC [1]. Well, I should have done
"./pre-inst-env guix pull" with a misconfiguration from source.
Therefore, to fix I did:
./configure --localstatedir=/var/ --sysconfigdir=/etc
make
./pre-env-inst guix pull
and everything works fine. :-)
The tarballs are not the same:
A$ md5sum /gnu/store/nkvlqwzvxdlhzlc7vhfcngxc19x2ay2f-docker-pack.tar.gz
b5fe393d7966cbc3cd0be6e51d3aedc3
/gnu/store/nkvlqwzvxdlhzlc7vhfcngxc19x2ay2f-docker-pack.tar.gz
B$ md5sum /gnu/store/nkvlqwzvxdlhzlc7vhfcngxc19x2ay2f-docker-pack.tar.gz
e47b9a38b7162f7fb093b97e19dbc1ca
/gnu/store/nkvlqwzvxdlhzlc7vhfcngxc19x2ay2f-docker-pack.tar.gz
but it is another story, I guess. Investigating...
--8<---------------cut here---------------start------------->8---
$ diff -r --no-dereference /tmp/docker-{pfiuh02,meary}
Les fichiers binaires
/tmp/docker-pfiuh02/4ca83868d5e98cb06179a2a7372afe029c10d43bdc9fbfcc5771b89da74889b8/layer.tar
et /tmp/docker-meary/4ca83868d5e98cb06179a2a7372afe029c10d43bdc9fbfcc5771b89da74889b8/layer.tar
sont différents
diff -r --no-dereference /tmp/docker-pfiuh02/config.json
/tmp/docker-meary/config.json
1c1
< {"architecture":"amd64","comment":"Generated by GNU
Guix","created":"1970-01-01T00:00:01Z","config":{"env":["PATH=/gnu/store/251bsvdbnggpjl4iv259sjdn6x4d1ly1-profile/bin"]},"container_config":null,"os":"linux","rootfs":{"type":"layers","diff_ids":["sha256:ac307c1c2da51ff6bbcd2d227843f2526028ef215068b36f16c7d0ecc62af397"]}}
\ Pas de fin de ligne à la fin du fichier
---
> {"architecture":"amd64","comment":"Generated by GNU Guix","created":"1970-01-01T00:00:01Z","config":{"env":["PATH=/gnu/store/251bsvdbnggpjl4iv259sjdn6x4d1ly1-profile/bin"]},"container_config":null,"os":"linux","rootfs":{"type":"layers","diff_ids":["sha256:95f38c548ea3ac95ec62b5ac59ef5099d03cf1dd4d2c9f8851ac21e8a7f0ee92"]}}
\ Pas de fin de ligne à la fin du fichier
--8<---------------cut here---------------end--------------->8---
All the best,
simon
1: <http://logs.guix.gnu.org/guix/2021-02-02.log#122945>
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: Unreproducible “guix pack -f docker” because config.scm-builder
2021-02-01 22:37 ` Unreproducible “guix pack -f docker” because config.scm-builder zimoun
2021-02-02 14:48 ` zimoun
@ 2021-02-02 18:12 ` Ludovic Courtès
2021-02-02 20:11 ` zimoun
1 sibling, 1 reply; 37+ messages in thread
From: Ludovic Courtès @ 2021-02-02 18:12 UTC (permalink / raw)
To: zimoun; +Cc: guix-devel
Hi,
zimoun <zimon.toutoune@gmail.com> skribis:
> After inspecting the derivations, the issue is from the file
> ’config.scm-builder’ which differs by:
>
> (define-public %sysconfdir "/usr/local/etc")
>
> vs
>
> (define-public %sysconfdir "/etc")
>
>
> What did I do wrong? From where does this difference come? How can I
> fix it?
As discussed on IRC, ‘guix pull’ preserves the settings of the host
Guix. So if your initial ‘guix’ has %sysconfdir set to /usr/local/etc,
‘guix pull’ will preserve that.
It turns out that, as is always the case with GNU Standards compliant
configure script, the default value for --prefix is /usr/local, and the
default for --sysconfdir is $prefix/etc.
Mostly likely, what happened is that at some point you built Guix from
source using the default prefix and sysconfdir, and then you ran ‘guix
pull’ from that Guix.
You did find other differences eventually though, right?
HTH,
Ludo’.
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: Unreproducible “guix pack -f docker” because config.scm-builder
2021-02-02 18:12 ` Ludovic Courtès
@ 2021-02-02 20:11 ` zimoun
2021-02-05 10:09 ` Ludovic Courtès
0 siblings, 1 reply; 37+ messages in thread
From: zimoun @ 2021-02-02 20:11 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
Hi,
On Tue, 02 Feb 2021 at 19:12, Ludovic Courtès <ludo@gnu.org> wrote:
> It turns out that, as is always the case with GNU Standards compliant
> configure script, the default value for --prefix is /usr/local, and the
> default for --sysconfdir is $prefix/etc.
As discussed on IRC, it is not mentioned in the manual. What the manual
describes is:
./bootstrap
./configure --localstatedir=/var/
make
therefore, if one runs:
./pre-inst-env guix pull
then the sysconfdir is set to /usr/local/etc because it is the default.
And so it leads to subtle differences really hard to guess. I think it
is worth to add one sentence or footnote at the end of the section
«Running Guix Before It Is Installed», right after:
Note that ./pre-inst-env guix pull does not upgrade the local
source tree; it simply updates the ~/.config/guix/current
symlink (see Invoking guix pull). Run git pull instead if you
want to upgrade your local source tree.
Something like: «Note that ’guix pull’ preserves the settings of the host
Guix, for instance ’sysconfdir’, and by default the GNU standards set
’prefix’ to ’/usr/local/’ and ’sysconfdir’ to ’$prefix/etc’, whereas
regular Guix uses ’--sysconfdir=/etc/’.»
WDYT?
> You did find other differences eventually though, right?
The produced tarballs have the same Guix hash, i.e., all the same
inputs, but not the same outputs, compare with commit b9a54aa:
A-machine$ md5sum /gnu/store/nkvlqwzvxdlhzlc7vhfcngxc19x2ay2f-docker-pack.tar.gz
b5fe393d7966cbc3cd0be6e51d3aedc3 /gnu/store/nkvlqwzvxdlhzlc7vhfcngxc19x2ay2f-docker-pack.tar.gz
B-machine$ md5sum /gnu/store/nkvlqwzvxdlhzlc7vhfcngxc19x2ay2f-docker-pack.tar.gz
e47b9a38b7162f7fb093b97e19dbc1ca /gnu/store/nkvlqwzvxdlhzlc7vhfcngxc19x2ay2f-docker-pack.tar.gz
C-machine$ md5sum /gnu/store/nkvlqwzvxdlhzlc7vhfcngxc19x2ay2f-docker-pack.tar.gz
b5fe393d7966cbc3cd0be6e51d3aedc3 /gnu/store/nkvlqwzvxdlhzlc7vhfcngxc19x2ay2f-docker-pack.tar.gz
And diffoscope returns these differences, something about links, IIUC:
--8<---------------cut here---------------start------------->8---
--- /tmp/docker-meary/4ca83868d5e98cb06179a2a7372afe029c10d43bdc9fbfcc5771b89da74889b8/layer.tar
+++ /tmp/docker-pfiuh02/4ca83868d5e98cb06179a2a7372afe029c10d43bdc9fbfcc5771b89da74889b8/layer.tar
├── file list
│ @@ -823,17 +823,17 @@
[...]
│ --r-x… 29960 gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/libexec/getconf/POSIX_V6_LP64_OFF64
[...]
│ +hr-x… 0 gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/libexec/getconf/POSIX_V6_LP64_OFF64
[...]
├── gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/libexec/getconf/POSIX_V6_LP64_OFF64
│ @@ -1,1873 +0,0 @@
│ -00000000: 7f45 4c46 0201 0100 0000 0000 0000 0000 .ELF............
│ -00000010: 0200 3e00 0100 0000 3015 4000 0000 0000 ..>.....0.@.....
│ -00000020: 4000 0000 0000 0000 486d 0000 0000 0000 @.......Hm......
│ -00000030: 0000 0000 4000 3800 0b00 4000 1f00 1e00 ....@.8...@.....
│ -00000040: 0600 0000 0400 0000 4000 0000 0000 0000 ........@.......
│ -00000050: 4000 4000 0000 0000 4000 4000 0000 0000 @.@.....@.@.....
│ -00000060: 6802 0000 0000 0000 6802 0000 0000 0000 h.......h.......
[...]
--8<---------------cut here---------------end--------------->8---
(Slightly edited to ease the reading, and raw at
<https://paste.debian.net/1183728/>.)
On machines A and C, empty file because hard link. But on machine B,
the files are there. Tiny files I guess, the size difference is:
23104 vs 23136.
Cheers,
simon
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: Unreproducible “guix pack -f docker” because config.scm-builder
2021-02-02 20:11 ` zimoun
@ 2021-02-05 10:09 ` Ludovic Courtès
2021-02-05 17:22 ` zimoun
0 siblings, 1 reply; 37+ messages in thread
From: Ludovic Courtès @ 2021-02-05 10:09 UTC (permalink / raw)
To: zimoun; +Cc: guix-devel
Hi,
zimoun <zimon.toutoune@gmail.com> skribis:
> then the sysconfdir is set to /usr/local/etc because it is the default.
> And so it leads to subtle differences really hard to guess. I think it
> is worth to add one sentence or footnote at the end of the section
> «Running Guix Before It Is Installed», right after:
>
> Note that ./pre-inst-env guix pull does not upgrade the local
> source tree; it simply updates the ~/.config/guix/current
> symlink (see Invoking guix pull). Run git pull instead if you
> want to upgrade your local source tree.
>
> Something like: «Note that ’guix pull’ preserves the settings of the host
> Guix, for instance ’sysconfdir’, and by default the GNU standards set
> ’prefix’ to ’/usr/local/’ and ’sysconfdir’ to ’$prefix/etc’, whereas
> regular Guix uses ’--sysconfdir=/etc/’.»
>
> WDYT?
As often, I have mixed feelings: we would end up +/- duplicating the
Standards in the manual, possibly even without citing the primary source
(I could be a Wikipedian :-)). So to me that’s not great.
OTOH, as you write, letting people stumble upon this kind of issue is
not an option, either.
So I guess you can propose a patch and let someone else review it. :-)
>> You did find other differences eventually though, right?
>
> The produced tarballs have the same Guix hash, i.e., all the same
> inputs, but not the same outputs, compare with commit b9a54aa:
[...]
> --- /tmp/docker-meary/4ca83868d5e98cb06179a2a7372afe029c10d43bdc9fbfcc5771b89da74889b8/layer.tar
> +++ /tmp/docker-pfiuh02/4ca83868d5e98cb06179a2a7372afe029c10d43bdc9fbfcc5771b89da74889b8/layer.tar
> ├── file list
> │ @@ -823,17 +823,17 @@
>
> [...]
>
> │ --r-x… 29960 gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/libexec/getconf/POSIX_V6_LP64_OFF64
>
> [...]
>
> │ +hr-x… 0 gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/libexec/getconf/POSIX_V6_LP64_OFF64
Looks like tar made this file a hard link in one case and not in the
other. This is weird because we don’t ask it to create hard links
(there’s even a comment in (guix scripts pack)).
Is this docker image the result of the same derivation? Could you try
building that derivation on different machines? (You can copy the .drv
around with ‘guix copy’.)
Could you also show the output of:
stat /gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/libexec/getconf/POSIX_V6_LP64_OFF64
on the two machines you used?
I wonder if it could be that tar nowadays decides to preserve hard links
by default and one of your machine had this file hard-linked while the
other one didn’t.
Ludo’.
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: Unreproducible “guix pack -f docker” because config.scm-builder
2021-02-05 10:09 ` Ludovic Courtès
@ 2021-02-05 17:22 ` zimoun
2021-02-06 21:46 ` Ludovic Courtès
0 siblings, 1 reply; 37+ messages in thread
From: zimoun @ 2021-02-05 17:22 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
Hi Ludo,
On Fri, 05 Feb 2021 at 11:09, Ludovic Courtès <ludo@gnu.org> wrote:
> So I guess you can propose a patch and let someone else review it.
> :-)
I will. :-)
> Looks like tar made this file a hard link in one case and not in the
> other. This is weird because we don’t ask it to create hard links
> (there’s even a comment in (guix scripts pack)).
I have 2 machines running Debian and one running Ubuntu. The 2 Debian
produces the same things. Ubuntu not.
> Is this docker image the result of the same derivation? Could you try
> building that derivation on different machines? (You can copy the .drv
> around with ‘guix copy’.)
It was built with different derivations. I mean the scenario where
Alice wants to rebuild what Bob did.
Now, let use the same derivation. Some details in case I am doing
something wrong:
--8<---------------cut here---------------start------------->8---
$ echo Ubuntu
$ guix gc -D $(guix pack -f docker hello)
finding garbage collector roots...
[0 MiB] deleting
'/gnu/store/nkvlqwzvxdlhzlc7vhfcngxc19x2ay2f-docker-pack.tar.gz'
deleting `/gnu/store/trash'
deleting unused links...
C-c C-c
$ guix gc -D $(guix pack -f docker hello -d)
finding garbage collector roots...
[0 MiB] deleting
'/gnu/store/323k33sfx869d0nkh69ary8sj6xiy4s4-docker-pack.tar.gz.drv'
deleting `/gnu/store/trash'
deleting unused links...
C-c C-c
--8<---------------cut here---------------end--------------->8---
--8<---------------cut here---------------start------------->8---
$ echo Debian
$ guix copy $(guix pack -f docker hello -d) --to=meary
guix copy: sending 1 store item (0 MiB) to '193.48.40.110'...
/gnu/store/323k33sfx869d0nkh69ary8sj6xiy4s4-docker-pack.tar.gz.drv
--8<---------------cut here---------------end--------------->8---
--8<---------------cut here---------------start------------->8---
$ echo Ubuntu
$ guix build /gnu/store/323k33sfx869d0nkh69ary8sj6xiy4s4-docker-pack.tar.gz.drv
substitute: mise à jour des substituts depuis « https://ci.guix.gnu.org»... 100.0 %
La dérivation suivante sera compilée :
/gnu/store/323k33sfx869d0nkh69ary8sj6xiy4s4-docker-pack.tar.gz.drv
construction de
/gnu/store/323k33sfx869d0nkh69ary8sj6xiy4s4-docker-pack.tar.gz.drv...
tar: Removing leading `/' from member names
tar: Removing leading `/' from hard link targets
construction de
/gnu/store/323k33sfx869d0nkh69ary8sj6xiy4s4-docker-pack.tar.gz.drv réussie
/gnu/store/nkvlqwzvxdlhzlc7vhfcngxc19x2ay2f-docker-pack.tar.gz
--8<---------------cut here---------------end--------------->8---
So tar is appearing here… Hum?! However, if I redo the same steps, it
does not. Well, I do not like that…
Building on Ubuntu using the derivation from Debian gives the same image
as building on Ubuntu using the derivation from Ubuntu.
I thought the tools were captured by the commit: same commit, same
tools. Well, I miss something…
> Could you also show the output of:
>
> stat /gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/libexec/getconf/POSIX_V6_LP64_OFF64
>
> on the two machines you used?
First on Debian and second on Ubuntu
--8<---------------cut here---------------start------------->8---
$ stat /gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/libexec/getconf/POSIX_V6_LP64_OFF64
File: /gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/libexec/getconf/POSIX_V6_LP64_OFF64
Size: 29960 Blocks: 64 IO Block: 4096 regular file
Device: 801h/2049d Inode: 8129616 Links: 5
Access: (0555/-r-xr-xr-x) Uid: ( 0/ root) Gid: ( 0/ root)
Access: 2021-02-05 17:37:15.728728952 +0100
Modify: 1970-01-01 01:00:01.000000000 +0100
Change: 2020-06-17 12:40:06.389935679 +0200
Birth: -
--8<---------------cut here---------------end--------------->8---
--8<---------------cut here---------------start------------->8---
$ stat /gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/libexec/getconf/POSIX_V6_LP64_OFF64
Fichier : /gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/libexec/getconf/POSIX_V6_LP64_OFF64
Taille : 29960 Blocs : 64 Blocs d'E/S : 4096 fichier
Périphérique : 814h/2068d Inœud : 148900093 Liens : 1
Accès : (0555/-r-xr-xr-x) UID : ( 0/ root) GID : ( 0/ root)
Accès : 2021-02-05 17:46:05.537903382 +0100
Modif. : 1970-01-01 01:00:01.000000000 +0100
Changt : 2020-12-04 23:16:33.155711694 +0100
Créé : -
--8<---------------cut here---------------end--------------->8---
> I wonder if it could be that tar nowadays decides to preserve hard links
> by default and one of your machine had this file hard-linked while the
> other one didn’t.
Wow, I thought that the same tar was used the one provided by Guix and
not by the host. For sure the default tar are not the same on both
machine (v1.30 for Debian and v1.29 for Ubuntu).
What is the md5sum checksum of ’guix pack -f docker hello’ on Guix
System for commit b9a54aa?
Thanks for the help,
simon
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: Unreproducible “guix pack -f docker” because config.scm-builder
2021-02-05 17:22 ` zimoun
@ 2021-02-06 21:46 ` Ludovic Courtès
2021-02-08 18:44 ` [PATCH] Fix unreproducible “guix pack -f docker” (hard link) zimoun
[not found] ` <86lfbzad42.fsf@gmail.com>
0 siblings, 2 replies; 37+ messages in thread
From: Ludovic Courtès @ 2021-02-06 21:46 UTC (permalink / raw)
To: zimoun; +Cc: guix-devel
Hi,
zimoun <zimon.toutoune@gmail.com> skribis:
> First on Debian and second on Ubuntu
>
> $ stat /gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/libexec/getconf/POSIX_V6_LP64_OFF64
> File: /gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/libexec/getconf/POSIX_V6_LP64_OFF64
> Size: 29960 Blocks: 64 IO Block: 4096 regular file
> Device: 801h/2049d Inode: 8129616 Links: 5
> Access: (0555/-r-xr-xr-x) Uid: ( 0/ root) Gid: ( 0/ root)
> Access: 2021-02-05 17:37:15.728728952 +0100
> Modify: 1970-01-01 01:00:01.000000000 +0100
> Change: 2020-06-17 12:40:06.389935679 +0200
> Birth: -
>
> $ stat /gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/libexec/getconf/POSIX_V6_LP64_OFF64
> Fichier : /gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/libexec/getconf/POSIX_V6_LP64_OFF64
> Taille : 29960 Blocs : 64 Blocs d'E/S : 4096 fichier
> Périphérique : 814h/2068d Inœud : 148900093 Liens : 1
> Accès : (0555/-r-xr-xr-x) UID : ( 0/ root) GID : ( 0/ root)
> Accès : 2021-02-05 17:46:05.537903382 +0100
> Modif. : 1970-01-01 01:00:01.000000000 +0100
> Changt : 2020-12-04 23:16:33.155711694 +0100
> Créé : -
See? One has just 1 link (did you disable deduplication on that one?),
there other has 5 links.
>> I wonder if it could be that tar nowadays decides to preserve hard links
>> by default and one of your machine had this file hard-linked while the
>> other one didn’t.
>
> Wow, I thought that the same tar was used the one provided by Guix and
> not by the host. For sure the default tar are not the same on both
> machine (v1.30 for Debian and v1.29 for Ubuntu).
>
> What is the md5sum checksum of ’guix pack -f docker hello’ on Guix
> System for commit b9a54aa?
--8<---------------cut here---------------start------------->8---
$ md5sum $(guix time-machine --commit=b9a54aa -- pack -f docker hello)
b5fe393d7966cbc3cd0be6e51d3aedc3 /gnu/store/nkvlqwzvxdlhzlc7vhfcngxc19x2ay2f-docker-pack.tar.gz
$ sha1sum $(guix time-machine --commit=b9a54aa -- pack -f docker hello)
a4dff93de6c0bc65eb325ebfeea398ebea944a85 /gnu/store/nkvlqwzvxdlhzlc7vhfcngxc19x2ay2f-docker-pack.tar.gz
$ guix time-machine --commit=b9a54aa -- pack -f docker hello -d
/gnu/store/323k33sfx869d0nkh69ary8sj6xiy4s4-docker-pack.tar.gz.drv
$ (mkdir /tmp/docker; tar xf $(guix time-machine --commit=b9a54aa -- pack -f docker hello ); tar tvf */layer.tar | grep ^h | head)
hr-xr-xr-x root/root 0 1970-01-01 01:00 gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/libexec/getconf/POSIX_V6_LP64_OFF64 kunligo al gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/bin/getconf
hr-xr-xr-x root/root 0 1970-01-01 01:00 gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/libexec/getconf/POSIX_V7_LP64_OFF64 kunligo al gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/bin/getconf
hr-xr-xr-x root/root 0 1970-01-01 01:00 gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/libexec/getconf/XBS5_LP64_OFF64 kunligo al gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/bin/getconf
hr--r--r-- root/root 0 1970-01-01 01:00 gnu/store/01b4w3m6mp55y531kyi1g8shh722kwqm-gcc-7.5.0-lib/lib/gcc/x86_64-unknown-linux-gnu/7.5.0/crtendS.o kunligo al gnu/store/01b4w3m6mp55y531kyi1g8shh722kwqm-gcc-7.5.0-lib/lib/gcc/x86_64-unknown-linux-gnu/7.5.0/crtend.o
hr--r--r-- root/root 0 1970-01-01 01:00 gnu/store/01b4w3m6mp55y531kyi1g8shh722kwqm-gcc-7.5.0-lib/lib/gcc/x86_64-unknown-linux-gnu/7.5.0/install-tools/gsyslimits.h kunligo al gnu/store/01b4w3m6mp55y531kyi1g8shh722kwqm-gcc-7.5.0-lib/lib/gcc/x86_64-unknown-linux-gnu/7.5.0/include-fixed/syslimits.h
hr--r--r-- root/root 0 1970-01-01 01:00 gnu/store/01b4w3m6mp55y531kyi1g8shh722kwqm-gcc-7.5.0-lib/lib/gcc/x86_64-unknown-linux-gnu/7.5.0/install-tools/include/README kunligo al gnu/store/01b4w3m6mp55y531kyi1g8shh722kwqm-gcc-7.5.0-lib/lib/gcc/x86_64-unknown-linux-gnu/7.5.0/include-fixed/README
hr--r--r-- root/root 0 1970-01-01 01:00 gnu/store/01b4w3m6mp55y531kyi1g8shh722kwqm-gcc-7.5.0-lib/lib/gcc/x86_64-unknown-linux-gnu/7.5.0/install-tools/include/limits.h kunligo al gnu/store/01b4w3m6mp55y531kyi1g8shh722kwqm-gcc-7.5.0-lib/lib/gcc/x86_64-unknown-linux-gnu/7.5.0/include-fixed/limits.h
hr--r--r-- root/root 0 1970-01-01 01:00 gnu/store/01b4w3m6mp55y531kyi1g8shh722kwqm-gcc-7.5.0-lib/lib/gcc/x86_64-unknown-linux-gnu/7.5.0/plugin/include/gsyslimits.h kunligo al gnu/store/01b4w3m6mp55y531kyi1g8shh722kwqm-gcc-7.5.0-lib/lib/gcc/x86_64-unknown-linux-gnu/7.5.0/include-fixed/syslimits.h
hrwxrwxrwx root/root 0 1970-01-01 01:00 gnu/store/01b4w3m6mp55y531kyi1g8shh722kwqm-gcc-7.5.0-lib/lib/gcc/x86_64-unknown-linux-gnu/7.5.0/plugin/libcc1plugin.so.0 kunligo al gnu/store/01b4w3m6mp55y531kyi1g8shh722kwqm-gcc-7.5.0-lib/lib/gcc/x86_64-unknown-linux-gnu/7.5.0/plugin/libcc1plugin.so
hrwxrwxrwx root/root 0 1970-01-01 01:00 gnu/store/01b4w3m6mp55y531kyi1g8shh722kwqm-gcc-7.5.0-lib/lib/gcc/x86_64-unknown-linux-gnu/7.5.0/plugin/libcp1plugin.so.0 kunligo al gnu/store/01b4w3m6mp55y531kyi1g8shh722kwqm-gcc-7.5.0-lib/lib/gcc/x86_64-unknown-linux-gnu/7.5.0/plugin/libcp1plugin.so
--8<---------------cut here---------------end--------------->8---
Most of these ‘h’ lines for hard links; ‘libcc1plugin.so’ seems to be an
exception (it’s a symlink).
Having looked at the tar manual (info "(tar) hard links"), it seems
clear that this is the default behavior and that we have to pass
‘--hard-dereference’ to avoid it.
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH] Fix unreproducible “guix pack -f docker” (hard link)
2021-02-06 21:46 ` Ludovic Courtès
@ 2021-02-08 18:44 ` zimoun
[not found] ` <86lfbzad42.fsf@gmail.com>
1 sibling, 0 replies; 37+ messages in thread
From: zimoun @ 2021-02-08 18:44 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 467 bytes --]
Hi Ludo,
On Sat, 06 Feb 2021 at 22:46, Ludovic Courtès <ludo@gnu.org> wrote:
> Having looked at the tar manual (info "(tar) hard links"), it seems
> clear that this is the default behavior and that we have to pass
> ‘--hard-dereference’ to avoid it.
Attached a patch that fixes the issue, I guess. Well, I am not sure to
understand all correctly, yet. :-)
Now the 2 images have the same checksum on my 2 machines.
WDYT?
Cheers,
simon
[-- Attachment #2: docker.patch --]
[-- Type: text/x-diff, Size: 1225 bytes --]
From 70e113ecccc831d2a111f7c8598157d41fe0de86 Mon Sep 17 00:00:00 2001
From: zimoun <zimon.toutoune@gmail.com>
Date: Mon, 8 Feb 2021 19:37:25 +0100
Subject: [PATCH] guix: docker: Fix undeterministic hard link.
* guix/docker.scm (%tar-determinism-options): Add '--hard-dereference'.
---
guix/docker.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/guix/docker.scm b/guix/docker.scm
index 97ac6d982b..39e85b7fc2 100644
--- a/guix/docker.scm
+++ b/guix/docker.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
+;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -112,7 +113,7 @@ Return a version of TAG that follows these rules."
(define %tar-determinism-options
;; GNU tar options to produce archives deterministically.
- '("--sort=name" "--mtime=@1"
+ '("--sort=name" "--mtime=@1" "--hard-dereference"
"--owner=root:0" "--group=root:0"))
(define directive-file
base-commit: 4cd8bab7d4b345c5538b8d039d84a957df7a235f
--
2.29.2
^ permalink raw reply related [flat|nested] 37+ messages in thread
* Re: Unreproducible “guix pack -f docker” because config.scm-builder
[not found] ` <86lfbzad42.fsf@gmail.com>
@ 2021-02-09 8:35 ` Ludovic Courtès
2021-02-09 8:51 ` zimoun
0 siblings, 1 reply; 37+ messages in thread
From: Ludovic Courtès @ 2021-02-09 8:35 UTC (permalink / raw)
To: zimoun; +Cc: guix-devel
Hi,
zimoun <zimon.toutoune@gmail.com> skribis:
> On Sat, 06 Feb 2021 at 22:46, Ludovic Courtès <ludo@gnu.org> wrote:
>
>> See? One has just 1 link (did you disable deduplication on that one?),
>> there other has 5 links.
>
> Yes, I see but I do not understand why. I have not changed, well, only
> the number of cores and jobs:
>
> ExecStart=/var/guix/profiles/per-user/root/current-guix/bin/guix-daemon --build-users-group=guixbuild -c 128 -M 99
> Environment='GUIX_LOCPATH=/var/guix/profiles/per-user/root/guix-profile/lib/locale' LC_ALL=en_US.utf8
>
>
> And my 2 Debian systems give the same result, one is the default and the
> other is:
>
> ExecStart=/var/guix/profiles/per-user/root/current-guix/bin/guix-daemon --build-users-group=guixbuild --gc-keep-outputs=yes --gc-keep-derivations=yes
>
>
>
> There is another configuration file that I could miss?
No.
I’m not sure exactly why it happened, but it’s clear that (guix docker)
would let the nlink value influence tar.
>> Having looked at the tar manual (info "(tar) hard links"), it seems
>> clear that this is the default behavior and that we have to pass
>> ‘--hard-dereference’ to avoid it.
>
> Do you mean in (guix docker) here:
>
> (apply invoke "tar" "-cf" "../layer.tar"
> `(,@transformation-options
> ,@%tar-determinism-options
> ,@paths
> ,@(scandir "."
> (lambda (file)
> (not (member file '("." ".."))))))))
>
> if I read correctly?
>
> And the option «-h, --dereference: Follow symlinks; archive and dump the
> files they point to.» isn’t enough?
It’s really ‘--hard-dereference’.
Pushed as 18a4882e3029a084d2f0c63d9d0148682a854546, thank you!
Ludo’.
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: Unreproducible “guix pack -f docker” because config.scm-builder
2021-02-09 8:35 ` Unreproducible “guix pack -f docker” because config.scm-builder Ludovic Courtès
@ 2021-02-09 8:51 ` zimoun
0 siblings, 0 replies; 37+ messages in thread
From: zimoun @ 2021-02-09 8:51 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
Hi,
On Tue, 9 Feb 2021 at 09:35, Ludovic Courtès <ludo@gnu.org> wrote:
> Pushed as 18a4882e3029a084d2f0c63d9d0148682a854546, thank you!
Thanks! Your comment is better that the none of mime. ;-)
I have not tried yours but I confirm with mine which is the same, the
issue is fixed. :-)
Cheers,
simon
^ permalink raw reply [flat|nested] 37+ messages in thread
end of thread, other threads:[~2021-02-09 9:19 UTC | newest]
Thread overview: 37+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-16 18:29 [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 1/8] profiles: Add 'manifest->code' Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 2/8] utils: Add 'version-unique-prefix' Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 3/8] guix package: Add '--export-manifest' Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 4/8] channels: Factorize 'manifest-entry-channel' and channel serialization Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 5/8] channels: Add the channel name to channel sexps Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 6/8] guix describe: Use 'manifest-entry-channel' Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 7/8] channels: Add 'channel->code' Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 8/8] guix package: Add '--export-channels' Ludovic Courtès
2021-01-27 13:14 ` bug#45919: [PATCH 0/8] Exporting a manifest and channels from a profile Ludovic Courtès
2021-01-27 21:02 ` [bug#45919] " zimoun
2021-01-28 15:54 ` Ludovic Courtès
2021-02-01 22:37 ` Unreproducible “guix pack -f docker” because config.scm-builder zimoun
2021-02-02 14:48 ` zimoun
2021-02-02 18:12 ` Ludovic Courtès
2021-02-02 20:11 ` zimoun
2021-02-05 10:09 ` Ludovic Courtès
2021-02-05 17:22 ` zimoun
2021-02-06 21:46 ` Ludovic Courtès
2021-02-08 18:44 ` [PATCH] Fix unreproducible “guix pack -f docker” (hard link) zimoun
[not found] ` <86lfbzad42.fsf@gmail.com>
2021-02-09 8:35 ` Unreproducible “guix pack -f docker” because config.scm-builder Ludovic Courtès
2021-02-09 8:51 ` zimoun
2021-01-28 17:57 ` [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile Bengt Richter
2021-01-29 19:13 ` zimoun
2021-01-28 17:04 ` bug#45919: " Pierre Neidhardt
2021-01-29 17:57 ` [bug#45919] " Pierre Neidhardt
2021-01-29 18:57 ` zimoun
2021-01-29 21:51 ` Pierre Neidhardt
2021-01-30 14:31 ` zimoun
2021-01-30 21:23 ` bug#45919: " Ludovic Courtès
2021-01-31 5:08 ` Ryan Prior
2021-02-01 13:30 ` Ludovic Courtès
2021-01-30 13:55 ` Ludovic Courtès
2021-01-31 17:26 ` Pierre Neidhardt
2021-02-01 13:25 ` Ludovic Courtès
2021-02-01 15:32 ` Pierre Neidhardt
2021-02-01 17:04 ` Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.