GNU bug report logs - #43211
[PATCH] gnu: emacs-lice-el: Update to 0.2-2.482e58a.

Previous Next

Package: guix-patches;

Reported by: Michael Rohleder <mike <at> rohleder.de>

Date: Sat, 5 Sep 2020 08:13:02 UTC

Severity: normal

Tags: patch

Done: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>

Bug is archived. No further changes may be made.

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

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

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#43211; Package guix-patches. (Sat, 05 Sep 2020 08:13:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Michael Rohleder <mike <at> rohleder.de>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Sat, 05 Sep 2020 08:13:02 GMT) Full text and rfc822 format available.

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

From: Michael Rohleder <mike <at> rohleder.de>
To: guix-patches <at> gnu.org
Cc: Michael Rohleder <mike <at> rohleder.de>
Subject: [PATCH] gnu: emacs-lice-el: Update to 0.2-2.482e58a.
Date: Sat,  5 Sep 2020 10:12:05 +0200
* gnu/packages/emacs-xyz.scm (emacs-lice-el): Update to 0.2-2.482e58a.
[arguments]: Add phase 'install-templates.
---
 gnu/packages/emacs-xyz.scm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index d9716ba91c..a5a5e72411 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15890,10 +15890,10 @@ Magit.")
     (license license:gpl3+)))
 
 (define-public emacs-lice-el
-  (let ((commit "4339929927c62bd636f89bb39ea999d18d269250"))
+  (let ((commit "482e58ab83fff86ed754b00be27b62a219597e7c"))
     (package
       (name "emacs-lice-el")
-      (version (git-version "0.2" "1" commit))
+      (version (git-version "0.2" "2" commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -15902,8 +15902,18 @@ Magit.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0879z761b7gajkhq176ps745xpdrivch349crransv8fnsc759yb"))))
+                  "0yxkjyhfk8kpr8yqz54gdx6xwkj4s8bnbz60162jh12crj0bs5n7"))))
       (build-system emacs-build-system)
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (add-after 'install 'install-templates
+             (lambda* (#:key outputs #:allow-other-keys)
+               (copy-recursively
+                "template"
+                (string-append (assoc-ref outputs "out")
+                               "/share/emacs/site-lisp/template"))
+               #t)))))
       (home-page "https://github.com/buzztaiki/lice-el")
       (synopsis "License and header template for Emacs")
       (description "@code{lice.el} provides following features:
-- 
2.28.0





Information forwarded to guix-patches <at> gnu.org:
bug#43211; Package guix-patches. (Sun, 06 Sep 2020 08:37:01 GMT) Full text and rfc822 format available.

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

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: Michael Rohleder <mike <at> rohleder.de>
Cc: 43211 <at> debbugs.gnu.org
Subject: Re: [bug#43211] [PATCH] gnu: emacs-lice-el: Update to 0.2-2.482e58a.
Date: Sun, 06 Sep 2020 11:36:22 +0300
Hi,

Michael Rohleder <mike <at> rohleder.de> writes:

> * gnu/packages/emacs-xyz.scm (emacs-lice-el): Update to 0.2-2.482e58a.
> [arguments]: Add phase 'install-templates.
> ---
>  gnu/packages/emacs-xyz.scm | 16 +++++++++++++---
>  1 file changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
> index d9716ba91c..a5a5e72411 100644
> --- a/gnu/packages/emacs-xyz.scm
> +++ b/gnu/packages/emacs-xyz.scm
> @@ -15890,10 +15890,10 @@ Magit.")
>      (license license:gpl3+)))
>  
>  (define-public emacs-lice-el
[…]
> +      (arguments
> +       `(#:phases
> +         (modify-phases %standard-phases
> +           (add-after 'install 'install-templates
> +             (lambda* (#:key outputs #:allow-other-keys)
> +               (copy-recursively
> +                "template"
> +                (string-append (assoc-ref outputs "out")
> +                               "/share/emacs/site-lisp/template"))
> +               #t)))))
>        (home-page "https://github.com/buzztaiki/lice-el")
>        (synopsis "License and header template for Emacs")
>        (description "@code{lice.el} provides following features:

The ‘site-lisp’ is not an appropriate place for this data.  It's better
to install those files in [1] directory, and substitute ‘lice.el’
accordingly so it could find them.

[1] /gnu/store/...emacs-lice-el.../share/emacs-lice-el/template

Could you update the patch with this change, please?


Thanks,
Oleg.




Information forwarded to guix-patches <at> gnu.org:
bug#43211; Package guix-patches. (Sun, 06 Sep 2020 09:48:01 GMT) Full text and rfc822 format available.

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

From: Michael Rohleder <mike <at> rohleder.de>
To: Oleg Pykhalov <go.wigust <at> gmail.com>
Cc: 43211 <at> debbugs.gnu.org
Subject: Re: [bug#43211] [PATCH] gnu: emacs-lice-el: Update to 0.2-2.482e58a.
Date: Sun, 06 Sep 2020 11:47:19 +0200
[Message part 1 (text/plain, inline)]
Hi Oleg,

Oleg Pykhalov <go.wigust <at> gmail.com> writes:
> The ‘site-lisp’ is not an appropriate place for this data.  It's better
> to install those files in [1] directory, and substitute ‘lice.el’
> accordingly so it could find them.
>
> [1] /gnu/store/...emacs-lice-el.../share/emacs-lice-el/template
>
> Could you update the patch with this change, please?

Ah, yes!

[0001-gnu-emacs-lice-el-Update-to-0.2-2.482e58a.patch (text/x-patch, inline)]
From f2099ef8870380fd3c3fd37a4b55fe3b8a556216 Mon Sep 17 00:00:00 2001
From: Michael Rohleder <mike <at> rohleder.de>
Date: Sun, 6 Sep 2020 11:30:57 +0200
Subject: [PATCH] gnu: emacs-lice-el: Update to 0.2-2.482e58a.

* gnu/packages/emacs-xyz.scm (emacs-lice-el): Update to 0.2-2.482e58a.
[arguments]: Add phase 'patch-template-directory and 'install-templates.
---
 gnu/packages/emacs-xyz.scm | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 1d890407cc..76488c0de0 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15891,10 +15891,10 @@ Magit.")
     (license license:gpl3+)))
 
 (define-public emacs-lice-el
-  (let ((commit "4339929927c62bd636f89bb39ea999d18d269250"))
+  (let ((commit "482e58ab83fff86ed754b00be27b62a219597e7c"))
     (package
       (name "emacs-lice-el")
-      (version (git-version "0.2" "1" commit))
+      (version (git-version "0.2" "2" commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -15903,8 +15903,26 @@ Magit.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0879z761b7gajkhq176ps745xpdrivch349crransv8fnsc759yb"))))
+                  "0yxkjyhfk8kpr8yqz54gdx6xwkj4s8bnbz60162jh12crj0bs5n7"))))
       (build-system emacs-build-system)
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'patch-template-directory
+             (lambda* (#:key outputs #:allow-other-keys)
+               (chmod "lice.el" #o666)
+               (emacs-substitute-variables "lice.el"
+                 ("lice:system-template-directory"
+                  (string-append (assoc-ref outputs "out")
+                                 "/share/emacs-lice-el/template")))
+               #t))
+           (add-after 'install 'install-templates
+             (lambda* (#:key outputs #:allow-other-keys)
+               (copy-recursively
+                "template"
+                (string-append (assoc-ref outputs "out")
+                               "/share/emacs-lice-el/template"))
+               #t)))))
       (home-page "https://github.com/buzztaiki/lice-el")
       (synopsis "License and header template for Emacs")
       (description "@code{lice.el} provides following features:
-- 
2.28.0

[Message part 3 (text/plain, inline)]
Thanks!

-- 
Good decisions come from experience, and experience come from bad decisions.
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#43211; Package guix-patches. (Thu, 17 Sep 2020 17:45:01 GMT) Full text and rfc822 format available.

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

From: Michael Rohleder <mike <at> rohleder.de>
To: Oleg Pykhalov <go.wigust <at> gmail.com>
Cc: 43211 <at> debbugs.gnu.org
Subject: Re: [bug#43211] [PATCH] gnu: emacs-lice-el: Update to 0.2-2.482e58a.
Date: Thu, 17 Sep 2020 19:44:33 +0200
[Message part 1 (text/plain, inline)]
Here is a rebased (to current master) patch.

[0001-gnu-emacs-lice-el-Update-to-0.2-2.482e58a.patch (text/x-patch, inline)]
> From bc2163d6da160b58591f77f352cf4ea8543454e2 Mon Sep 17 00:00:00 2001
From: Michael Rohleder <mike <at> rohleder.de>
Date: Sun, 6 Sep 2020 11:30:57 +0200
Subject: [PATCH] gnu: emacs-lice-el: Update to 0.2-2.482e58a.

* gnu/packages/emacs-xyz.scm (emacs-lice-el): Update to 0.2-2.482e58a.
[arguments]: Add phase 'patch-template-directory and 'install-templates.
---
 gnu/packages/emacs-xyz.scm | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ae95b15c12..f0b3bb8970 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15987,10 +15987,10 @@ Magit.")
     (license license:gpl3+)))
 
 (define-public emacs-lice-el
-  (let ((commit "4339929927c62bd636f89bb39ea999d18d269250"))
+  (let ((commit "482e58ab83fff86ed754b00be27b62a219597e7c"))
     (package
       (name "emacs-lice-el")
-      (version (git-version "0.2" "1" commit))
+      (version (git-version "0.2" "2" commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -15999,8 +15999,26 @@ Magit.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0879z761b7gajkhq176ps745xpdrivch349crransv8fnsc759yb"))))
+                  "0yxkjyhfk8kpr8yqz54gdx6xwkj4s8bnbz60162jh12crj0bs5n7"))))
       (build-system emacs-build-system)
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'patch-template-directory
+             (lambda* (#:key outputs #:allow-other-keys)
+               (chmod "lice.el" #o666)
+               (emacs-substitute-variables "lice.el"
+                 ("lice:system-template-directory"
+                  (string-append (assoc-ref outputs "out")
+                                 "/share/emacs-lice-el/template")))
+               #t))
+           (add-after 'install 'install-templates
+             (lambda* (#:key outputs #:allow-other-keys)
+               (copy-recursively
+                "template"
+                (string-append (assoc-ref outputs "out")
+                               "/share/emacs-lice-el/template"))
+               #t)))))
       (home-page "https://github.com/buzztaiki/lice-el")
       (synopsis "License and header template for Emacs")
       (description "@code{lice.el} provides following features:
-- 
2.28.0

[Message part 3 (text/plain, inline)]
-- 
The proper basis for marriage is a mutual misunderstanding.
   Oscar Wilde
[signature.asc (application/pgp-signature, inline)]

Reply sent to Nicolas Goaziou <mail <at> nicolasgoaziou.fr>:
You have taken responsibility. (Tue, 22 Sep 2020 08:57:02 GMT) Full text and rfc822 format available.

Notification sent to Michael Rohleder <mike <at> rohleder.de>:
bug acknowledged by developer. (Tue, 22 Sep 2020 08:57:02 GMT) Full text and rfc822 format available.

Message #19 received at 43211-done <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Michael Rohleder <mike <at> rohleder.de>
Cc: Oleg Pykhalov <go.wigust <at> gmail.com>, 43211-done <at> debbugs.gnu.org
Subject: Re: [bug#43211] [PATCH] gnu: emacs-lice-el: Update to 0.2-2.482e58a.
Date: Tue, 22 Sep 2020 10:56:25 +0200
Hello,

Michael Rohleder <mike <at> rohleder.de> writes:

> Subject: [PATCH] gnu: emacs-lice-el: Update to 0.2-2.482e58a.

Applied. Thank you.

Regards,
-- 
Nicolas Goaziou




bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Tue, 20 Oct 2020 11:24:05 GMT) Full text and rfc822 format available.

This bug report was last modified 3 years and 188 days ago.

Previous Next


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