GNU bug report logs - #36999
[PATCH] gnu: Add emacs-forge.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 36999 in the body.
You can then email your comments to 36999 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: Oleg Pykhalov <go.wigust <at> gmail.com>
Subject: [PATCH] gnu: Add emacs-forge.
Date: Sat, 10 Aug 2019 19:18:09 +0300

* 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 1681cecbcf..40618406b1 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15789,6 +15789,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 "a60bd64056ec910fdbd1400dd8f583b8eec6145b"))
+    (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
+           "1dhpsnb82mxpv3krf3apsbcirlcizw3g9gac9sfn0fad20qjwpgj"))))
+      (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
-- 
2.22.0

Message #8 received at 36999 <at> debbugs.gnu.org (full text, mbox):

From: Brian Leung <bkleung89 <at> gmail.com>
To: 36999 <at> debbugs.gnu.org, Oleg Pykhalov <go.wigust <at> gmail.com>
Subject: re: [bug#36999] [PATCH] gnu: Add emacs-forge.
Date: Sun, 11 Aug 2019 19:39:09 +0200

[Message part 1 (text/plain, inline)]

Hi Oleg,

I notice that emacs-forge, in its forge-pkg.el file, mentions newer
dependencies than what we currently have: ghub version 20190319, which
apparently contains a fix for a relevant bug; and Magit version 20190408.
I'm not sure how important the update to Magit is, and this newer version
of Magit also happens to depend on an additional package, libegit2. It
might be nice to update our version of ghub.

Best,
Brian

[Message part 2 (text/html, inline)]

Message #11 received at 36999 <at> debbugs.gnu.org (full text, mbox):

From: Brian Leung <bkleung89 <at> gmail.com>
To: 36999 <at> debbugs.gnu.org, Oleg Pykhalov <go.wigust <at> gmail.com>
Subject: Re: [bug#36999] [PATCH] gnu: Add emacs-forge.
Date: Wed, 14 Aug 2019 08:08:23 +0200

[Message part 1 (text/plain, inline)]

Hi Oleg,

I've made a patch off the latest master branch with a version of emacs-ghub
that should meet the requirements of emacs-forge.

Best,
Brian

On Sun, Aug 11, 2019 at 7:39 PM Brian Leung <bkleung89 <at> gmail.com> wrote:

> Hi Oleg,
>
> I notice that emacs-forge, in its forge-pkg.el file, mentions newer
> dependencies than what we currently have: ghub version 20190319, which
> apparently contains a fix for a relevant bug; and Magit version 20190408.
> I'm not sure how important the update to Magit is, and this newer version
> of Magit also happens to depend on an additional package, libegit2. It
> might be nice to update our version of ghub.
>
> Best,
> Brian
>

[Message part 2 (text/html, inline)]

[0001-gnu-emacs-ghub-Update-to-3.2.0-1.7d59937.patch (text/x-patch, attachment)]

Message #14 received at 36999 <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pyhalov <go.wigust <at> gmail.com>
To: Brian Leung <bkleung89 <at> gmail.com>
Cc: 36999 <at> debbugs.gnu.org, Oleg Pykhalov <go.wigust <at> gmail.com>
Subject: Re: [bug#36999] [PATCH] gnu: Add emacs-forge.
Date: Sun, 18 Aug 2019 12:26:25 +0300

[Message part 1 (text/plain, inline)]

Hi Brian,

Apologies for a delay with response.

Brian Leung <bkleung89 <at> gmail.com> writes:

> Hi Oleg,
>
> I've made a patch off the latest master branch with a version of emacs-ghub
> that should meet the requirements of emacs-forge.

Thank you!

[…]

>> I notice that emacs-forge, in its forge-pkg.el file, mentions newer
>> dependencies than what we currently have: ghub version 20190319, which
>> apparently contains a fix for a relevant bug; and Magit version 20190408.
>> I'm not sure how important the update to Magit is, and this newer version
>> of Magit also happens to depend on an additional package, libegit2. It
>> might be nice to update our version of ghub.

Unfortunately Magit update is needed, because on a GitLab instance you
could list issues but not open them to take a look on a content.

New Magit requires https://github.com/magit/libegit2 which I try to
build, but stuck.  I succeeded to build ‘libgit2.so’ and load it in
Emacs, but ‘featurep’ procedure says that feature is not loaded.

I think we should not merge partially working emacs-forge.

Regards,
Oleg.

[signature.asc (application/pgp-signature, inline)]

Message #17 received at 36999 <at> debbugs.gnu.org (full text, mbox):

From: Kyle Meyer <kyle <at> kyleam.com>
To: Oleg Pyhalov <go.wigust <at> gmail.com>, Brian Leung <bkleung89 <at> gmail.com>
Cc: 36999 <at> debbugs.gnu.org
Subject: Re: [bug#36999] [PATCH] gnu: Add emacs-forge.
Date: Sun, 18 Aug 2019 10:07:48 -0400

Hi Oleg,

Oleg Pyhalov <go.wigust <at> gmail.com> writes:

[...]

> New Magit requires https://github.com/magit/libegit2 which I try to
> build, but stuck.  I succeeded to build ‘libgit2.so’ and load it in
> Emacs, but ‘featurep’ procedure says that feature is not loaded.

I haven't been following this thread closely, but in case it's useful:
Building Magit should work without libegit2 if you set
BUILD_MAGIT_LIBGIT to false.

-- 
Kyle

Message #20 received at 36999 <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pyhalov <go.wigust <at> gmail.com>
To: Kyle Meyer <kyle <at> kyleam.com>
Cc: Oleg Pyhalov <go.wigust <at> gmail.com>, 36999 <at> debbugs.gnu.org,
 Brian Leung <bkleung89 <at> gmail.com>
Subject: Re: [bug#36999] [PATCH] gnu: Add emacs-forge.
Date: Sun, 18 Aug 2019 18:49:29 +0300

[Message part 1 (text/plain, inline)]

Hi Kyle,

Kyle Meyer <kyle <at> kyleam.com> writes:

> Hi Oleg,
>
> Oleg Pyhalov <go.wigust <at> gmail.com> writes:
>
> [...]
>
>> New Magit requires https://github.com/magit/libegit2 which I try to
>> build, but stuck.  I succeeded to build ‘libgit2.so’ and load it in
>> Emacs, but ‘featurep’ procedure says that feature is not loaded.

I mean ‘libegit2.so’, apologies for a typo.

> I haven't been following this thread closely, but in case it's useful:
> Building Magit should work without libegit2 if you set
> BUILD_MAGIT_LIBGIT to false.

Oh, nice.  Apparently we could avoid libegit2 at all for now.  I get a
working Forge by finding a commit in Magit which intoduced a procedure
required to open GitLab issue content.

I need a time to test Magit and Forge behavior for some days and could
merge it if no issues discovered.  Latest patches attached here.

[0001-gnu-emacs-ghub-Update-to-3.2.0-1.7d59937.patch (text/x-patch, inline)]

From 6f4ab7861321232c8786446904df4ffc53323bf9 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89 <at> gmail.com>
Date: Wed, 14 Aug 2019 08:04:20 +0200
Subject: [PATCH 1/3] gnu: emacs-ghub: Update to 3.2.0-1.7d59937.

* gnu/packages/emacs-xyz.scm (emacs-ghub): Update to 3.2.0-1.7d59937.

Signed-off-by: Oleg Pykhalov <go.wigust <at> gmail.com>
---
 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 adab7d87d2..82c811a2d6 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -521,39 +521,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 "7d59937d7782d0062216130a4d059b45e8396f82")
+        (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
+                  "1ngb61nij9gznqplwg1fmr1vq1czry759hmdibzngl4wqhxpfsjq"))))
+      (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 "34e9e5edb921813b6483e0fefa848efb6ee4b314")
-- 
2.22.1

[0002-gnu-emacs-magit-Update-to-2.90.1-1.c761d28.patch (text/x-patch, inline)]

From 1fa9f804e62aadcd693aac2edf17ae65bc8f2544 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust <at> gmail.com>
Date: Wed, 14 Aug 2019 23:12:48 +0300
Subject: [PATCH 2/3] gnu: emacs-magit: Update to 2.90.1-1.c761d28.

* gnu/packages/emacs-xyz.scm (emacs-magit): Update to 2.90.1-1.c761d28.
---
 gnu/packages/emacs-xyz.scm | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 82c811a2d6..b483f42032 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -262,21 +262,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)))
-- 
2.22.1

[0003-gnu-Add-emacs-forge.patch (text/x-patch, inline)]

From b3c501b00ba335ef9182ecfb1345b014feab9af3 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust <at> gmail.com>
Date: Sat, 10 Aug 2019 19:17:12 +0300
Subject: [PATCH 3/3] gnu: Add emacs-forge.

* 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 b483f42032..d907ee5375 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15856,6 +15856,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 "a60bd64056ec910fdbd1400dd8f583b8eec6145b"))
+    (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
+           "1dhpsnb82mxpv3krf3apsbcirlcizw3g9gac9sfn0fad20qjwpgj"))))
+      (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
-- 
2.22.1

[signature.asc (application/pgp-signature, inline)]

Message #23 received at 36999 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Oleg Pyhalov <go.wigust <at> gmail.com>
Cc: 36999 <at> debbugs.gnu.org, Kyle Meyer <kyle <at> kyleam.com>,
 Brian Leung <bkleung89 <at> gmail.com>
Subject: Re: [bug#36999] [PATCH] gnu: Add emacs-forge.
Date: Tue, 10 Sep 2019 23:51:16 +0200

Hi Oleg,

Oleg Pyhalov <go.wigust <at> gmail.com> skribis:

> Oh, nice.  Apparently we could avoid libegit2 at all for now.  I get a
> working Forge by finding a commit in Magit which intoduced a procedure
> required to open GitLab issue content.
>
> I need a time to test Magit and Forge behavior for some days and could
> merge it if no issues discovered.  Latest patches attached here.

Did you have a chance to test them?  Looks like you could probably push
these patches, no?

(See <https://issues.guix.gnu.org/issue/36999>.)

Thanks,
Ludo’.

Message #26 received at 36999 <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: 36999 <at> debbugs.gnu.org
Cc: Oleg Pykhalov <go.wigust <at> gmail.com>
Subject: [PATCH 0/4] More test and then merge to master
Date: Sat,  5 Oct 2019 22:19:25 +0300

Hi,

Apologies for a delay.

I have issue with a broken magit ‘magit-copy-buffer-revision’ procedure and
then the forge broked after Emacs upgrade to 26.3.  I've fixed both issues and
need more time for test before pushing to master.

Oleg Pykhalov (4):
  gnu: emacs-magit: Update to 2.90.1-1.c761d28.
  gnu: emacs-ghub: Update to 3.2.0-1.cf0b13a.
  gnu: emacs-closql: Update to 1.0.0-1.70b98db.
  gnu: Add emacs-forge.

 gnu/packages/emacs-xyz.scm | 235 ++++++++++++++++++++++++++++---------
 1 file changed, 179 insertions(+), 56 deletions(-)

-- 
2.23.0

Message #29 received at 36999 <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: 36999 <at> debbugs.gnu.org
Cc: Oleg Pykhalov <go.wigust <at> gmail.com>
Subject: [PATCH 1/4] gnu: emacs-magit: Update to 2.90.1-1.c761d28.
Date: Sat,  5 Oct 2019 22:19:26 +0300

* 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
-- 
2.23.0

Message #32 received at 36999 <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: 36999 <at> debbugs.gnu.org
Cc: Oleg Pykhalov <go.wigust <at> gmail.com>
Subject: [PATCH 2/4] gnu: emacs-ghub: Update to 3.2.0-1.cf0b13a.
Date: Sat,  5 Oct 2019 22:19:27 +0300

* 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")
-- 
2.23.0

Message #35 received at 36999 <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: 36999 <at> debbugs.gnu.org
Cc: Oleg Pykhalov <go.wigust <at> gmail.com>
Subject: [PATCH 3/4] gnu: emacs-closql: Update to 1.0.0-1.70b98db.
Date: Sat,  5 Oct 2019 22:19:28 +0300

* 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.
-- 
2.23.0

Message #38 received at 36999 <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: 36999 <at> debbugs.gnu.org
Cc: Oleg Pykhalov <go.wigust <at> gmail.com>
Subject: [PATCH 4/4] gnu: Add emacs-forge.
Date: Sat,  5 Oct 2019 22:19:29 +0300

* 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
-- 
2.23.0

Message #41 received at 36999 <at> debbugs.gnu.org (full text, mbox):

From: Kyle Meyer <kyle <at> kyleam.com>
To: 36999 <at> debbugs.gnu.org
Cc: Oleg Pykhalov <go.wigust <at> gmail.com>
Subject: Re: [bug#36999] [PATCH 1/4] gnu: emacs-magit: Update to
 2.90.1-1.c761d28.
Date: Sun, 06 Oct 2019 21:03:45 -0400

Hi Oleg,

Oleg Pykhalov <go.wigust <at> gmail.com> writes:

>           #: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))

I didn't spot an explanation in either the commit message or comments
about what problem this patch phase is addressing.  If it's still an
issue with Magit's current master, would you please submit an issue
upstream?  If it's not, why not just go with a newer Magit revision?

-- 
Kyle

Message #44 received at 36999 <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pyhalov <go.wigust <at> gmail.com>
To: Kyle Meyer <kyle <at> kyleam.com>
Cc: 36999 <at> debbugs.gnu.org
Subject: Re: [bug#36999] [PATCH 1/4] gnu: emacs-magit: Update to
 2.90.1-1.c761d28.
Date: Mon, 07 Oct 2019 11:01:53 +0300

[Message part 1 (text/plain, inline)]

Hi Kyle,

Kyle Meyer <kyle <at> kyleam.com> writes:

[…]

> I didn't spot an explanation in either the commit message or comments
> about what problem this patch phase is addressing.  If it's still an
> issue with Magit's current master

Wrong argument type while calling magit-copy-buffer-revision.

magit-copy-buffer-revision is different in master.

> If it's not, why not just go with a newer Magit revision?

Sorry, what revision do you mean?  

I tried stick closer to release v2.90.1 because of compatibility with
other packages which require Magit.

[signature.asc (application/pgp-signature, inline)]

Message #47 received at 36999 <at> debbugs.gnu.org (full text, mbox):

From: Kyle Meyer <kyle <at> kyleam.com>
To: Oleg Pyhalov <go.wigust <at> gmail.com>
Cc: 36999 <at> debbugs.gnu.org
Subject: Re: [bug#36999] [PATCH 1/4] gnu: emacs-magit: Update to
 2.90.1-1.c761d28.
Date: Mon, 07 Oct 2019 09:21:45 -0400

Oleg Pyhalov <go.wigust <at> gmail.com> writes:

> Hi Kyle,
>
> Kyle Meyer <kyle <at> kyleam.com> writes:
>
> […]
>
>> I didn't spot an explanation in either the commit message or comments
>> about what problem this patch phase is addressing.  If it's still an
>> issue with Magit's current master
>
> Wrong argument type while calling magit-copy-buffer-revision.
>
> magit-copy-buffer-revision is different in master.
>
>> If it's not, why not just go with a newer Magit revision?
>
> Sorry, what revision do you mean?  

Sorry for not being clear.  I meant why not build the package from a
later commit in Magit that doesn't show the issue.  Anyway, you answered
that next.  Thanks.

> I tried stick closer to release v2.90.1 because of compatibility with
> other packages which require Magit.

I see.

Message #50 received at 36999 <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: 36999 <at> debbugs.gnu.org
Cc: 36999-done <at> debbugs.gnu.org
Subject: emacs-forge pushed to master
Date: Sun, 13 Oct 2019 22:45:50 +0300

[Message part 1 (text/plain, inline)]

Hi.

I didn't notice any issue with Magit and Forge.  Pushed to master.

Thank you for help to package them and your suggestions!

Oleg.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.