From d634db9401ac320383d45e24431442259cf6a2a4 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 10 Oct 2018 17:33:42 +0200 Subject: etc: Use git-file-name if origin is git-fetch. * etc/snippets/scheme-mode/guix-origin: Use git-file-name. --- etc/snippets/scheme-mode/guix-origin | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'etc') diff --git a/etc/snippets/scheme-mode/guix-origin b/etc/snippets/scheme-mode/guix-origin index 68d47135db..1a068f8859 100644 --- a/etc/snippets/scheme-mode/guix-origin +++ b/etc/snippets/scheme-mode/guix-origin @@ -15,7 +15,9 @@ ((equal yas-text "hg-fetch") "hg-reference...") ((equal yas-text "cvs-fetch") "cvs-reference...") (t "(string-append \\"https://\\" version \\".tar.gz\\")"))}$0) - ${1:$(cond ((member yas-text '("git-fetch" "svn-fetch" "hg-fetch" "cvs-fetch")) + ${1:$(cond ((equal yas-text "git-fetch") + "(file-name (git-file-name name version))") + ((member yas-text '("svn-fetch" "hg-fetch" "cvs-fetch")) "(file-name (string-append name \\"-\\" version \\"-checkout\\"))") (t ""))} (sha256 -- cgit v1.2.3 From 2510bd87562bfee9d82348f1c08dd78ccea12dd1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 14 Oct 2018 23:19:59 +0200 Subject: guix-install.sh: Recognize armhf-linux. * etc/guix-install.sh (chk_sys_arch): Add "armv7l" case. --- etc/guix-install.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'etc') diff --git a/etc/guix-install.sh b/etc/guix-install.sh index d9f1955098..ca6874ba0f 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -160,6 +160,9 @@ chk_sys_arch() aarch64) local arch=aarch64 ;; + armv7l) + local arch=armhf + ;; *) _err "${ERR}Unsupported CPU type: ${arch}" exit 1 -- cgit v1.2.3