diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-10-17 20:47:11 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-10-17 20:47:11 +0200 |
| commit | d02bb02f7d833ad371c53c346b6cb77f01377cf4 (patch) | |
| tree | 9506f04a7fde2f3b264ba1d2a9012085e1f72b72 /etc | |
| parent | fb3ff265cd8c6b4c6160f94240dc8932097e637b (diff) | |
| parent | acce0a474c1493ab18912bc46285248e4ccb0314 (diff) | |
| download | guix-d02bb02f7d833ad371c53c346b6cb77f01377cf4.tar guix-d02bb02f7d833ad371c53c346b6cb77f01377cf4.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/guix-install.sh | 3 | ||||
| -rw-r--r-- | etc/snippets/scheme-mode/guix-origin | 4 |
2 files changed, 6 insertions, 1 deletions
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 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 |