diff options
author | Mark H Weaver <mhw@netris.org> | 2015-06-14 08:49:42 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2015-06-14 08:49:42 -0400 |
commit | bcf2971f6ebc965aa94391b2a8d39e5005885806 (patch) | |
tree | c12187a787b934fb79d159046a4a5516e5d39f97 /guix/scripts/build.scm | |
parent | ec2990716005b4b41bab6b707ada0206c1655be8 (diff) | |
parent | 7871724df7218428fac53133496c474bac8c5ea8 (diff) |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/commencement.scm
gnu/packages/xml.scm
Diffstat (limited to 'guix/scripts/build.scm')
-rw-r--r-- | guix/scripts/build.scm | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 2307f76b42..7fd05da189 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -77,19 +77,26 @@ the new package's version number from URI." ;; Return the "base" of FILE-NAME, removing '.tar.gz' or similar ;; extensions. ;; TODO: Factorize. - (cond ((numeric-extension? file-name) + (cond ((not (file-extension file-name)) + file-name) + ((numeric-extension? file-name) file-name) ((string=? (file-extension file-name) "tar") (file-sans-extension file-name)) + ((file-extension file-name) + (tarball-base-name (file-sans-extension file-name))) (else - (tarball-base-name (file-sans-extension file-name))))) + file-name))) (let ((base (tarball-base-name (basename uri)))) (let-values (((name version) (package-name->name+version base))) (package (inherit p) (version (or version (package-version p))) - (source (download-to-store store uri)))))) + + ;; Use #:recursive? #t to allow for directories. + (source (download-to-store store uri + #:recursive? #t)))))) ;;; |