From e4aad0813bf062d0cacde8e882067a9bc2019a20 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Fri, 10 Dec 2021 23:15:58 +0100 Subject: gnu: emacs-dpd: Update to 0.2.1. * gnu/packages/emacs-xyz.scm (emacs-dpd): Update to 0.2.1. --- gnu/packages/emacs-xyz.scm | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 24d0effd6a..8fc09eacd9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21399,30 +21399,27 @@ package recipes.") (license license:gpl3+))) (define-public emacs-dpd - ;; XXX: Upstream does not use tag yet. Version is extracted from "dpd.el". - (let ((commit "f53f251a58859f375617ce4f257fecc83c8ca5da") - (revision "0")) - (package - (name "emacs-dpd") - (version (git-version "0.1.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/lilyp/emacs-dpd") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1nislvaxjb53x2ah330szcca4d595npx6zxrrwa5xximj6365wk0")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-packed" ,emacs-packed))) - (home-page "https://gitlab.com/lilyp/emacs-dpd") - (synopsis "Deliver packages to package.el") - (description - "This package provides tools for generating package-desc structures and + (package + (name "emacs-dpd") + (version "0.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/lilyp/emacs-dpd") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wrqmpfcqp87dr5blpskf9kvm9slvffldqfxx77n15gcw516zzc8")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-packed" ,emacs-packed))) + (home-page "https://gitlab.com/lilyp/emacs-dpd") + (synopsis "Deliver packages to package.el") + (description + "This package provides tools for generating package-desc structures and feeding them to package.el library.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-picpocket (let ((version "41") -- cgit v1.2.3 From 01a007f46763c8ec1ccd7a560542f74585df62d3 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Fri, 26 Nov 2021 17:43:40 +0100 Subject: gnu: Add emacs-cc-mode. * gnu/packages/emacs-xyz.scm (emacs-cc-mode): New variable. --- gnu/packages/emacs-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8fc09eacd9..f2d21b758d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13862,6 +13862,39 @@ commands are bound to keys reachable with the left hand and movement keys are reached with the right hand.") (license license:gpl3+))) +(define-public emacs-cc-mode + (package + (name "emacs-cc-mode") + (version "5.35") + (source + (origin + (method hg-fetch) + (uri (hg-reference + (url "http://hg.code.sf.net/p/cc-mode/cc-mode") + (changeset + (string-append "Release_" + (string-replace-substring version "." "_"))))) + (file-name (hg-file-name name version)) + (sha256 + (base32 "03cvl61baccx57zd62nz2wy4hvij5hl2syg7byaxgrs4c7grr414")))) + (build-system emacs-build-system) + (arguments + '(#:tests? #t + #:test-command '("make" "test") + #:phases + (modify-phases %standard-phases + (add-before 'install 'make-info + (lambda _ + (invoke "make" "info")))))) + (native-inputs + `(("texinfo" ,texinfo))) + (home-page "http://cc-mode.sourceforge.net/") + (synopsis "Framework for creating major modes for C-style languages") + (description + "CC Mode is an Emacs and XEmacs mode for editing C and other languages with +similar syntax; currently C++, Objective-C, Java, CORBA's IDL, Pike, and AWK.") + (license license:gpl3+))) + (define-public emacs-csharp-mode (package (name "emacs-csharp-mode") -- cgit v1.2.3 From 60dc7a792593525e559a66a1395cb1c2514cf0c6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 11 Dec 2021 14:25:31 +0100 Subject: gnu: emacs-webpaste: Update to 3.2.2. * gnu/packages/emacs-xyz.scm (emacs-webpaste): Update to 3.2.2. --- gnu/packages/emacs-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f2d21b758d..5d2d6c158d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -29770,7 +29770,7 @@ released, and track their progress in watching a series.") (define-public emacs-webpaste (package (name "emacs-webpaste") - (version "3.2.1") + (version "3.2.2") (source (origin (method git-fetch) @@ -29779,8 +29779,7 @@ released, and track their progress in watching a series.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "1d481pdnh7cnbyka7wn59czlci63zwfqms8n515svg92qm573ckd")))) + (base32 "07hj9nr7x6c9w2dnvc58cfbprgp9cqzdxflp5qlpglzdw0bi9s3c")))) (build-system emacs-build-system) (arguments `(#:tests? #t -- cgit v1.2.3 From 2e28b450d5571ba25a45ffe131266695361aa189 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Sat, 11 Dec 2021 16:08:04 +0100 Subject: gnu: emacs-telega: Update to 0.7.15-1.b4a5e20. * gnu/packages/emacs-xyz.scm (emacs-telega-server): Update to 0.7.15-1.b4a5e20. * gnu/packages/patches/emacs-telega-path-placeholder.patch: Match patch with newer source code. * gnu/packages/patches/emacs-telega-test-env.patch: Match patch with newer source code. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 100 +++++++++++---------- .../patches/emacs-telega-path-placeholder.patch | 49 +++++----- gnu/packages/patches/emacs-telega-test-env.patch | 30 ++++--- 3 files changed, 93 insertions(+), 86 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5d2d6c158d..db2110226d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -27164,55 +27164,57 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (license license:gpl3+))) (define-public emacs-telega-server - (package - (name "emacs-telega-server") - (version "0.7.031") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/zevlg/telega.el") - (commit (string-append "v" version)))) - (sha256 - (base32 "05j82796s4k3yr0igl6hir3p8qj0cw66vvhbpbcy28d6q9v9vjjz")) - (file-name (git-file-name "emacs-telega" version)) - (patches - (search-patches "emacs-telega-path-placeholder.patch" - "emacs-telega-test-env.patch")))) - (build-system gnu-build-system) - (arguments - `(#:make-flags - (list (string-append "CC=" ,(cc-for-target)) - (string-append "INSTALL_PREFIX=" - (assoc-ref %outputs "out") "/bin")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'enter-subdirectory - (lambda _ (chdir "server") #t)) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "run_tests.py" - (("^(TELEGA_SERVER = ).*$" _all prefix) - (string-append prefix - "\"" out "/bin/telega-server\"\n")))))) - (delete 'check) - (add-after 'install 'check - (assoc-ref %standard-phases 'check)) - (add-before 'install-license-files 'leave-subdirectory - (lambda _ (chdir "..") #t))) - #:test-target "test")) - (inputs - `(("tdlib" ,tdlib) - ("libappindicator" ,libappindicator))) - (native-inputs - `(("python" ,python) - ("pkg-config" ,pkg-config))) - (home-page "https://zevlg.github.io/telega.el/") - (synopsis "Server process of Telega") - (description "Telega-server is helper program to interact with Telegram + (let ((commit "b4a5e206bd259f3d7f7633a725b2990704d6a1e8") + (revision "1")) + (package + (name "emacs-telega-server") + (version (git-version "0.7.15" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zevlg/telega.el") + (commit commit))) + (sha256 + (base32 "0gr4nmpk175hxmj357bpzaqywbjc6dmmvfxnyzkh884vyzbwdxlc")) + (file-name (git-file-name "emacs-telega" version)) + (patches + (search-patches "emacs-telega-path-placeholder.patch" + "emacs-telega-test-env.patch")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "INSTALL_PREFIX=" + (assoc-ref %outputs "out") "/bin")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'enter-subdirectory + (lambda _ (chdir "server"))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "run_tests.py" + (("^(TELEGA_SERVER = ).*$" _all prefix) + (string-append prefix + "\"" out "/bin/telega-server\"\n")))))) + (delete 'check) + (add-after 'install 'check + (assoc-ref %standard-phases 'check)) + (add-before 'install-license-files 'leave-subdirectory + (lambda _ (chdir "..")))) + #:test-target "test")) + (inputs + `(("tdlib" ,tdlib) + ("libappindicator" ,libappindicator))) + (native-inputs + `(("python" ,python) + ("pkg-config" ,pkg-config))) + (home-page "https://zevlg.github.io/telega.el/") + (synopsis "Server process of Telega") + (description "Telega-server is helper program to interact with Telegram service, and connect it with Emacs via inter-process communication.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-telega (package @@ -27246,7 +27248,7 @@ service, and connect it with Emacs via inter-process communication.") "\"" ffmpeg-bin "\")")))))) (add-after 'unpack 'configure (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "telega-server.el" + (substitute* "telega-customize.el" (("@TELEGA_SERVER_BIN@") (string-append (assoc-ref inputs "emacs-telega-server") "/bin/telega-server"))) diff --git a/gnu/packages/patches/emacs-telega-path-placeholder.patch b/gnu/packages/patches/emacs-telega-path-placeholder.patch index c20be36712..5829edd22a 100644 --- a/gnu/packages/patches/emacs-telega-path-placeholder.patch +++ b/gnu/packages/patches/emacs-telega-path-placeholder.patch @@ -1,36 +1,31 @@ -From 865b8c553722a971c68742c2e849e41eb0e2360c Mon Sep 17 00:00:00 2001 -From: Zhu Zihao -Date: Thu, 24 Jun 2021 23:43:50 +0800 -Subject: [PATCH] Replace code that search path with placeholder for - configuration. +From bf95de21faa623e48bca00d6a2c9b33ab2c5d812 Mon Sep 17 00:00:00 2001 +From: Andrew Tropin +Date: Wed, 8 Dec 2021 11:01:31 +0300 +Subject: [PATCH] Use absolute path for telega-server-command. --- - telega-server.el | 6 +----- - telega-util.el | 2 +- - 2 files changed, 2 insertions(+), 6 deletions(-) + telega-customize.el | 2 +- + telega-util.el | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/telega-server.el b/telega-server.el -index 999125d..0fa0817 100644 ---- a/telega-server.el -+++ b/telega-server.el -@@ -142,11 +142,7 @@ Otherwise query user about building flags." - (defun telega-server--find-bin () - "Find telega-server executable. - Raise error if not found." -- (let ((exec-path (cons telega-directory exec-path))) -- (or (executable-find "telega-server") -- (progn (telega-server-build) -- (executable-find "telega-server")) -- (error "`telega-server' not found in exec-path")))) -+ "@TELEGA_SERVER_BIN@") +diff --git a/telega-customize.el b/telega-customize.el +index 0af343f..cc2938c 100644 +--- a/telega-customize.el ++++ b/telega-customize.el +@@ -591,7 +591,7 @@ In range [1..3]. Use 1." + :prefix "telega-server-" + :group 'telega) - (defun telega-server-version () - "Return telega-server version." +-(defcustom telega-server-command "telega-server" ++(defcustom telega-server-command "@TELEGA_SERVER_BIN@" + "Command to run as telega server. + It should be absolute path or binary file searchable in `exec-path'." + :type 'string diff --git a/telega-util.el b/telega-util.el -index 73a46b1..f53e20a 100644 +index 6340c27..01e3cb7 100644 --- a/telega-util.el +++ b/telega-util.el -@@ -464,7 +464,7 @@ N can't be 0." +@@ -587,7 +587,7 @@ N can't be 0." (defun telega-etc-file (filename) "Return absolute path to FILENAME from etc/ directory in telega." @@ -40,5 +35,5 @@ index 73a46b1..f53e20a 100644 (defun telega-link-props (link-type link-to &optional face) "Generate props for link button openable with `telega-link--button-action'." -- -2.32.0 +2.34.0 diff --git a/gnu/packages/patches/emacs-telega-test-env.patch b/gnu/packages/patches/emacs-telega-test-env.patch index 75fe2e12fc..c6b02be6ff 100644 --- a/gnu/packages/patches/emacs-telega-test-env.patch +++ b/gnu/packages/patches/emacs-telega-test-env.patch @@ -1,14 +1,24 @@ -Test Emacs environment on startup. +From 237ea2471bb6521390bbac174ac2a8a5e9683e4d Mon Sep 17 00:00:00 2001 +From: Andrew Tropin +Date: Tue, 7 Dec 2021 16:20:38 +0300 +Subject: [PATCH] Test Emacs environment on startup. -Patch by Diego N. Barbato +--- + telega.el | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) ---- a/telega.el 2020-02-07 17:07:18.549970090 +0100 -+++ b/telega.el 2020-02-07 17:10:08.383499765 +0100 -@@ -82,6 +82,7 @@ - "Start telegramming. - If prefix ARG is given, then will not pop to telega root buffer." +diff --git a/telega.el b/telega.el +index d6b28b5..40854ec 100644 +--- a/telega.el ++++ b/telega.el +@@ -181,7 +181,7 @@ can't write to `telega-server-logfile'" logfile-dir))) + Pop to root buffer. + If `\\[universal-argument]' is specified, then do not pop to root buffer." (interactive "P") +- + (telega-test-env t) - (telega--create-hier) - - (unless (telega-server-live-p) + ;; For multiple accounts setup possibly select (if there is no + ;; default account declared) an account to use + (if (and telega-accounts (not (telega-account-current))) +-- +2.34.0 -- cgit v1.2.3