From patchwork Tue Jul 26 20:57:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Griffin X-Patchwork-Id: 13999 Received: (qmail 91172 invoked by uid 89); 26 Jul 2016 20:57:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.1 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.2 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=Jordan, jordan, Matthew, dash X-Spam-Status: No, score=-3.2 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: lists.gnu.org Received: from lists.gnu.org (HELO lists.gnu.org) (208.118.235.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Tue, 26 Jul 2016 20:57:49 +0000 Received: from localhost ([::1]:42219 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bS9QA-00038v-Sj for patchwork@sourceware.org; Tue, 26 Jul 2016 16:57:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bS9Ps-00030U-L8 for guix-devel@gnu.org; Tue, 26 Jul 2016 16:57:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bS9Pp-0005mk-3j for guix-devel@gnu.org; Tue, 26 Jul 2016 16:57:28 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:49035) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bS9Pm-0005jy-Ns for guix-devel@gnu.org; Tue, 26 Jul 2016 16:57:25 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 50A2020595 for ; Tue, 26 Jul 2016 16:57:12 -0400 (EDT) Received: from web1 ([10.202.2.211]) by compute1.internal (MEProxy); Tue, 26 Jul 2016 16:57:12 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=ajgrf.com; h= content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=xAE 3RSoFcJpFftpnurGmmOe5FV0=; b=ZNp5MIbTHeDgCTgUQZlzYG+OqImLEv2WFN0 QaWIQDo1HLbnGbXumcEncsiLwoXL4NLkHNSiC+s01ZkMIz2mkxB6bH64fs8W7BaG 4mDcFb4xyG2Dd9jcwdHer08OzHQFRwimysWJsj552i289blOkEvaU5Y4VaKL5Qf8 BJHFISIw= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-sasl-enc :x-sasl-enc; s=smtpout; bh=xAE3RSoFcJpFftpnurGmmOe5FV0=; b=j6hwq WI4cQQAkqjvhMfS4/HPrO9t6cM8+OlNOvScAkDRxME0dh4Ye+wn+BOhRQ45ke8fe MayPif4TWpgubiRoKx8sX3HLidlgdY3SBnXR0b1muffiP2MLTWo3CzlY9ZrXIExh JErMOZAYdr9xIEzznjFJT+irzzueC4CGr9x3jI= Received: by mailuser.nyi.internal (Postfix, from userid 99) id 143CF6A1E4; Tue, 26 Jul 2016 16:57:12 -0400 (EDT) Message-Id: <1469566632.3642255.677600593.59DB7F13@webmail.messagingengine.com> X-Sasl-Enc: nL4iqOc4rv8y4PnxGPUSk9GoAV3MKZ6C/CGvGb2eRBKv 1469566632 From: Alex Griffin To: guix-devel@gnu.org MIME-Version: 1.0 X-Mailer: MessagingEngine.com Webmail Interface - ajax-3c2832c2 Subject: [PATCH] gnu: magit: Fix interactive rebase. Date: Tue, 26 Jul 2016 15:57:12 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.29 X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list 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+patchwork=sourceware.org@gnu.org Sender: "Guix-devel" This patch fixes magit's interactive rebase function, which calls perl and fails if perl is not in PATH. From 1f73f2635225bfcf942194ffe8c02a07e4705d34 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Tue, 26 Jul 2016 13:29:51 -0500 Subject: [PATCH] gnu: magit: Fix interactive rebase. * gnu/packages/emacs.scm (magit): Fix interactive rebase. --- gnu/packages/emacs.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 8dd728b..f6e1234 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2016 Matthew Jordan ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016 ng0 +;;; Copyright © 2016 Alex Griffin ;;; ;;; This file is part of GNU Guix. ;;; @@ -454,7 +455,9 @@ on stdout instead of using a socket as the Emacsclient does.") (build-system gnu-build-system) (native-inputs `(("texinfo" ,texinfo) ("emacs" ,emacs-minimal))) - (inputs `(("git" ,git))) + (inputs + `(("git" ,git) + ("perl" ,perl))) (propagated-inputs `(("dash" ,emacs-dash) ("with-editor" ,emacs-with-editor))) @@ -487,9 +490,12 @@ on stdout instead of using a socket as the Emacsclient does.") (add-before 'build 'patch-exec-paths (lambda* (#:key inputs #:allow-other-keys) - (let ((git (assoc-ref inputs "git"))) + (let ((git (assoc-ref inputs "git")) + (perl (assoc-ref inputs "perl"))) (emacs-substitute-variables "lisp/magit-git.el" ("magit-git-executable" (string-append git "/bin/git"))) + (substitute* "lisp/magit-sequence.el" + (("perl") (string-append perl "/bin/perl"))) #t)))))) (home-page "http://magit.github.io/") (synopsis "Emacs interface for the Git version control system") -- 2.9.2