Message ID | 86h6wd6ro2.fsf@conses.eu |
---|---|
State | New |
Headers | show |
Series | [bug#61082] gnu: emacs-pulseaudio-control: Update to 34a61143. | expand |
Hello, conses <contact@conses.eu> writes: > * gnu/packages/emacs-xyz.scm (emacs-pulseaudio-control): Update to > 34a61143. Thank you. The commit message is incomplete: you modified pointer to upstream, you need to write it here. > --- > gnu/packages/emacs-xyz.scm | 35 ++++++++++++----------------------- > 1 file changed, 12 insertions(+), 23 deletions(-) > > diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm > index dc378581f5..7b5888a1d1 100644 > --- a/gnu/packages/emacs-xyz.scm > +++ b/gnu/packages/emacs-xyz.scm > @@ -21447,34 +21447,23 @@ (define-public emacs-md4rd > (license license:gpl3+))) > > (define-public emacs-pulseaudio-control > - (let ((commit "a931533140547510decdc368f39b2d2b97ca725f") > - (revision "4")) > + (let ((commit "34a6114357dbbc6b6720aa013e0f8a48f3739403") > + (revision "5")) > (package > (name "emacs-pulseaudio-control") > (version (git-version "0.0.1" revision commit)) Base version seems to be "0.1", according to puleseaudio-control.el. In this case, you can restart revision to "1" (or "0"). > - (source > - (origin > - (method git-fetch) > - (uri (git-reference > - (url "https://github.com/flexibeast/pulseaudio-control") > - (commit commit))) > - (file-name (git-file-name name version)) > - (sha256 > - (base32 > - "1jvjn9jszjjapi167an49jxcvr88cvgjwykglhp4b8lwhbjfqw76")))) > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://git.sr.ht/~flexibeast/pulseaudio-control") > + (commit commit))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "0wm312pqp0i5i6qh6g3nacnnvsrad58927cl2g42gxzrzlb3slv5")))) > (build-system emacs-build-system) > - (arguments > - '(#:phases (modify-phases %standard-phases > - (add-after 'unpack 'patch-file-name > - (lambda* (#:key inputs #:allow-other-keys) > - (let ((pulseaudio (assoc-ref inputs "pulseaudio"))) > - (chmod "pulseaudio-control.el" #o600) > - (emacs-substitute-variables "pulseaudio-control.el" > - ("pulseaudio-control-pactl-path" > - (string-append pulseaudio "/bin/pactl"))) > - #t)))))) Why did you remove this phase? AFAICT, pulseaudio-control-pactl-path still exists. > (inputs (list pulseaudio)) > - (home-page "https://github.com/flexibeast/pulseaudio-control") > + (home-page "https://git.sr.ht/~flexibeast/pulseaudio-control") This also need to be specified in the commit message. Could you send an updated patch? Regards,
Nicolas Goaziou <mail@nicolasgoaziou.fr> writes: > Hello, Hi Nicolas, >> - (source >> - (origin >> - (method git-fetch) >> - (uri (git-reference >> - (url "https://github.com/flexibeast/pulseaudio-control") >> - (commit commit))) >> - (file-name (git-file-name name version)) >> - (sha256 >> - (base32 >> - "1jvjn9jszjjapi167an49jxcvr88cvgjwykglhp4b8lwhbjfqw76")))) >> + (source (origin >> + (method git-fetch) >> + (uri (git-reference >> + (url "https://git.sr.ht/~flexibeast/pulseaudio-control") >> + (commit commit))) >> + (file-name (git-file-name name version)) >> + (sha256 >> + (base32 >> + "0wm312pqp0i5i6qh6g3nacnnvsrad58927cl2g42gxzrzlb3slv5")))) >> (build-system emacs-build-system) >> - (arguments >> - '(#:phases (modify-phases %standard-phases >> - (add-after 'unpack 'patch-file-name >> - (lambda* (#:key inputs #:allow-other-keys) >> - (let ((pulseaudio (assoc-ref inputs "pulseaudio"))) >> - (chmod "pulseaudio-control.el" #o600) >> - (emacs-substitute-variables "pulseaudio-control.el" >> - ("pulseaudio-control-pactl-path" >> - (string-append pulseaudio "/bin/pactl"))) >> - #t)))))) > > Why did you remove this phase? AFAICT, pulseaudio-control-pactl-path > still exists. > > Because this might have been needed when the package didn't allow the pactl executable path to be found dynamically, but as per https://github.com/flexibeast/pulseaudio-control/commit/c8640fceb530ab7a1aa551d70f7ee222147d95cf this is no longer needed.
Hello, conses <contact@conses.eu> writes: > Because this might have been needed when the package didn't allow > the pactl executable path to be found dynamically, but as per > https://github.com/flexibeast/pulseaudio-control/commit/c8640fceb530ab7a1aa551d70f7ee222147d95cf > this is no longer needed. I don't think (or (executable-find "pactl") "/usr/bin/pactl") is equivalent to (search-input-file inputs "/bin/pactl") Some Emacs packages remove those `executable-find' calls, e.g., emacs-nov-el, emacs-emacsql-sqlite3, emacs-telega, etc. It does make sense to keep this phase (but you can remove the initial chmod call and the final #T), unless I'm missing something. We want the Emacs package to always refer to its own Pulseaudio input, don't we? Regards,
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index dc378581f5..7b5888a1d1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21447,34 +21447,23 @@ (define-public emacs-md4rd (license license:gpl3+))) (define-public emacs-pulseaudio-control - (let ((commit "a931533140547510decdc368f39b2d2b97ca725f") - (revision "4")) + (let ((commit "34a6114357dbbc6b6720aa013e0f8a48f3739403") + (revision "5")) (package (name "emacs-pulseaudio-control") (version (git-version "0.0.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/flexibeast/pulseaudio-control") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1jvjn9jszjjapi167an49jxcvr88cvgjwykglhp4b8lwhbjfqw76")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~flexibeast/pulseaudio-control") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wm312pqp0i5i6qh6g3nacnnvsrad58927cl2g42gxzrzlb3slv5")))) (build-system emacs-build-system) - (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-file-name - (lambda* (#:key inputs #:allow-other-keys) - (let ((pulseaudio (assoc-ref inputs "pulseaudio"))) - (chmod "pulseaudio-control.el" #o600) - (emacs-substitute-variables "pulseaudio-control.el" - ("pulseaudio-control-pactl-path" - (string-append pulseaudio "/bin/pactl"))) - #t)))))) (inputs (list pulseaudio)) - (home-page "https://github.com/flexibeast/pulseaudio-control") + (home-page "https://git.sr.ht/~flexibeast/pulseaudio-control") (synopsis "Control @code{pulseaudio} from Emacs") (description "This package allows controlling @code{pulseaudio} from Emacs.")