diff options
| -rw-r--r-- | gnu/packages/emacs.scm | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 71e263fc10..9812d23acb 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -38,7 +38,6 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages guile) #:use-module (gnu packages xorg) #:use-module (gnu packages lesstif) #:use-module (gnu packages image) @@ -48,13 +47,13 @@ #:use-module (gnu packages w3m) #:use-module (gnu packages wget) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages xml) #:use-module (gnu packages glib) #:use-module (gnu packages acl) #:use-module (gnu packages perl) #:use-module (gnu packages pdf) - #:use-module (gnu packages linux) ;alsa #:use-module (gnu packages xiph) #:use-module (gnu packages mp3) #:use-module (guix utils) @@ -367,18 +366,22 @@ operations.") (define-public magit-svn (package (name "magit-svn") - (version "b69b79") + (version "2.1.0") (source (origin - (method git-fetch) - (uri (git-reference - (commit version) - (url "https://github.com/magit/magit-svn.git"))) + (method url-fetch) + (uri (string-append + "https://github.com/magit/magit-svn/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "07xxszd12r38s46sz8fn2qz26b7s88i022cqp3gmkmmj3j57kqv6")))) + "09sz93g7x7g9q75jsw8bdh7yr4jr1igfb4fpg5i302a7l2ahxfr8")))) (build-system trivial-build-system) - (inputs `(("emacs" ,emacs-no-x) - ("magit" ,magit))) + (native-inputs `(("emacs" ,emacs-no-x) + ("tar" ,tar) + ("gzip" ,gzip))) + (propagated-inputs `(("dash" ,emacs-dash) + ("magit" ,magit))) (arguments `(#:modules ((guix build utils) (guix build emacs-utils)) @@ -388,23 +391,30 @@ operations.") (use-modules (guix build utils) (guix build emacs-utils)) - (let* ((emacs (string-append (assoc-ref %build-inputs "emacs") + (let* ((tar (string-append (assoc-ref %build-inputs "tar") + "/bin/tar")) + (PATH (string-append (assoc-ref %build-inputs "gzip") + "/bin")) + (emacs (string-append (assoc-ref %build-inputs "emacs") "/bin/emacs")) (magit (string-append (assoc-ref %build-inputs "magit") "/share/emacs/site-lisp")) - (commit (string-append (assoc-ref %build-inputs "git-modes") - "/share/emacs/site-lisp")) + (dash (string-append (assoc-ref %build-inputs "dash") + "/share/emacs/site-lisp/guix.d/dash-" + ,(package-version emacs-dash))) (source (assoc-ref %build-inputs "source")) (lisp-dir (string-append %output "/share/emacs/site-lisp"))) + (setenv "PATH" PATH) + (system* tar "xvf" source) (mkdir-p lisp-dir) - (copy-file (string-append source "/magit-svn.el") + (copy-file (string-append ,name "-" ,version "/magit-svn.el") (string-append lisp-dir "/magit-svn.el")) (with-directory-excursion lisp-dir (parameterize ((%emacs emacs)) (emacs-generate-autoloads ,name lisp-dir) (setenv "EMACSLOADPATH" - (string-append ":" magit ":" commit)) + (string-append ":" magit ":" dash)) (emacs-batch-eval '(byte-compile-file "magit-svn.el")))))))) (home-page "https://github.com/magit/magit-svn") (synopsis "Git-SVN extension to Magit") |