unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#43211] [PATCH] gnu: emacs-lice-el: Update to 0.2-2.482e58a.
@ 2020-09-05  8:12 Michael Rohleder
  2020-09-06  8:36 ` Oleg Pykhalov
  0 siblings, 1 reply; 5+ messages in thread
From: Michael Rohleder @ 2020-09-05  8:12 UTC (permalink / raw)
  To: 43211; +Cc: Michael Rohleder

* 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





^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [bug#43211] [PATCH] gnu: emacs-lice-el: Update to 0.2-2.482e58a.
  2020-09-05  8:12 [bug#43211] [PATCH] gnu: emacs-lice-el: Update to 0.2-2.482e58a Michael Rohleder
@ 2020-09-06  8:36 ` Oleg Pykhalov
  2020-09-06  9:47   ` Michael Rohleder
  2020-09-17 17:44   ` Michael Rohleder
  0 siblings, 2 replies; 5+ messages in thread
From: Oleg Pykhalov @ 2020-09-06  8:36 UTC (permalink / raw)
  To: Michael Rohleder; +Cc: 43211

Hi,

Michael Rohleder <mike@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.




^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#43211] [PATCH] gnu: emacs-lice-el: Update to 0.2-2.482e58a.
  2020-09-06  8:36 ` Oleg Pykhalov
@ 2020-09-06  9:47   ` Michael Rohleder
  2020-09-17 17:44   ` Michael Rohleder
  1 sibling, 0 replies; 5+ messages in thread
From: Michael Rohleder @ 2020-09-06  9:47 UTC (permalink / raw)
  To: Oleg Pykhalov; +Cc: 43211


[-- Attachment #1.1: Type: text/plain, Size: 390 bytes --]

Hi Oleg,

Oleg Pykhalov <go.wigust@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!


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: [PATCH] emacs-lice-el: Update to 0.2-2.482e58a. --]
[-- Type: text/x-patch, Size: 2500 bytes --]

From f2099ef8870380fd3c3fd37a4b55fe3b8a556216 Mon Sep 17 00:00:00 2001
From: Michael Rohleder <mike@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


[-- Attachment #1.3: Type: text/plain, Size: 96 bytes --]


Thanks!

-- 
Good decisions come from experience, and experience come from bad decisions.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 511 bytes --]

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [bug#43211] [PATCH] gnu: emacs-lice-el: Update to 0.2-2.482e58a.
  2020-09-06  8:36 ` Oleg Pykhalov
  2020-09-06  9:47   ` Michael Rohleder
@ 2020-09-17 17:44   ` Michael Rohleder
  2020-09-22  8:56     ` bug#43211: " Nicolas Goaziou
  1 sibling, 1 reply; 5+ messages in thread
From: Michael Rohleder @ 2020-09-17 17:44 UTC (permalink / raw)
  To: Oleg Pykhalov; +Cc: 43211


[-- Attachment #1.1: Type: text/plain, Size: 46 bytes --]

Here is a rebased (to current master) patch.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: emacs-lice-el: Update to 0.2-2.482e58a. --]
[-- Type: text/x-patch, Size: 2502 bytes --]

> From bc2163d6da160b58591f77f352cf4ea8543454e2 Mon Sep 17 00:00:00 2001
From: Michael Rohleder <mike@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


[-- Attachment #1.3: Type: text/plain, Size: 84 bytes --]


-- 
The proper basis for marriage is a mutual misunderstanding.
   Oscar Wilde

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 511 bytes --]

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* bug#43211: [PATCH] gnu: emacs-lice-el: Update to 0.2-2.482e58a.
  2020-09-17 17:44   ` Michael Rohleder
@ 2020-09-22  8:56     ` Nicolas Goaziou
  0 siblings, 0 replies; 5+ messages in thread
From: Nicolas Goaziou @ 2020-09-22  8:56 UTC (permalink / raw)
  To: Michael Rohleder; +Cc: Oleg Pykhalov, 43211-done

Hello,

Michael Rohleder <mike@rohleder.de> writes:

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

Applied. Thank you.

Regards,
-- 
Nicolas Goaziou




^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-09-22  9:18 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-05  8:12 [bug#43211] [PATCH] gnu: emacs-lice-el: Update to 0.2-2.482e58a Michael Rohleder
2020-09-06  8:36 ` Oleg Pykhalov
2020-09-06  9:47   ` Michael Rohleder
2020-09-17 17:44   ` Michael Rohleder
2020-09-22  8:56     ` bug#43211: " Nicolas Goaziou

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).