diff --git a/guix/import/cabal.scm b/guix/import/cabal.scm index c20e074e180156b317e6f77068a5985e57294c36..09130e44981165eebcda166b565dcefde2fe6ecf 100644 --- a/guix/import/cabal.scm +++ b/guix/import/cabal.scm @@ -608,7 +608,7 @@ (define-record-type <cabal-package> (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 8c10668293a9d7a5c79c546cc1eeccbaab840a61..529de4f232f20bf642b98de9eb534d083e71d8e5 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -121,7 +121,7 @@ (define-record-type <elpa-package> (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 41f3e20c41b66f870b1ffde37077149dafc56947..6ec168c204011246f10f778d1d1c82f3f3673948 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -278,7 +278,7 @@ (define-record-type* <package> (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 6a2f4f06e1e5c9ce0d54b0507c811f6c096e8243..9d37fb68d676ff7efef034193a771715e7de05de 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -58,7 +58,7 @@ (define %store (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 @@ (define %store (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