From patchwork Sat Oct 5 19:19:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 15658 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2CC3217520; Sat, 5 Oct 2019 20:21:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id DB05617446 for ; Sat, 5 Oct 2019 20:21:14 +0100 (BST) Received: from localhost ([::1]:58510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGpcA-0003zk-39 for patchwork@mira.cbaines.net; Sat, 05 Oct 2019 15:21:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35482) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGpc0-0003xh-FX for guix-patches@gnu.org; Sat, 05 Oct 2019 15:21:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iGpbz-0007MX-5r for guix-patches@gnu.org; Sat, 05 Oct 2019 15:21:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36449) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iGpbz-0007MQ-2K for guix-patches@gnu.org; Sat, 05 Oct 2019 15:21:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iGpby-0006aL-Sl for guix-patches@gnu.org; Sat, 05 Oct 2019 15:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36999] [PATCH 1/4] gnu: emacs-magit: Update to 2.90.1-1.c761d28. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Oct 2019 19:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36999 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36999@debbugs.gnu.org Cc: Oleg Pykhalov Received: via spool by 36999-submit@debbugs.gnu.org id=B36999.157030324725232 (code B ref 36999); Sat, 05 Oct 2019 19:21:02 +0000 Received: (at 36999) by debbugs.gnu.org; 5 Oct 2019 19:20:47 +0000 Received: from localhost ([127.0.0.1]:45261 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iGpbj-0006Yo-AZ for submit@debbugs.gnu.org; Sat, 05 Oct 2019 15:20:47 -0400 Received: from mail-lj1-f178.google.com ([209.85.208.178]:36316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iGpbh-0006YN-Gd for 36999@debbugs.gnu.org; Sat, 05 Oct 2019 15:20:45 -0400 Received: by mail-lj1-f178.google.com with SMTP id v24so9748978ljj.3 for <36999@debbugs.gnu.org>; Sat, 05 Oct 2019 12:20:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9p6Cus5ZH8AUH1wpaIhuaCCqHSjYMzkAPKLsiia+vYg=; b=mm9oR25+WxXrR/JJAad9zATX+8oZ/Dxc0QS3vGLb9t1Dt5soDCcET5qdnIX/mtBsBA 477ISCny9QcANFFtyT9dr3JdIR2BevVUQ6WdoymaMmx+qCZzjCkFbn+w2ePw9pd0UVfg bcRuH1NI1v+dRzx++6zhbK7dS8T3N64Rv+EXNmLXHT588ALTcCqRKKTY2cb/YgPbx7mh bOlTX6TRarIm1h7IzUzLxIefy7AL+iG5/Fx2Q+hObgopVAvXXMGJYamLN4Gq79+AD65Q PP9RHu3y3JZnEsjeACWjAkNlJ29AjbIP+NAjQN1ITPxSPKocSkGKMommwlUDftoeuPix 7vhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9p6Cus5ZH8AUH1wpaIhuaCCqHSjYMzkAPKLsiia+vYg=; b=pCanXocEOKJ+gIgD9DlUObSjIWgICXr7i9nX/2hLF2wqJZZHMV5YVJ1ClbnjZQ+c4w ZNf+II4losRtVVZDabiQtIx8j0kB9XKup2kKC0/lJQeVBwZfXYLiNjHqgPVT2EY2nlim uO1AD2Sq3LQYSfylp3JND230L4CLPv9TDTyXC20k9eVJbvnYEJ+Hg2s6MpjfUF6hPjEk D+Q+J7/BdkvPghpuqvPr3grZnl8IabGCaOReatWoD8IOub4HNAX7yTk6ouuHTJ5ooWRF JudQ+9V+eCPzuZJzIXbB5RK0SEfWy9WNU77cYmSLHTrnc2usghQe8ItIAnrr1otf3hs3 5DIA== X-Gm-Message-State: APjAAAUIVS2gyae41jsjuNjr7Mtuqmg47Ov7NUdtF5j9zECWJGaVVlSp ZfKiiIvTPzCGyeiitKTBkhKG1yzl X-Google-Smtp-Source: APXvYqwAPvuQcj/tdwaHItHUuHvfuU/Sm9an42oVOm0eZXAy1ZFDkajQmOrtwHT6c6o+GzFyyWfXGQ== X-Received: by 2002:a2e:7211:: with SMTP id n17mr13374876ljc.9.1570303239444; Sat, 05 Oct 2019 12:20:39 -0700 (PDT) Received: from localhost.localdomain (95-55-14-61.dynamic.avangarddsl.ru. [95.55.14.61]) by smtp.gmail.com with ESMTPSA id n5sm2599907ljh.54.2019.10.05.12.20.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Oct 2019 12:20:38 -0700 (PDT) From: Oleg Pykhalov Date: Sat, 5 Oct 2019 22:19:26 +0300 Message-Id: <20191005191929.7356-2-go.wigust@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191005191929.7356-1-go.wigust@gmail.com> References: <20191005191929.7356-1-go.wigust@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-magit): Update to 2.90.1-1.c761d28. [arguments]: Add patch phase. --- gnu/packages/emacs-xyz.scm | 50 ++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index afa21ee19e..7044b92240 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -265,21 +265,28 @@ on stdout instead of using a socket as the Emacsclient does.") (license license:gpl3+))) (define-public emacs-magit - ;; Version 2.90.1 has trouble loading the transient library, - ;; so we use a more recent commit that fixes it. - (let ((commit "b4aec016b5577afa8d889f258b499814d1bb1d94")) + ;; `magit-setup-buffer' macro introduced in c761d28d and required in + ;; `emacs-forge'. + (let ((commit "c761d28d49e5238037512b898db0ec9b40d85770")) (package (name "emacs-magit") (version (git-version "2.90.1" "1" commit)) (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/magit/magit") + (url "https://github.com/magit/magit.git") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "0zl7v6z0y50pcgqsf2r8c1k3r5nwjad9ba7r6sgrnf4rc62br7jv")))) + "16qx0404l05q1m6w7y5j8ck1z5nfmpinm00w0p2yh1hn5zzwy6dd")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix syntax error + (substitute* "lisp/magit-extras.el" + (("rev\\)\\)\\)\\)\\)\\)") "rev)))))")) + #t)))) (build-system gnu-build-system) (native-inputs `(("texinfo" ,texinfo) ("emacs" ,emacs-minimal))) @@ -318,6 +325,39 @@ on stdout instead of using a socket as the Emacsclient does.") #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (chmod "lisp/magit-extras.el" #o644) + (emacs-batch-edit-file "lisp/magit-extras.el" + `(progn (progn + (goto-char (point-min)) + (re-search-forward "(defun magit-copy-buffer-revision ()") + (forward-sexp 2) + (kill-sexp) + (insert ,(format #f "~S" + '(if (use-region-p) + (copy-region-as-kill nil nil 'region) + (when-let ((rev (cl-case major-mode + ((magit-cherry-mode + magit-log-select-mode + magit-reflog-mode + magit-refs-mode + magit-revision-mode + magit-stash-mode + magit-stashes-mode) + (car magit-refresh-args)) + ((magit-diff-mode magit-log-mode) + (let ((r (caar magit-refresh-args))) + (if (string-match "\\.\\.\\.?\\(.+\\)" r) + (match-string 1 r) + r))) + (magit-status-mode "HEAD")))) + (when (magit-commit-p rev) + (setq rev (magit-rev-parse rev)) + (push (list rev default-directory) magit-revision-stack) + (kill-new (message "%s" rev)))))))) + (basic-save-buffer))) + #t)) (delete 'configure) (add-before 'build 'patch-exec-paths From patchwork Sat Oct 5 19:19:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 15660 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C221C17520; Sat, 5 Oct 2019 20:21:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7AF6317446 for ; Sat, 5 Oct 2019 20:21:31 +0100 (BST) Received: from localhost ([::1]:58516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGpcQ-00048C-UV for patchwork@mira.cbaines.net; Sat, 05 Oct 2019 15:21:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35490) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGpc0-0003xp-W4 for guix-patches@gnu.org; Sat, 05 Oct 2019 15:21:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iGpbz-0007Mo-LE for guix-patches@gnu.org; Sat, 05 Oct 2019 15:21:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36450) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iGpbz-0007Mi-Hg for guix-patches@gnu.org; Sat, 05 Oct 2019 15:21:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iGpbz-0006aT-Cx for guix-patches@gnu.org; Sat, 05 Oct 2019 15:21:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36999] [PATCH 2/4] gnu: emacs-ghub: Update to 3.2.0-1.cf0b13a. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Oct 2019 19:21:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36999 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36999@debbugs.gnu.org Cc: Oleg Pykhalov Received: via spool by 36999-submit@debbugs.gnu.org id=B36999.157030325125253 (code B ref 36999); Sat, 05 Oct 2019 19:21:03 +0000 Received: (at 36999) by debbugs.gnu.org; 5 Oct 2019 19:20:51 +0000 Received: from localhost ([127.0.0.1]:45265 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iGpbm-0006ZD-Ml for submit@debbugs.gnu.org; Sat, 05 Oct 2019 15:20:51 -0400 Received: from mail-lj1-f172.google.com ([209.85.208.172]:44026) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iGpbi-0006YP-7p for 36999@debbugs.gnu.org; Sat, 05 Oct 2019 15:20:46 -0400 Received: by mail-lj1-f172.google.com with SMTP id n14so9708656ljj.10 for <36999@debbugs.gnu.org>; Sat, 05 Oct 2019 12:20:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MAPQisdH85d24KhG7OQXh5JbOm3BKva8BLUKR/dc0NM=; b=ekzPh9kGc1G0YW+1T52lnyDDl7eqgh+kkLqEDRCKNKtUH6jm+E2aQndZnscYRWsrbf G/nNJ+SVA7L1yJPgkUlduPsOfZGJa3E8q41jt0T5R84uHTx8VgDOCTIjaXNG0j4BwS5d Ls9wZ9KtfIz2HiTuU+Zx4PWTqJUV8dxyOGtMCOv+YDMFCetS+nAD9HN6t6QYZ0MTuU3X Ez94OMpg3ehkElcJLZ3C/IB8OnWF4XgpYeFPq+kTeNjoMcYwlmVkXHOBxYWjXeZGZqPw XS6oYuzgBuqt4YXKSeWPhmJ8T0+RTVIsTrRjKneww1nQ8cHHJffYkL9JmzTWTTlrGIF0 R5Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MAPQisdH85d24KhG7OQXh5JbOm3BKva8BLUKR/dc0NM=; b=Ssq7+PF0kR3hCD10SaPAucA2qkVAzPiVRdE365K/fwfsR+/znw+KmmzbTyC3q53hKb BdjvTzLbI0TROdhafYLQM+6VlDzlr5D0byNOaOuH8PY/PqBdU/zVeU5wfY96/gOcuBVg M0Bm35oEsDhJoqapWXcZU7Q0IWFkROAtQMp2dkFb9EyTsk19zrjC6PXzwyFBZbeG29Gk pC4SIXGNRzTWLJ3h/RDn0vcqmzLnrw8Zs+ZeyHwhiLJyXS3lFb1zXKLaexcTG4Mz/V65 wLmteo3s4o6CXg5w/NalToNncALhp07/AiHOjCOX4FAd5aEAmwPcBhRShtTM5nzN5+pc XLwA== X-Gm-Message-State: APjAAAV2JOr9eE271o89g22m5MIdV6COAkr8W7v5k9cktsnwn6/xcd23 U1koQ2a11Lu6wNfrNYlUSnoQqUC7 X-Google-Smtp-Source: APXvYqx+jgDc5J2iWPZFCRrwyos0/R3a6OoCav9VRUe03VH/BTLgdpPu76j5yBe4m4T0lk9iHIEFtA== X-Received: by 2002:a2e:301a:: with SMTP id w26mr13373650ljw.168.1570303240220; Sat, 05 Oct 2019 12:20:40 -0700 (PDT) Received: from localhost.localdomain (95-55-14-61.dynamic.avangarddsl.ru. [95.55.14.61]) by smtp.gmail.com with ESMTPSA id n5sm2599907ljh.54.2019.10.05.12.20.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Oct 2019 12:20:39 -0700 (PDT) From: Oleg Pykhalov Date: Sat, 5 Oct 2019 22:19:27 +0300 Message-Id: <20191005191929.7356-3-go.wigust@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191005191929.7356-1-go.wigust@gmail.com> References: <20191005191929.7356-1-go.wigust@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-ghub): Update to 3.2.0-1.cf0b13a. --- gnu/packages/emacs-xyz.scm | 62 ++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7044b92240..807b0260cd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -564,39 +564,41 @@ deliver data to mobile and web apps.") (license license:gpl3+))) (define-public emacs-ghub - (package - (name "emacs-ghub") - (version "3.2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/ghub") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0lp52qygyavddl1lrgsyb6mq7hcf9h89dy2pzya3mb2va49f0vvl")))) - (build-system emacs-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'make-info - (lambda _ - (invoke "make" "info")))))) - (native-inputs - `(("texinfo" ,texinfo))) - (propagated-inputs - `(("dash" ,emacs-dash) - ("graphql" ,emacs-graphql) - ("treepy" ,emacs-treepy))) - (home-page "https://github.com/magit/ghub") - (synopsis "Emacs client libraries for the APIs of various Git forges") - (description - "Ghub provides basic support for using the APIs of various Git forges from + ;; We need a newer commit to avoid problems in emacs-forge. + (let ((commit "cf0b13aeba4df3798e49c205cac2d8fefd53a137") + (revision "1")) + (package + (name "emacs-ghub") + (version (git-version "3.2.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/ghub") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fzayvcysk80vv4q332axcjf80x6gsnpcbl0svmpb017ii6wxhid")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'install 'make-info + (lambda _ + (invoke "make" "info")))))) + (native-inputs + `(("texinfo" ,texinfo))) + (propagated-inputs + `(("dash" ,emacs-dash) + ("treepy" ,emacs-treepy))) + (home-page "https://github.com/magit/ghub") + (synopsis "Emacs client libraries for the APIs of various Git forges") + (description + "Ghub provides basic support for using the APIs of various Git forges from Emacs packages. It supports the REST APIs of Github, Github GraphQL, Gitlab, Gitea, Gogs and Bitbucket. It abstracts access to API resources using only a handful of functions that are not resource-specific.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-scribble-mode (let ((commit "217945d54de5e4bb207033f2116baa28f5c5ecf2") From patchwork Sat Oct 5 19:19:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 15661 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0FE6917520; Sat, 5 Oct 2019 20:21:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id BDA3217446 for ; Sat, 5 Oct 2019 20:21:33 +0100 (BST) Received: from localhost ([::1]:58518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGpcT-0004FW-At for patchwork@mira.cbaines.net; Sat, 05 Oct 2019 15:21:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35497) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGpc1-0003xr-C0 for guix-patches@gnu.org; Sat, 05 Oct 2019 15:21:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iGpc0-0007N4-2y for guix-patches@gnu.org; Sat, 05 Oct 2019 15:21:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36451) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iGpc0-0007My-0A for guix-patches@gnu.org; Sat, 05 Oct 2019 15:21:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iGpbz-0006aa-RG for guix-patches@gnu.org; Sat, 05 Oct 2019 15:21:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36999] [PATCH 3/4] gnu: emacs-closql: Update to 1.0.0-1.70b98db. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Oct 2019 19:21:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36999 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36999@debbugs.gnu.org Cc: Oleg Pykhalov Received: via spool by 36999-submit@debbugs.gnu.org id=B36999.157030325125259 (code B ref 36999); Sat, 05 Oct 2019 19:21:03 +0000 Received: (at 36999) by debbugs.gnu.org; 5 Oct 2019 19:20:51 +0000 Received: from localhost ([127.0.0.1]:45267 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iGpbn-0006ZG-2t for submit@debbugs.gnu.org; Sat, 05 Oct 2019 15:20:51 -0400 Received: from mail-lj1-f180.google.com ([209.85.208.180]:33287) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iGpbj-0006YS-Dm for 36999@debbugs.gnu.org; Sat, 05 Oct 2019 15:20:47 -0400 Received: by mail-lj1-f180.google.com with SMTP id a22so9770582ljd.0 for <36999@debbugs.gnu.org>; Sat, 05 Oct 2019 12:20:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XP8rAiH41pKD4kjzCjw04xB1+9EGm0iwx/nCqsrzp4Y=; b=VUI9v3BxALXKH0C2xO2NMH+FSh2S8PR1g8tfc0uww87rmm8QGxcujrJ2xjpPRWBt0N tlMkAdpCYJnMQSOqjwMcEbcBuuwDkcIIWZ5mCXbVFkCpfysF7DnhY6s6YPzIlBi1licp w+gAtgauibnWT7mr/Px71bbvZBOYWXo5KpTW5V7skXzJgLwLXp+8Jy/IogjBmqRtgo76 z0zZ+l5Cbqy441SdwfLurwd/NyWNIhKcGV9Hqod7vUygG7tZsiQ8WFP8nymzUdbAKxCf xGL20s225PeDzA+eZMf65z1/BjMcMH6yc5M6jQvL1SMyiYQNTvloF/7Hv9MC3OC6cC4D qmZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XP8rAiH41pKD4kjzCjw04xB1+9EGm0iwx/nCqsrzp4Y=; b=VY45mZuQl3lP9KEDixvohhfWV5O7/qS0/g2odfoDbKq2N86UZrAhGW0bI2iyb/TkOK lc2ezw9oj/isvKA5f7e/sOyOBM7dfXl3ZyqprleKhGZ3r0gv4irqTPKa9YvL/xPUWzDT ZqjhpNW1WnJKjybmqx3GF+sH18Jl8o3cgWS94sxkgDoeNBuTqRLKbxjNZNrJePNPqaDL Hfh+Bv1/FFfLfzHC+6uwX0Hm/ID+KZJQE7Wv07ihIeTvTgMXDlzvW4CibG7E4W/XPSJT xaNarb08cXyqXpwjfRs3c57CwCSs+h065y74E/FgEKz+35l20fFecfs6dbUUYCNC+jPK NyOQ== X-Gm-Message-State: APjAAAWL+apC+xptI2uUHpzd+HxqhdgCvNeHVf0lkMf2TGR3muKCfdoD Grf4duXHksk9G1hX1tKnHFKHwa3u X-Google-Smtp-Source: APXvYqz98LVkdMdB4SA6w0N1vXO5VSF5qWLoekLcY2ZeA1BFKBjKiAD2N3M1pjLkVr7Hwqbg0IFKCA== X-Received: by 2002:a2e:3902:: with SMTP id g2mr13539527lja.196.1570303241416; Sat, 05 Oct 2019 12:20:41 -0700 (PDT) Received: from localhost.localdomain (95-55-14-61.dynamic.avangarddsl.ru. [95.55.14.61]) by smtp.gmail.com with ESMTPSA id n5sm2599907ljh.54.2019.10.05.12.20.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Oct 2019 12:20:40 -0700 (PDT) From: Oleg Pykhalov Date: Sat, 5 Oct 2019 22:19:28 +0300 Message-Id: <20191005191929.7356-4-go.wigust@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191005191929.7356-1-go.wigust@gmail.com> References: <20191005191929.7356-1-go.wigust@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-closql): Update to 1.0.0-1.70b98db. --- gnu/packages/emacs-xyz.scm | 44 ++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 807b0260cd..c8f4af54ad 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11356,31 +11356,33 @@ object @code{nil} corresponds 1:1 with @code{NULL} in the database.") (license license:gpl3+))) (define-public emacs-closql - (package - (name "emacs-closql") - (version "1.0.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emacscollective/closql.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1xhpfjjkjqfc1k2rj77cscclz5r7gpvv3hi202x178vdcpipjwar")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-emacsql" ,emacs-emacsql))) - (home-page "https://github.com/emacscollective/closql") - (synopsis "Store EIEIO objects using EmacSQL") - (description - "This package allows to store uniform EIEIO objects in an EmacSQL + ;; Take a commit newer than 1.0.0 release because of Emacs upgrade to 26.3. + (let ((commit "70b98dbae53611d10a461d9b4a6f71086910dcef")) + (package + (name "emacs-closql") + (version (git-version "1.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacscollective/closql.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1wvhrihg663f61yzc7f0vha2abjdnlwbk0gjcwakdfk1bhwf5ikh")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-emacsql" ,emacs-emacsql))) + (home-page "https://github.com/emacscollective/closql") + (synopsis "Store EIEIO objects using EmacSQL") + (description + "This package allows to store uniform EIEIO objects in an EmacSQL database. SQLite is used as backend. This library imposes some restrictions on what kind of objects can be stored; it isn't intended to store arbitrary objects. All objects have to share a common superclass and subclasses cannot add any additional instance slots.") - (license license:gpl3))) + (license license:gpl3)))) (define-public emacs-epkg ;; The release version is to old for the current database scheme. From patchwork Sat Oct 5 19:19:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 15659 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D3C0817520; Sat, 5 Oct 2019 20:21:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 8973217446 for ; Sat, 5 Oct 2019 20:21:17 +0100 (BST) Received: from localhost ([::1]:58512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGpcC-00042B-I2 for patchwork@mira.cbaines.net; Sat, 05 Oct 2019 15:21:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35506) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGpc1-0003y9-Rp for guix-patches@gnu.org; Sat, 05 Oct 2019 15:21:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iGpc0-0007NR-JW for guix-patches@gnu.org; Sat, 05 Oct 2019 15:21:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36452) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iGpc0-0007NG-Fw for guix-patches@gnu.org; Sat, 05 Oct 2019 15:21:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iGpc0-0006ai-BI for guix-patches@gnu.org; Sat, 05 Oct 2019 15:21:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36999] [PATCH 4/4] gnu: Add emacs-forge. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Oct 2019 19:21:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36999 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36999@debbugs.gnu.org Cc: Oleg Pykhalov Received: via spool by 36999-submit@debbugs.gnu.org id=B36999.157030325325270 (code B ref 36999); Sat, 05 Oct 2019 19:21:04 +0000 Received: (at 36999) by debbugs.gnu.org; 5 Oct 2019 19:20:53 +0000 Received: from localhost ([127.0.0.1]:45269 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iGpbp-0006ZW-FA for submit@debbugs.gnu.org; Sat, 05 Oct 2019 15:20:53 -0400 Received: from mail-lj1-f176.google.com ([209.85.208.176]:46958) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iGpbk-0006YT-Ba for 36999@debbugs.gnu.org; Sat, 05 Oct 2019 15:20:49 -0400 Received: by mail-lj1-f176.google.com with SMTP id d1so9708123ljl.13 for <36999@debbugs.gnu.org>; Sat, 05 Oct 2019 12:20:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lbfJdON6B2ezXiuU7EBA1l/mBmzkslLa7kXQ8irQVRA=; b=VuFiF6MhNPdn7oyMRdUGYma/EL2Pgw59aAx44WtNGwgYjS3Mxw4cdDMTHgXq/nljH9 fJQDG4EWuX/LVryrbC8kIzRD2b2mzJZq5jvtoPXPuzC0a9DTKXDzK9ri5KUOX+gcVTrj oCqlg7RMbJxY5rnmuB49zlC1MaZK5qRIb5GmLjxlgBMTczfQo+g/jnb2otOKRYFZRF7R TLWsprlUHtjDAQoFSXL1H6ZPKbb1x+Adi7gruEEQPaNN8+Jj0D/Ce1EWud3YTeXfTh6p UqzAYUpKKJ7yR7iCXdnARe3Djmd4snf9Fp+dVo/ZdtOk3OC8FETFesIFd4QKA6DtNzSO cwbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lbfJdON6B2ezXiuU7EBA1l/mBmzkslLa7kXQ8irQVRA=; b=eafEemFve9LcRQCrSDVvorixvaXhiy3PNHVypUFZ5em2fPVsViEXSM1U6OWQee7tH9 4UINmLmaaPlgtvz1zDLwFnw8QQHTvIZ0L8QHqV+YdEdzWg8HrlzviHqW00wJurCmHUCh b/JjS8kCERK1xPMucrOWvyIyAaIR7DXe/ojkvrbWNZ4W0DxjqlU2hx+Sw5HitDEQXwyp m8hh833auOzEgqZKfjGXyn5ZycTVd/ZS3jq4m+SrojKHgOtLYw1DcEw5RH1Dtxn+kgkI SsKV4meJQGIlz+nZNxfK1wYi6rgR7tkEsvZnhazwuiQPC0g43NWKnSYP+DTJLeNr/047 BFMw== X-Gm-Message-State: APjAAAXTMp46eON5VwKQy0L8xVW5Y4XaPTiDwDL50A/DN6Pu6cNm35a1 Su4PoIupixVRT+UQIUP+gaQze2fx X-Google-Smtp-Source: APXvYqzs823qZMrtwEXGymTBkMGh+HPQ+RYL9QMVSZX2u2QQlsIPq9zxFwnPGnBTeApalolen/R/nA== X-Received: by 2002:a2e:5b9a:: with SMTP id m26mr10057783lje.90.1570303242359; Sat, 05 Oct 2019 12:20:42 -0700 (PDT) Received: from localhost.localdomain (95-55-14-61.dynamic.avangarddsl.ru. [95.55.14.61]) by smtp.gmail.com with ESMTPSA id n5sm2599907ljh.54.2019.10.05.12.20.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Oct 2019 12:20:41 -0700 (PDT) From: Oleg Pykhalov Date: Sat, 5 Oct 2019 22:19:29 +0300 Message-Id: <20191005191929.7356-5-go.wigust@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191005191929.7356-1-go.wigust@gmail.com> References: <20191005191929.7356-1-go.wigust@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-forge): New variable. --- gnu/packages/emacs-xyz.scm | 79 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c8f4af54ad..455b448d9d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17061,6 +17061,85 @@ command\", but because it always involves at least two commands (a prefix and a suffix) we prefer to call it just a \"transient\".") (license license:gpl3+)))) +(define-public emacs-forge + (let ((commit "a6721c071226ae8da6852e9330f2bdcba92a4577")) + (package + (name "emacs-forge") + (version (git-version "0.1.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/forge.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gzr1di29a9szkzm6kjznq7c8md71cm5761pznf08nmmk63dl3zm")))) + (build-system gnu-build-system) + (native-inputs + `(("texinfo" ,texinfo) + ("emacs" ,emacs-minimal))) + (propagated-inputs + `(("emacs-closql" ,emacs-closql) + ("emacs-dash" ,emacs-dash) + ("emacs-emacsql-sqlite" ,emacs-emacsql) + ("emacs-ghub" ,emacs-ghub) + ("emacs-let-alist" ,emacs-let-alist) + ("emacs-magit" ,emacs-magit) + ("emacs-markdown-mode" ,emacs-markdown-mode) + ("emacs-transient" ,emacs-transient))) + (arguments + `(#:tests? #f ;no tests + #:modules ((srfi srfi-26) + (guix build gnu-build-system) + ((guix build emacs-build-system) #:prefix emacs:) + (guix build utils) + (guix build emacs-utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build emacs-build-system) + (guix build emacs-utils)) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'install) + (add-after 'unpack 'delete-doc-targets + (lambda _ + (substitute* "./Makefile" + (("lisp docs") "lisp")))) + (add-after 'delete-doc-targets 'emacs-set-emacs-load-path + (assoc-ref emacs:%standard-phases 'set-emacs-load-path)) + (add-after 'emacs-set-emacs-load-path 'chdir-lisp + (lambda _ + (chdir "lisp"))) + (add-after 'chdir-lisp 'emacs-install + (assoc-ref emacs:%standard-phases 'install)) + (add-after 'emacs-install 'emacs-make-autoloads + (assoc-ref emacs:%standard-phases 'make-autoloads)) + (add-after 'build 'install-elc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (el-dir (string-append + out "/share/emacs/site-lisp/guix.d/forge-" + ,version))) + (for-each (cut install-file <> el-dir) + (find-files "." "\\.elc")) + #t))) + (add-after 'install-elc 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (info (string-append out "/share/info"))) + (with-directory-excursion "../docs" + (invoke "makeinfo" "forge.texi") + (install-file "forge.info" info) + #t))))))) + (home-page "https://github.com/magit/ghub/") + (synopsis "Access Git forges from Magit") + (description + "Work with Git forges, such as Github and Gitlab, from the comfort of +Magit and the rest of Emacs.") + (license license:gpl3+)))) + (define-public emacs-matcha (let ((commit "c7df5cf5cdac9ae369e241342389ccda0205eab9")) (package