* [PATCH 1/2] gnu: magit-svn: Update to 2.1.0.
@ 2015-08-19 20:20 Alex Kost
2015-08-22 2:34 ` Mark H Weaver
0 siblings, 1 reply; 4+ messages in thread
From: Alex Kost @ 2015-08-19 20:20 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 104 bytes --]
I think that along with Magit itself, it will be good to update other
emacs packages from magit repos.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-magit-svn-Update-to-2.1.0.patch --]
[-- Type: text/x-patch, Size: 5021 bytes --]
From dbc3edbb675b437eb179008c27565805fd6e8119 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Wed, 19 Aug 2015 22:57:08 +0300
Subject: [PATCH 1/2] gnu: magit-svn: Update to 2.1.0.
* gnu/packages/emacs.scm: Use (gnu packages base) module. Remove
duplicated (gnu packages guile) and (gnu packages linux) modules.
(magit-svn): Update to 2.1.0.
[source]: Use 'url-fetch' method.
[inputs]: Remove. Move "emacs" to 'native-inputs', move "magit" to
'propagated-inputs'.
[native-inputs]: Add "tar" and "gzip".
[propagated-inputs]: Add "dash".
[arguments]: Adjust builder for the new inputs and unpacking the source.
---
gnu/packages/emacs.scm | 40 +++++++++++++++++++++++++---------------
1 file changed, 25 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index b73d80c..5c18154 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)
@@ -386,18 +385,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))
@@ -407,23 +410,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")
--
2.4.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] gnu: magit-svn: Update to 2.1.0.
2015-08-19 20:20 [PATCH 1/2] gnu: magit-svn: Update to 2.1.0 Alex Kost
@ 2015-08-22 2:34 ` Mark H Weaver
2015-08-22 15:38 ` Alex Kost
0 siblings, 1 reply; 4+ messages in thread
From: Mark H Weaver @ 2015-08-22 2:34 UTC (permalink / raw)
To: Alex Kost; +Cc: guix-devel
Alex Kost <alezost@gmail.com> writes:
> From dbc3edbb675b437eb179008c27565805fd6e8119 Mon Sep 17 00:00:00 2001
> From: Alex Kost <alezost@gmail.com>
> Date: Wed, 19 Aug 2015 22:57:08 +0300
> Subject: [PATCH 1/2] gnu: magit-svn: Update to 2.1.0.
Have you verified that magit-svn-2.1.0 works properly with magit-1.4.2?
Mark
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] gnu: magit-svn: Update to 2.1.0.
2015-08-22 2:34 ` Mark H Weaver
@ 2015-08-22 15:38 ` Alex Kost
2015-08-22 17:32 ` Mark H Weaver
0 siblings, 1 reply; 4+ messages in thread
From: Alex Kost @ 2015-08-22 15:38 UTC (permalink / raw)
To: Mark H Weaver; +Cc: guix-devel
Mark H Weaver (2015-08-22 05:34 +0300) wrote:
> Alex Kost <alezost@gmail.com> writes:
>
>> From dbc3edbb675b437eb179008c27565805fd6e8119 Mon Sep 17 00:00:00 2001
>> From: Alex Kost <alezost@gmail.com>
>> Date: Wed, 19 Aug 2015 22:57:08 +0300
>> Subject: [PATCH 1/2] gnu: magit-svn: Update to 2.1.0.
>
> Have you verified that magit-svn-2.1.0 works properly with magit-1.4.2?
I didn't check, but I'm sure it doesn't work with magit 1.4.2. That's
why I sent a patch for updating magit to 2.2.0 at first:
<http://lists.gnu.org/archive/html/guix-devel/2015-08/msg00241.html>.
And I'm going to push all 3 commits at once: updating magit to 2.2.0,
magit-svn to 2.1.0 and git-modes to 1.2.0.
--
Alex
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] gnu: magit-svn: Update to 2.1.0.
2015-08-22 15:38 ` Alex Kost
@ 2015-08-22 17:32 ` Mark H Weaver
0 siblings, 0 replies; 4+ messages in thread
From: Mark H Weaver @ 2015-08-22 17:32 UTC (permalink / raw)
To: Alex Kost; +Cc: guix-devel
Alex Kost <alezost@gmail.com> writes:
> Mark H Weaver (2015-08-22 05:34 +0300) wrote:
>
>> Alex Kost <alezost@gmail.com> writes:
>>
>>> From dbc3edbb675b437eb179008c27565805fd6e8119 Mon Sep 17 00:00:00 2001
>>> From: Alex Kost <alezost@gmail.com>
>>> Date: Wed, 19 Aug 2015 22:57:08 +0300
>>> Subject: [PATCH 1/2] gnu: magit-svn: Update to 2.1.0.
>>
>> Have you verified that magit-svn-2.1.0 works properly with magit-1.4.2?
>
> I didn't check, but I'm sure it doesn't work with magit 1.4.2. That's
> why I sent a patch for updating magit to 2.2.0 at first:
> <http://lists.gnu.org/archive/html/guix-devel/2015-08/msg00241.html>.
Ah, sorry, I missed that.
> And I'm going to push all 3 commits at once: updating magit to 2.2.0,
> magit-svn to 2.1.0 and git-modes to 1.2.0.
Sounds good. Thank you!
Mark
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-08-22 17:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-19 20:20 [PATCH 1/2] gnu: magit-svn: Update to 2.1.0 Alex Kost
2015-08-22 2:34 ` Mark H Weaver
2015-08-22 15:38 ` Alex Kost
2015-08-22 17:32 ` Mark H Weaver
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).