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

gnu: eamcs-magit-svm: Don't use unstable tarball. 

* gnu/packages/emacs-xyz.scm (emacs-magit-svn)[source]: Use 'git-fetch'.
[native-inputs]: Remove tar, gzip.
[arguments]: Adjust code accordingly.
This commit is contained in:
Efraim Flashner 2019-01-23 09:50:35 +02:00
parent 8b9fab8f76
commit daa82371b8
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gnu/packages/emacs-xyz.scm
View File

@ -323,18 +323,16 @@ operations.")
(name "emacs-magit-svn") (name "emacs-magit-svn")
(version "2.2.0") (version "2.2.0")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append (uri (git-reference
"https://github.com/magit/magit-svn/archive/" (url "https://github.com/magit/magit-svn")
version ".tar.gz")) (commit version)))
(file-name (string-append name "-" version ".tar.gz")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1c3n377v436zaxamlsz04y1ahdhp96x1vd43zaryv4y10m02ba47")))) "128ra3habdqk1rsnmy87m0aw2pqi033dqmmjmgsmfblnfvi987p9"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(native-inputs `(("emacs" ,emacs-minimal) (native-inputs `(("emacs" ,emacs-minimal)))
("tar" ,tar)
("gzip" ,gzip)))
(propagated-inputs `(("dash" ,emacs-dash) (propagated-inputs `(("dash" ,emacs-dash)
("with-editor" ,emacs-with-editor) ("with-editor" ,emacs-with-editor)
("magit" ,emacs-magit))) ("magit" ,emacs-magit)))
@ -347,26 +345,20 @@ operations.")
(use-modules (guix build utils) (use-modules (guix build utils)
(guix build emacs-utils)) (guix build emacs-utils))
(let* ((tar (string-append (assoc-ref %build-inputs "tar") (let ((emacs (string-append (assoc-ref %build-inputs "emacs")
"/bin/tar")) "/bin/emacs"))
(PATH (string-append (assoc-ref %build-inputs "gzip") (magit (string-append (assoc-ref %build-inputs "magit")
"/bin")) "/share/emacs/site-lisp"))
(emacs (string-append (assoc-ref %build-inputs "emacs") (dash (string-append (assoc-ref %build-inputs "dash")
"/bin/emacs")) "/share/emacs/site-lisp/guix.d/dash-"
(magit (string-append (assoc-ref %build-inputs "magit") ,(package-version emacs-dash)))
"/share/emacs/site-lisp")) (with-editor (string-append (assoc-ref %build-inputs "with-editor")
(dash (string-append (assoc-ref %build-inputs "dash") "/share/emacs/site-lisp/guix.d/with-editor-"
"/share/emacs/site-lisp/guix.d/dash-" ,(package-version emacs-with-editor)))
,(package-version emacs-dash))) (source (assoc-ref %build-inputs "source"))
(with-editor (string-append (assoc-ref %build-inputs "with-editor") (lisp-dir (string-append %output "/share/emacs/site-lisp")))
"/share/emacs/site-lisp/guix.d/with-editor-"
,(package-version emacs-with-editor)))
(source (assoc-ref %build-inputs "source"))
(lisp-dir (string-append %output "/share/emacs/site-lisp")))
(setenv "PATH" PATH)
(invoke tar "xvf" source)
(install-file (string-append "magit-svn-" ,version "/magit-svn.el") (install-file (string-append source "/magit-svn.el")
lisp-dir) lisp-dir)
(with-directory-excursion lisp-dir (with-directory-excursion lisp-dir