From 74e667d14912b9243043b43995848d962569a9a1 Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin <mthl@gnu.org>
Date: Sun, 24 Jan 2016 17:42:39 +0100
Subject: [PATCH] packages: Use '@' in package record printers.

* 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(-)

diff --git a/guix/import/cabal.scm b/guix/import/cabal.scm
index c20e074e18..09130e4498 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 8c10668293..529de4f232 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 41f3e20c41..6ec168c204 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -278,7 +278,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 6a2f4f06e1..9d37fb68d6 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