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

gnu: emacs-w3m: Fix build. 

The previously (unofficial) Git repository mirror is no longer available, so
we fallback to using the official CVS repository.

Fixes issue 33938 (see: https://issues.guix.info/issue/33938).

* gnu/packages/emacs.scm (emacs-w3m)[origin]: Fetch the sources from the
  official CVS repository.
This commit is contained in:
Maxim Cournoyer 2019-01-01 11:21:19 -05:00
parent ff148ea5d6
commit e68bfcfda1
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 86 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

171
gnu/packages/emacs.scm
View File

@ -61,6 +61,7 @@
(define-module (gnu packages emacs) (define-module (gnu packages emacs)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix cvs-download)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix gexp) #:use-module (guix gexp)
@ -843,91 +844,91 @@ index is considered the key).")
;;; ;;;
(define-public emacs-w3m (define-public emacs-w3m
;; Emacs-w3m follows a "rolling release" model from its CVS repo. We could ;; Emacs-w3m follows a "rolling release" model.
;; use CVS, sure, but instead we choose to use this Git mirror described on (package
;; the home page as an "unofficial" mirror. (name "emacs-w3m")
(let ((commit "0dd5691f46d314a84da63f3a7277d721815811a2")) (version "2018-11-11")
(package (source (origin
(name "emacs-w3m") (method cvs-fetch)
(version (git-version "1.5" "0" commit)) (uri (cvs-reference
(source (origin (root-directory
(method git-fetch) ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot")
(uri (git-reference (module "emacs-w3m")
(url "https://github.com/ecbrown/emacs-w3m") (revision version)))
(commit commit))) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"02xalyxbrkgl4n8nj7xxkmsbm6lshhwdc8bzs2l4wz3hkpgkj7x4")))) "0nvahdbjs12zg7zsk4gql02mvnv56cf1rwj2f5p42lwp3xvswiwp"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("autoconf" ,autoconf) (native-inputs `(("autoconf" ,autoconf)
("texinfo" ,texinfo) ("texinfo" ,texinfo)
("emacs" ,emacs-minimal))) ("emacs" ,emacs-minimal)))
(inputs `(("w3m" ,w3m) (inputs `(("w3m" ,w3m)
("imagemagick" ,imagemagick))) ("imagemagick" ,imagemagick)))
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
(guix build utils) (guix build utils)
(guix build emacs-utils)) (guix build emacs-utils))
#:imported-modules (,@%gnu-build-system-modules #:imported-modules (,@%gnu-build-system-modules
(guix build emacs-utils)) (guix build emacs-utils))
#:configure-flags #:configure-flags
(let ((out (assoc-ref %outputs "out"))) (let ((out (assoc-ref %outputs "out")))
(list (string-append "--with-lispdir=" (list (string-append "--with-lispdir="
out "/share/emacs/site-lisp") out "/share/emacs/site-lisp")
(string-append "--with-icondir=" (string-append "--with-icondir="
out "/share/images/emacs-w3m") out "/share/images/emacs-w3m")
;; Leave .el files uncompressed, otherwise GC can't ;; Leave .el files uncompressed, otherwise GC can't
;; identify run-time dependencies. See ;; identify run-time dependencies. See
;; <http://lists.gnu.org/archive/html/guix-devel/2015-12/msg00208.html> ;; <http://lists.gnu.org/archive/html/guix-devel/2015-12/msg00208.html>
"--without-compress-install")) "--without-compress-install"))
#:tests? #f ; no check target #:tests? #f ; no check target
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'autoconf (add-after 'unpack 'autoconf
(lambda _ (lambda _
(invoke "autoconf"))) (invoke "autoconf")))
(add-before 'configure 'support-emacs! (add-before 'configure 'support-emacs!
(lambda _ (lambda _
;; For some reason 'AC_PATH_EMACS' thinks that 'Emacs 26' is ;; For some reason 'AC_PATH_EMACS' thinks that 'Emacs 26' is
;; unsupported. ;; unsupported.
(substitute* "configure" (substitute* "configure"
(("EMACS_FLAVOR=unsupported") (("EMACS_FLAVOR=unsupported")
"EMACS_FLAVOR=emacs")) "EMACS_FLAVOR=emacs"))
#t)) #t))
(add-before 'build 'patch-exec-paths (add-before 'build 'patch-exec-paths
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(w3m (assoc-ref inputs "w3m")) (w3m (assoc-ref inputs "w3m"))
(imagemagick (assoc-ref inputs "imagemagick")) (imagemagick (assoc-ref inputs "imagemagick"))
(coreutils (assoc-ref inputs "coreutils"))) (coreutils (assoc-ref inputs "coreutils")))
(make-file-writable "w3m.el") (make-file-writable "w3m.el")
(emacs-substitute-variables "w3m.el" (emacs-substitute-variables "w3m.el"
("w3m-command" (string-append w3m "/bin/w3m")) ("w3m-command" (string-append w3m "/bin/w3m"))
("w3m-touch-command" ("w3m-touch-command"
(string-append coreutils "/bin/touch")) (string-append coreutils "/bin/touch"))
("w3m-icon-directory" ("w3m-icon-directory"
(string-append out "/share/images/emacs-w3m"))) (string-append out "/share/images/emacs-w3m")))
(make-file-writable "w3m-image.el") (make-file-writable "w3m-image.el")
(emacs-substitute-variables "w3m-image.el" (emacs-substitute-variables "w3m-image.el"
("w3m-imagick-convert-program" ("w3m-imagick-convert-program"
(string-append imagemagick "/bin/convert")) (string-append imagemagick "/bin/convert"))
("w3m-imagick-identify-program" ("w3m-imagick-identify-program"
(string-append imagemagick "/bin/identify"))) (string-append imagemagick "/bin/identify")))
#t))) #t)))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(invoke "make" "install" "install-icons") (invoke "make" "install" "install-icons")
(with-directory-excursion (with-directory-excursion
(string-append (assoc-ref outputs "out") (string-append (assoc-ref outputs "out")
"/share/emacs/site-lisp") "/share/emacs/site-lisp")
(for-each delete-file '("ChangeLog" "ChangeLog.1")) (for-each delete-file '("ChangeLog" "ChangeLog.1"))
(symlink "w3m-load.el" "w3m-autoloads.el") (symlink "w3m-load.el" "w3m-autoloads.el")
#t)))))) #t))))))
(home-page "http://emacs-w3m.namazu.org/") (home-page "http://emacs-w3m.namazu.org/")
(synopsis "Simple Web browser for Emacs based on w3m") (synopsis "Simple Web browser for Emacs based on w3m")
(description (description
"Emacs-w3m is an emacs interface for the w3m web browser.") "Emacs-w3m is an emacs interface for the w3m web browser.")
(license license:gpl2+)))) (license license:gpl2+)))
(define-public emacs-wget (define-public emacs-wget
(package (package