[PATCH 05/13] packages: Use '@' in package record printers.

[Mathieu Lirzin <mthl@gnu.org>]

[-- Attachment #1: Type: text/plain, Size: 382 bytes --]


* guix/packages.scm <package>: Use '@' in record printer.
* guix/import/cabal.scm <cabal-package>: Likewise
* guix/import/elpa.scm <elpa-package>: Likewise.
* tests/packages.scm: Adapt to it.
---
 guix/import/cabal.scm | 2 +-
 guix/import/elpa.scm  | 2 +-
 guix/packages.scm     | 2 +-
 tests/packages.scm    | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0005-packages-Use-in-package-record-printers.patch --]
[-- Type: text/x-patch; name="0005-packages-Use-in-package-record-printers.patch", Size: 2621 bytes --]

diff --git a/guix/import/cabal.scm b/guix/import/cabal.scm
index c20e074..09130e4 100644
--- a/guix/import/cabal.scm
+++ b/guix/import/cabal.scm
@@ -608,7 +608,7 @@ If #f use the function 'port-filename' to obtain it."
 
 (set-record-type-printer! <cabal-package>
                           (lambda (package port)
-                            (format port "#<cabal-package ~a-~a>"
+                            (format port "#<cabal-package ~a@~a>"
                                       (cabal-package-name package)
                                       (cabal-package-version package))))
 
diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm
index 8c10668..529de4f 100644
--- a/guix/import/elpa.scm
+++ b/guix/import/elpa.scm
@@ -121,7 +121,7 @@ REPO."
 
 (set-record-type-printer! <elpa-package>
                           (lambda (package port)
-                            (format port "#<elpa-package ~a-~a>"
+                            (format port "#<elpa-package ~a@~a>"
                                       (elpa-package-name package)
                                       (elpa-package-version package))))
 
diff --git a/guix/packages.scm b/guix/packages.scm
index c43b36f..48c012a 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -279,7 +279,7 @@ name of its URI."
                           (lambda (package port)
                             (let ((loc    (package-location package))
                                   (format simple-format))
-                              (format port "#<package ~a-~a ~a~a>"
+                              (format port "#<package ~a@~a ~a~a>"
                                       (package-name package)
                                       (package-version package)
                                       (if loc
diff --git a/tests/packages.scm b/tests/packages.scm
index 6a2f4f0..9d37fb6 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -58,7 +58,7 @@
 (test-begin "packages")
 
 (test-assert "printer with location"
-  (string-match "^#<package foo-0 foo.scm:42 [[:xdigit:]]+>$"
+  (string-match "^#<package foo@0 foo.scm:42 [[:xdigit:]]+>$"
                 (with-output-to-string
                   (lambda ()
                     (write
@@ -66,7 +66,7 @@
                        (location (make-location "foo.scm" 42 7))))))))
 
 (test-assert "printer without location"
-  (string-match "^#<package foo-0 [[:xdigit:]]+>$"
+  (string-match "^#<package foo@0 [[:xdigit:]]+>$"
                 (with-output-to-string
                   (lambda ()
                     (write