From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mathieu Lirzin <mthl@gnu.org>
Subject: [PATCH 05/13] packages: Use '@' in package record printers.
Date: Sun, 24 Jan 2016 21:19:23 +0100
Message-ID: <1453666771-16869-6-git-send-email-mthl@gnu.org>
References: <1453666771-16869-1-git-send-email-mthl@gnu.org>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------2.7.0.rc3"
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46222)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mthl@gnu.org>) id 1aNR97-0003a9-0I
	for guix-devel@gnu.org; Sun, 24 Jan 2016 15:20:26 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mthl@gnu.org>) id 1aNR95-0005cS-H7
	for guix-devel@gnu.org; Sun, 24 Jan 2016 15:20:24 -0500
In-Reply-To: <1453666771-16869-1-git-send-email-mthl@gnu.org>
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
To: guix-devel@gnu.org

This is a multi-part message in MIME format.
--------------2.7.0.rc3
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: quoted-printable


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


--------------2.7.0.rc3
Content-Type: text/x-patch; name="0005-packages-Use-in-package-record-printers.patch"
Content-Disposition: inline; filename="0005-packages-Use-in-package-record-printers.patch"
Content-Transfer-Encoding: quoted-printable

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."
=20
 (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))))
=20
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."
=20
 (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))))
=20
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")
=20
 (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))))))))
=20
 (test-assert "printer without location"
-  (string-match "^#<package foo-0 [[:xdigit:]]+>$"
+  (string-match "^#<package foo@0 [[:xdigit:]]+>$"
                 (with-output-to-string
                   (lambda ()
                     (write

--------------2.7.0.rc3--