* [bug#62488] [PATCH] Update emacs-lemon
@ 2023-03-27 16:33 Baptiste Strazzulla
2023-03-27 17:23 ` Nicolas Goaziou
0 siblings, 1 reply; 4+ messages in thread
From: Baptiste Strazzulla @ 2023-03-27 16:33 UTC (permalink / raw)
To: 62488
[-- Attachment #1.1: Type: text/plain, Size: 2 bytes --]
[-- Attachment #1.2: Type: text/html, Size: 398 bytes --]
[-- Attachment #2: 0001-gnu-emacs-lemon-Update-to-2.1.0.patch --]
[-- Type: application/octet-stream, Size: 1970 bytes --]
From 9951f6a2a48e08fa870eb379642d38c53e67df72 Mon Sep 17 00:00:00 2001
From: Zzull <bstrazzull@hotmail.fr>
Date: Mon, 27 Mar 2023 18:28:01 +0200
Subject: [PATCH] gnu: emacs-lemon: Update to 2.1.0.
* gnu/packages/emacs-xyz.scm (emacs-lemon-version): Update to 2.1.0
---
gnu/packages/emacs-xyz.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0a679c7167..70ffad21a4 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -49,7 +49,7 @@
;;; Copyright © 2019, 2020, 2021 Joseph LaFreniere <joseph@lafreniere.xyz>
;;; Copyright © 2019 Todor Kondić <tk.code@protonmail.com>15669
;;; Copyright © 2019 Amar Singh <nly@disroot.org>
-;;; Copyright © 2019, 2022 Baptiste Strazzulla <bstrazzull@hotmail.fr>
+;;; Copyright © 2019, 2022, 2023 Baptiste Strazzulla <bstrazzull@hotmail.fr>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk>
;;; Copyright © 2019, 2020 Amin Bandali <bandali@gnu.org>
@@ -4664,11 +4664,11 @@ (define-public emacs-symon
(license license:gpl2+)))
(define-public emacs-lemon
- (let ((commit "37a6e6d6ef0900ca19c820a2dbc122c7fe6d86cf")
+ (let ((commit "b10e992a25757a91723c7d554a5fa8e14291e702")
(revision "0"))
(package
(name "emacs-lemon")
- (version (git-version "2.0.0" revision commit))
+ (version (git-version "2.1.0" revision commit))
(source
(origin
(method git-fetch)
@@ -4677,7 +4677,7 @@ (define-public emacs-lemon
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "0bc77vzi4p6mlzmhgybbldlpcsiiv4xqrd5lnc7wzvmxv8byhqpm"))))
+ (base32 "18yclk2zzqcahzhz2kq8g9gy1xnnxiy6rxs2lwhskj475kvwy2f9"))))
(build-system emacs-build-system)
(native-inputs
(list emacs-blight emacs-emms))
--
2.39.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#62488] [PATCH] Update emacs-lemon
2023-03-27 16:33 [bug#62488] [PATCH] Update emacs-lemon Baptiste Strazzulla
@ 2023-03-27 17:23 ` Nicolas Goaziou
2023-03-29 0:06 ` Baptiste Strazzulla
0 siblings, 1 reply; 4+ messages in thread
From: Nicolas Goaziou @ 2023-03-27 17:23 UTC (permalink / raw)
To: Baptiste Strazzulla; +Cc: 62488
Hello,
Baptiste Strazzulla <bstrazzull@hotmail.fr> writes:
> * gnu/packages/emacs-xyz.scm (emacs-lemon-version): Update to 2.1.0
Thank you.
> (define-public emacs-lemon
> - (let ((commit "37a6e6d6ef0900ca19c820a2dbc122c7fe6d86cf")
> + (let ((commit "b10e992a25757a91723c7d554a5fa8e14291e702")
> (revision "0"))
> (package
> (name "emacs-lemon")
> - (version (git-version "2.0.0" revision commit))
> + (version (git-version "2.1.0" revision commit))
Since the commit matches the version bump, you can drop the `revision'
binding and `git-version' call. Version is simply "2.1.0". Could you
send an updated patch?
I noticed the package contains some tests. Would you try to run them, in
a subsequent patch?
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#62488] [PATCH] Update emacs-lemon
2023-03-27 17:23 ` Nicolas Goaziou
@ 2023-03-29 0:06 ` Baptiste Strazzulla
2023-03-30 10:37 ` bug#62488: " Nicolas Goaziou
0 siblings, 1 reply; 4+ messages in thread
From: Baptiste Strazzulla @ 2023-03-29 0:06 UTC (permalink / raw)
To: Nicolas Goaziou; +Cc: 62488@debbugs.gnu.org
[-- Attachment #1.1: Type: text/plain, Size: 1159 bytes --]
Hello,
Here is two requested updates to the patch
Kind regards,
Baptiste
________________________________
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Sent: Monday, March 27, 2023 5:23 PM
To: Baptiste Strazzulla <bstrazzull@hotmail.fr>
Cc: 62488@debbugs.gnu.org <62488@debbugs.gnu.org>
Subject: Re: [bug#62488] [PATCH] Update emacs-lemon
Hello,
Baptiste Strazzulla <bstrazzull@hotmail.fr> writes:
> * gnu/packages/emacs-xyz.scm (emacs-lemon-version): Update to 2.1.0
Thank you.
> (define-public emacs-lemon
> - (let ((commit "37a6e6d6ef0900ca19c820a2dbc122c7fe6d86cf")
> + (let ((commit "b10e992a25757a91723c7d554a5fa8e14291e702")
> (revision "0"))
> (package
> (name "emacs-lemon")
> - (version (git-version "2.0.0" revision commit))
> + (version (git-version "2.1.0" revision commit))
Since the commit matches the version bump, you can drop the `revision'
binding and `git-version' call. Version is simply "2.1.0". Could you
send an updated patch?
I noticed the package contains some tests. Would you try to run them, in
a subsequent patch?
Regards,
--
Nicolas Goaziou
[-- Attachment #1.2: Type: text/html, Size: 3280 bytes --]
[-- Attachment #2: 0001-gnu-emacs-lemon-Update-to-2.1.0.patch --]
[-- Type: application/octet-stream, Size: 8829 bytes --]
From 1be9d8560983a3dea2b0814a52b48557a3ed6f6e Mon Sep 17 00:00:00 2001
From: Zzull <bstrazzull@hotmail.fr>
Date: Mon, 27 Mar 2023 18:28:01 +0200
Subject: [PATCH 1/2] gnu: emacs-lemon: Update to 2.1.0.
* gnu/packages/emacs-xyz.scm (emacs-lemon-version): Update to 2.1.0
---
gnu/packages/emacs-xyz.scm | 112 ++++++++++++++++++-------------------
1 file changed, 55 insertions(+), 57 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index da2856abc8..0fb31f74f7 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -49,7 +49,7 @@
;;; Copyright © 2019, 2020, 2021 Joseph LaFreniere <joseph@lafreniere.xyz>
;;; Copyright © 2019 Todor Kondić <tk.code@protonmail.com>15669
;;; Copyright © 2019 Amar Singh <nly@disroot.org>
-;;; Copyright © 2019, 2022 Baptiste Strazzulla <bstrazzull@hotmail.fr>
+;;; Copyright © 2019, 2022, 2023 Baptiste Strazzulla <bstrazzull@hotmail.fr>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk>
;;; Copyright © 2019, 2020 Amin Bandali <bandali@gnu.org>
@@ -5363,33 +5363,31 @@ (define-public emacs-symon
(license license:gpl2+)))
(define-public emacs-lemon
- (let ((commit "37a6e6d6ef0900ca19c820a2dbc122c7fe6d86cf")
- (revision "0"))
- (package
- (name "emacs-lemon")
- (version (git-version "2.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://codeberg.org/emacs-weirdware/lemon")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0bc77vzi4p6mlzmhgybbldlpcsiiv4xqrd5lnc7wzvmxv8byhqpm"))))
- (build-system emacs-build-system)
- (native-inputs
- (list emacs-blight emacs-emms))
- (propagated-inputs
- (list emacs-s))
- (home-page "https://codeberg.org/emacs-weirdware/lemon")
- (synopsis "System monitors in the echo area")
- (description
- "Lemon is a tiny system monitor which displays system information in
+ (package
+ (name "emacs-lemon")
+ (version "2.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://codeberg.org/emacs-weirdware/lemon")
+ (commit "b10e992a25757a91723c7d554a5fa8e14291e702")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "18yclk2zzqcahzhz2kq8g9gy1xnnxiy6rxs2lwhskj475kvwy2f9"))))
+ (build-system emacs-build-system)
+ (native-inputs
+ (list emacs-blight emacs-emms))
+ (propagated-inputs
+ (list emacs-s))
+ (home-page "https://codeberg.org/emacs-weirdware/lemon")
+ (synopsis "System monitors in the echo area")
+ (description
+ "Lemon is a tiny system monitor which displays system information in
the echo area when Emacs is has been idle for a few seconds. This is a fork
of zk_phi’s Symon, which has been largely rewritten. It works nicely with
EXWM.")
- (license license:gpl3+))))
+ (license license:gpl3+)))
(define-public emacs-sx
(let ((version "20191229")
@@ -7144,7 +7142,7 @@ (define-public emacs-mode-line-idle
;; Package has no release. Version is extracted from "Version:" keyword in
;; main file.
(let ((commit "02b1da6278e43cc9cc0356110cc6bfbb37eb8241")
- (revision "1"))
+ (revision "1"))
(package
(name "emacs-mode-line-idle")
(version (git-version "0.1" revision commit))
@@ -7228,7 +7226,7 @@ (define-public emacs-smart-mode-line
(define-public emacs-sqlite
;; XXX: There is no tagged commit.
(let ((commit "dad42b8bbca4994be1871343dd18fd6528ee5797")
- (revision "0"))
+ (revision "0"))
(package
(name "emacs-sqlite")
(build-system emacs-build-system)
@@ -7237,8 +7235,8 @@ (define-public emacs-sqlite
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.com/cnngimenez/sqlite.el")
- (commit commit)))
+ (url "https://gitlab.com/cnngimenez/sqlite.el")
+ (commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "06ln4vijl8kii3nzc5cscgsadx1fqgxksflijd3ain83bn8g4wrd"))))
@@ -9023,7 +9021,7 @@ (define-public emacs-scel
(define-public emacs-soothe-theme
;; There is no named branch.
(let ((commit "0786fe70c6c1b4ddcfb932fdc6862b9611cfc09b")
- (revision "0"))
+ (revision "0"))
(package
(name "emacs-soothe-theme")
(version (git-version "20141027.2233" revision commit))
@@ -9031,11 +9029,11 @@ (define-public emacs-soothe-theme
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/emacsfodder/emacs-soothe-theme")
- (commit commit)))
+ (url "https://github.com/emacsfodder/emacs-soothe-theme")
+ (commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "10gh1hvxq9gm29r6qzlnva7vjidd7n4kih4z2ihyvbvy9za20xqw"))))
+ (base32 "10gh1hvxq9gm29r6qzlnva7vjidd7n4kih4z2ihyvbvy9za20xqw"))))
(build-system emacs-build-system)
(home-page "https://github.com/emacsfodder/emacs-soothe-theme")
(synopsis "Colorful, but muted theme for Emacs, dark background with light text")
@@ -18141,12 +18139,12 @@ (define-public emacs-ert-runner
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/rejeep/ert-runner.el")
- (commit (string-append "v" version))))
+ (url "https://github.com/rejeep/ert-runner.el")
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32
- "08gygn9fjank5gpi4v6ynrkn0jbknxbwsn7md4p9ndygdbmnkf98"))))
+ (base32
+ "08gygn9fjank5gpi4v6ynrkn0jbknxbwsn7md4p9ndygdbmnkf98"))))
(build-system emacs-build-system)
(inputs
(list emacs-ansi
@@ -18158,22 +18156,22 @@ (define-public emacs-ert-runner
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-after 'install 'install-executable
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (source-directory (string-append
- (getenv "TMPDIR") "/source")))
- (substitute* "bin/ert-runner"
- (("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)")
- (string-append "ERT_RUNNER=\"" (elpa-directory out))))
- (install-file "bin/ert-runner" (string-append out "/bin"))
- (wrap-program (string-append out "/bin/ert-runner")
- (list "EMACSLOADPATH" ":" 'prefix
- ;; Do not capture the transient source directory in
- ;; the wrapper.
- (delete source-directory
- (string-split (getenv "EMACSLOADPATH") #\:))))
- #t))))
+ (add-after 'install 'install-executable
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (source-directory (string-append
+ (getenv "TMPDIR") "/source")))
+ (substitute* "bin/ert-runner"
+ (("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)")
+ (string-append "ERT_RUNNER=\"" (elpa-directory out))))
+ (install-file "bin/ert-runner" (string-append out "/bin"))
+ (wrap-program (string-append out "/bin/ert-runner")
+ (list "EMACSLOADPATH" ":" 'prefix
+ ;; Do not capture the transient source directory in
+ ;; the wrapper.
+ (delete source-directory
+ (string-split (getenv "EMACSLOADPATH") #\:))))
+ #t))))
#:include (cons* "^reporters/.*\\.el$" %default-include)))
(home-page "https://github.com/rejeep/ert-runner.el")
(synopsis "Opinionated Ert testing workflow")
@@ -19966,8 +19964,8 @@ (define-public emacs-powershell
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/jschaf/powershell.el")
- (commit commit)))
+ (url "https://github.com/jschaf/powershell.el")
+ (commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1cxhzaaig88zhylyycvb3849r85j1ijqklnh9zbqsfl2zhpb0g5c"))))
@@ -33210,8 +33208,8 @@ (define-public emacs-helm-xref
(define-public emacs-metal-mercury-mode
(let ((commit "99e2d8fb7177cae3bfa2dec2910fc28216d5f5a8")
- (revision "1")
- (version "0.0.0"))
+ (revision "1")
+ (version "0.0.0"))
(package
(name "emacs-metal-mercury-mode")
(version (git-version version revision commit))
--
2.39.2
[-- Attachment #3: 0002-gnu-emacs-lemon-Add-tests.patch --]
[-- Type: application/octet-stream, Size: 1195 bytes --]
From 6ade7ae9d0029cd64e65047134242ac8898d75c3 Mon Sep 17 00:00:00 2001
From: Zzull <bstrazzull@hotmail.fr>
Date: Wed, 29 Mar 2023 02:02:24 +0200
Subject: [PATCH 2/2] gnu: emacs-lemon: Add tests
---
gnu/packages/emacs-xyz.scm | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0fb31f74f7..c6cd65e13c 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5376,6 +5376,17 @@ (define-public emacs-lemon
(sha256
(base32 "18yclk2zzqcahzhz2kq8g9gy1xnnxiy6rxs2lwhskj475kvwy2f9"))))
(build-system emacs-build-system)
+ (arguments
+ (list
+ #:tests? #true
+
+ ;; Only one test out of the four passes
+ #:test-command #~(list "emacs" "-Q" "--batch" "-L" "."
+ ;; "-l" "lemon--test.el"
+ ;; "-l" "lemon-monitor--test.el"
+ ;; "-l" "lemon-sparkline--test.el"
+ "-l" "lemon-time--test.el"
+ "-f" "ert-run-tests-batch-and-exit")))
(native-inputs
(list emacs-blight emacs-emms))
(propagated-inputs
--
2.39.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#62488: [PATCH] Update emacs-lemon
2023-03-29 0:06 ` Baptiste Strazzulla
@ 2023-03-30 10:37 ` Nicolas Goaziou
0 siblings, 0 replies; 4+ messages in thread
From: Nicolas Goaziou @ 2023-03-30 10:37 UTC (permalink / raw)
To: Baptiste Strazzulla; +Cc: 62488@debbugs.gnu.org
Hello,
Baptiste Strazzulla <bstrazzull@hotmail.fr> writes:
> Here is two requested updates to the patch
Applied. Thank you.
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-30 10:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-27 16:33 [bug#62488] [PATCH] Update emacs-lemon Baptiste Strazzulla
2023-03-27 17:23 ` Nicolas Goaziou
2023-03-29 0:06 ` Baptiste Strazzulla
2023-03-30 10:37 ` bug#62488: " Nicolas Goaziou
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.