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

gnu: guile-emacs: Fetch source over HTTPS and be more idiomatic. 

Fixes <https://bugs.gnu.org/27795>.

* gnu/packages/emacs.scm (guile-emacs)[source]: Use HTTPS.
Use git-version and git-file-name.
This commit is contained in:
Leo Famulari 2019-02-25 18:05:18 -05:00
parent 584dbd8568
commit ef5fa91ccc
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
gnu/packages/emacs.scm
View File

@ -254,39 +254,41 @@ editor (without an X toolkit)" )
(package-arguments emacs))))) (package-arguments emacs)))))
(define-public guile-emacs (define-public guile-emacs
(package (inherit emacs) (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b")
(name "guile-emacs") (revision "0"))
(version "20150512.41120e0") (package (inherit emacs)
(source (origin (name "guile-emacs")
(method git-fetch) (version (git-version "0.0.0" revision commit))
(uri (git-reference (source (origin
(url "git://git.hcoop.net/git/bpt/emacs.git") (method git-fetch)
(commit "41120e0f595b16387eebfbf731fff70481de1b4b"))) (uri (git-reference
(file-name (string-append name "-" version "-checkout")) (url "https://git.hcoop.net/git/bpt/emacs.git")
(patches (search-patches "guile-emacs-fix-configure.patch")) (commit commit)))
(sha256 (file-name (git-file-name name version))
(base32 (patches (search-patches "guile-emacs-fix-configure.patch"))
"0lvcvsz0f4mawj04db35p1dvkffdqkz8pkhc0jzh9j9x2i63kcz6")))) (sha256
(native-inputs (base32
`(("autoconf" ,autoconf) "0lvcvsz0f4mawj04db35p1dvkffdqkz8pkhc0jzh9j9x2i63kcz6"))))
("automake" ,automake) (native-inputs
("guile" ,guile-for-guile-emacs) `(("autoconf" ,autoconf)
,@(package-native-inputs emacs))) ("automake" ,automake)
(arguments ("guile" ,guile-for-guile-emacs)
(substitute-keyword-arguments `(;; Build fails if we allow parallel build. ,@(package-native-inputs emacs)))
#:parallel-build? #f (arguments
;; Tests aren't passing for now. (substitute-keyword-arguments `(;; Build fails if we allow parallel build.
#:tests? #f #:parallel-build? #f
,@(package-arguments emacs)) ;; Tests aren't passing for now.
((#:phases phases) #:tests? #f
`(modify-phases ,phases ,@(package-arguments emacs))
(add-after 'unpack 'autogen ((#:phases phases)
(lambda _ `(modify-phases ,phases
(invoke "sh" "autogen.sh"))) (add-after 'unpack 'autogen
;; Build sometimes fails: deps/dispnew.d: No such file or directory (lambda _
(add-before 'build 'make-deps-dir (invoke "sh" "autogen.sh")))
(lambda _ ;; Build sometimes fails: deps/dispnew.d: No such file or directory
(invoke "mkdir" "-p" "src/deps"))))))))) (add-before 'build 'make-deps-dir
(lambda _
(invoke "mkdir" "-p" "src/deps"))))))))))
(define-public m17n-db (define-public m17n-db
(package (package