From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: [PATCH] gnu: magit: Update to 2.2.1. Date: Tue, 25 Aug 2015 22:04:20 +0300 Message-ID: <871ter6vgr.fsf_-_@gmail.com> References: <87zj1pd9rg.fsf@gmail.com> <87io87s00t.fsf@netris.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:36535) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUJWD-00006r-ND for guix-devel@gnu.org; Tue, 25 Aug 2015 15:04:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZUJWA-0005Ki-ER for guix-devel@gnu.org; Tue, 25 Aug 2015 15:04:25 -0400 Received: from mail-la0-x22b.google.com ([2a00:1450:4010:c03::22b]:34841) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUJWA-0005KU-1U for guix-devel@gnu.org; Tue, 25 Aug 2015 15:04:22 -0400 Received: by labgv11 with SMTP id gv11so37079434lab.2 for ; Tue, 25 Aug 2015 12:04:20 -0700 (PDT) Received: from leviafan ([217.107.192.146]) by smtp.gmail.com with ESMTPSA id kl3sm6143346lbb.28.2015.08.25.12.04.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Aug 2015 12:04:19 -0700 (PDT) In-Reply-To: <87io87s00t.fsf@netris.org> (Mark H. Weaver's message of "Sat, 22 Aug 2015 13:31:14 -0400") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain Magit 2.2.0 is not actual anymore, so here is the updated patch. I have a question however: I've noticed that there are 2 tarballs available: - This one does not include tests, but it has "magit-version.el" file so there is no need to specify "VERSION" flag (see ). - This is a "raw" snapshot of the repo, so there are tests, but "VERSION" flag should be specified. So what tarball should we use? I think it's better to take the second one (with tests). --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-magit-Update-to-2.2.1.patch Content-Transfer-Encoding: quoted-printable >From ae74c836d38f3fb60ba0682c0b5010b81f6793c9 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Mon, 17 Aug 2015 21:44:40 +0300 Subject: [PATCH] gnu: magit: Update to 2.2.1. * gnu/packages/emacs.scm (magit): Update to 2.2.1. [inputs]: Remove 'git:gui'. [propagated-inputs]: Add 'dash', remove 'git-modes'. [arguments]: Add PREFIX and DASH_DIR to 'make-flags'. Remove 'configure', 'augment-load-path' and 'post-install' phases. --- gnu/packages/emacs.scm | 57 +++++++++++++++++-----------------------------= ---- 1 file changed, 19 insertions(+), 38 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b73d80c..71e263f 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2,7 +2,7 @@ ;;; Copyright =C2=A9 2014 Taylan Ulrich Bayirli/Kammer ;;; Copyright =C2=A9 2013, 2014, 2015 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2014, 2015 Mark H Weaver -;;; Copyright =C2=A9 2014 Alex Kost +;;; Copyright =C2=A9 2014, 2015 Alex Kost ;;; Copyright =C2=A9 2015 Federico Beffa ;;; Copyright =C2=A9 2015 Ricardo Wurmus ;;; @@ -311,7 +311,7 @@ configuration files, such as .gitattributes, .gitignore= , and .git/config.") (define-public magit (package (name "magit") - (version "1.4.2") + (version "2.2.1") (source (origin (method url-fetch) (uri (string-append @@ -319,13 +319,12 @@ configuration files, such as .gitattributes, .gitigno= re, and .git/config.") version "/" name "-" version ".tar.gz")) (sha256 (base32 - "1g3bxvgabiis2y338jziycx4b61vrim4lzmqnzv78094s8azzb52")))) + "0bjdj4468i5w3j2i945b6psb6n04z34vhjaqr0iz4xgixk3wiqmh")))) (build-system gnu-build-system) (native-inputs `(("texinfo" ,texinfo) ("emacs" ,emacs-no-x))) - (inputs `(("git" ,git) - ("git:gui" ,git "gui"))) - (propagated-inputs `(("git-modes" ,git-modes))) + (inputs `(("git" ,git))) + (propagated-inputs `(("dash" ,emacs-dash))) (arguments `(#:modules ((guix build gnu-build-system) (guix build utils) @@ -334,45 +333,27 @@ configuration files, such as .gitattributes, .gitigno= re, and .git/config.") (guix build emacs-utils)) =20 #:test-target "test" - #:tests? #f ;'tests/magit-tests.el' is mis= sing + #:tests? #f ; tests are not included in the release =20 - #:make-flags (list - ;; Don't put .el files in a sub-directory. - (string-append "lispdir=3D" (assoc-ref %outputs "out") - "/share/emacs/site-lisp")) + #:make-flags + (list (string-append "PREFIX=3D" %output) + ;; Don't put .el files in a sub-directory. + (string-append "lispdir=3D" %output "/share/emacs/site-lisp") + (string-append "DASH_DIR=3D" + (assoc-ref %build-inputs "dash") + "/share/emacs/site-lisp/guix.d/dash-" + ,(package-version emacs-dash))) =20 #:phases (modify-phases %standard-phases - (replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile" - (("/usr/local") out) - (("/etc") (string-append out "/etc")))))) + (delete 'configure) (add-before 'build 'patch-exec-paths (lambda* (#:key inputs #:allow-other-keys) - (let ((git (assoc-ref inputs "git")) - (git:gui (assoc-ref inputs "git:gui"))) - (emacs-substitute-variables "magit.el" - ("magit-git-executable" (string-append git "/bin/git")) - ("magit-gitk-executable" (string-append git:gui - "/bin/gitk")))))) - (add-before - 'build 'augment-load-path - (lambda* (#:key inputs #:allow-other-keys) - ;; Allow git-commit-mode.el & co. to be found. - (let ((git-modes (assoc-ref inputs "git-modes"))) - (setenv "EMACSLOADPATH" - (string-append ":" git-modes "/share/emacs/site-lisp= ")) - #t))) - (add-after - 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) - (emacs-generate-autoloads - ,name (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp/"))))))) + (let ((git (assoc-ref inputs "git"))) + (emacs-substitute-variables "lisp/magit-git.el" + ("magit-git-executable" (string-append git "/bin/git"))) + #t)))))) (home-page "http://magit.github.io/") (synopsis "Emacs interface for the Git version control system") (description --=20 2.4.3 --=-=-=--