tribes/guix
1
0
Fork 1
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-28 03:51:53 +02:00
Code Activity

guix: Separate the package name and version with "@", not "-".

Browse Source 
* guix/packages.scm (package-full-name): By default, use "@" to separate
  the package name and package version.  Add an optional delimiter
  argument so that there is still a way to explicitly use a different
  delimiter.
* gnu/packages/commencement.scm (gcc-boot0) <unpack-gmp&co>: Adjust
  accordingly.
* tests/graph.scm: Adjust accordingly.
* tests/profiles.scm: Adjust accordingly.
* NEWS: Mention the change.

Fixes: <https://bugs.gnu.org/31088>.
Reported by Pierre Neidhardt <ambrevar@gmail.com>.
This commit is contained in:
Chris Marusich
2018-04-08 16:51:42 -07:00
parent b61cb24492
commit ede121de42
6 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/profiles.scm
+5 -6
View File
@@ -242,8 +242,8 @@
#:hooks '()
#:locales? #t
#:target target)))
(define (find-input name)
(let ((name (string-append name ".drv")))
(define (find-input package)
(let ((name (string-append (package-full-name package "-") ".drv")))
(any (lambda (input)
(let ((input (derivation-input-path input)))
(and (string-suffix? name input) input)))
@@ -252,12 +252,11 @@
;; The inputs for grep and sed should be cross-build derivations, but that
;; for the glibc-utf8-locales should be a native build.
(return (and (string=? (derivation-system drv) (%current-system))
(string=? (find-input (package-full-name packages:grep))
(string=? (find-input packages:grep)
(derivation-file-name grep))
(string=? (find-input (package-full-name packages:sed))
(string=? (find-input packages:sed)
(derivation-file-name sed))
(string=? (find-input
(package-full-name packages:glibc-utf8-locales))
(string=? (find-input packages:glibc-utf8-locales)
(derivation-file-name locales))))))
(test-assert "package->manifest-entry defaults to \"out\""