nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

packages: Suitably cope with indirect store paths as package sources. 

* guix/packages.scm (package-source-derivation): Don't let indirect
  store paths pass through.
* tests/packages.scm ("package-source-derivation, indirect store path"):
  New test.
This commit is contained in:
Ludovic Courtès 2013-11-12 23:44:47 +01:00
parent 9336e5b5e7
commit f80594cc41
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
guix/packages.scm
View File

@ -413,7 +413,7 @@ IMPORTED-MODULES specify modules to use/import for use by SNIPPET."
#:guile-for-build (or guile-for-build #:guile-for-build (or guile-for-build
(%guile-for-build) (%guile-for-build)
(default-guile store system))))) (default-guile store system)))))
((and (? string?) (? store-path?) file) ((and (? string?) (? direct-store-path?) file)
file) file)
((? string? file) ((? string? file)
(add-to-store store (basename file) #t "sha256" file)))) (add-to-store store (basename file) #t "sha256" file))))

11
tests/packages.scm
View File

@ -122,6 +122,17 @@
(package-source package)))) (package-source package))))
(string=? file source))) (string=? file source)))
(test-assert "package-source-derivation, indirect store path"
(let* ((dir (add-to-store %store "guix-build" #t "sha256"
(dirname (search-path %load-path
"guix/build/utils.scm"))))
(package (package (inherit (dummy-package "p"))
(source (string-append dir "/utils.scm"))))
(source (package-source-derivation %store
(package-source package))))
(and (direct-store-path? source)
(string-suffix? "utils.scm" source))))
(test-equal "package-source-derivation, snippet" (test-equal "package-source-derivation, snippet"
"OK" "OK"
(let* ((file (search-bootstrap-binary "guile-2.0.7.tar.xz" (let* ((file (search-bootstrap-binary "guile-2.0.7.tar.xz"