[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/11: packages: Use '@' in package record printers.
From: |
Mathieu Lirzin |
Subject: |
04/11: packages: Use '@' in package record printers. |
Date: |
Thu, 28 Jan 2016 15:32:42 +0000 |
mthl pushed a commit to branch master
in repository guix.
commit 74e667d14912b9243043b43995848d962569a9a1
Author: Mathieu Lirzin <address@hidden>
Date: Sun Jan 24 17:42:39 2016 +0100
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 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 address@hidden>"
(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 address@hidden>"
(elpa-package-name package)
(elpa-package-version package))))
diff --git a/guix/packages.scm b/guix/packages.scm
index 41f3e20..6ec168c 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 address@hidden ~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 address@hidden 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 address@hidden [[:xdigit:]]+>$"
(with-output-to-string
(lambda ()
(write
- branch master updated (03675ca -> 8a76e5f), Mathieu Lirzin, 2016/01/28
- 01/11: tests: Use 'dummy-origin' for lint tests when possible., Mathieu Lirzin, 2016/01/28
- 02/11: lint: Remove an unneeded clause in 'check-patch-file-names'., Mathieu Lirzin, 2016/01/28
- 06/11: build: Add 'DOT' silent rule., Mathieu Lirzin, 2016/01/28
- 08/11: build: Add 'HELP2MAN' silent rule., Mathieu Lirzin, 2016/01/28
- 07/11: build: Add 'EMACS' silent rule., Mathieu Lirzin, 2016/01/28
- 05/11: build: Add 'DL' silent rule., Mathieu Lirzin, 2016/01/28
- 11/11: Update .gitignore., Mathieu Lirzin, 2016/01/28
- 04/11: packages: Use '@' in package record printers.,
Mathieu Lirzin <=
- 10/11: build: Use 'GEN' and 'at' silent rules., Mathieu Lirzin, 2016/01/28
- 09/11: build: Remove guix-autoloads.el from the distribution., Mathieu Lirzin, 2016/01/28
- 03/11: lint: Rewrite 'check-patch-file-names'., Mathieu Lirzin, 2016/01/28