Merge branch 'master' into core-updates

Conflicts:
	guix/packages.scm

diff --cc gnu-system.am
Simple merge

diff --cc gnu/packages/base.scm
Simple merge

diff --cc gnu/packages/gnunet.scm
Simple merge

diff --cc gnu/packages/linux.scm
Simple merge

diff --cc gnu/packages/version-control.scm
index 6c03285,38e586b..3d88ff8
--- 1/gnu/packages/version-control.scm
--- 2/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@@ -26,9 -26,11 +26,10 @@@
    #:use-module (guix build-system gnu)
    #:use-module (guix build-system python)
    #:use-module (guix build utils)
 -  #:use-module ((gnu packages gettext)
 -                #:renamer (symbol-prefix-proc 'guix:))
 +  #:use-module (gnu packages gettext)
    #:use-module (gnu packages apr)
    #:use-module (gnu packages curl)
+   #:use-module (gnu packages ed)
    #:use-module (gnu packages nano)
    #:use-module (gnu packages openssl)
    #:use-module (gnu packages perl)

diff --cc guix/build-system/python.scm
Simple merge

diff --cc guix/packages.scm
index 9a2f08d,bb7d873..c1247b7
--- 1/guix/packages.scm
--- 2/guix/packages.scm
+++ b/guix/packages.scm
@@@ -418,8 -412,10 +420,8 @@@ IMPORTED-MODULES specify modules to use
                           #:system system
                           #:modules modules
                           #:imported-modules modules
 -                         #:guile-for-build (or guile-for-build
 -                                               (%guile-for-build)
 -                                               (default-guile store system)))))
 +                         #:guile-for-build guile)))
-     ((and (? string?) (? store-path?) file)
+     ((and (? string?) (? direct-store-path?) file)
       file)
      ((? string? file)
       (add-to-store store (basename file) #t "sha256" file))))

diff --cc tests/packages.scm
index 8d0d205,7de3fc2..04e3b0b
--- 1/tests/packages.scm
--- 2/tests/packages.scm
+++ b/tests/packages.scm
@@@ -122,9 -128,20 +128,20 @@@
                                               (package-source package))))
      (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"
    "OK"
 -  (let* ((file   (search-bootstrap-binary "guile-2.0.7.tar.xz"
 +  (let* ((file   (search-bootstrap-binary "guile-2.0.9.tar.xz"
                                            (%current-system)))
           (sha256 (call-with-input-file file port-sha256))
           (fetch  (lambda* (store url hash-algo hash