| Message ID | 3fdc4c12bb7ce7ba962103f78dc00f091eae291e.1692005226.git.piokwiecinski@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [bug#65285] gnu: update emacs-orderless to 1.0 | expand |
Hi Piotr, Thank you for the patch! There're some minor changes to make. On Mon, 14 Aug 2023 18:52:38 +0800, Piotr Kwiecinski wrote: > > previously used commit was pointing to 0.8 instead 1.0 > --- Please write commit logs in ChangeLog format [1]. You can also check the commit history for examples. For this commit, the following can be used: --8<---------------cut here---------------start------------->8--- gnu: emacs-orderless: Update to 1.0. * gnu/packages/emacs-xyz.scm (emacs-orderless): Update to 1.0, previously used commit was pointing to 0.8. --8<---------------cut here---------------end--------------->8--- > gnu/packages/emacs-xyz.scm | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm > index 0f0751e39a..e62c71752e 100644 > --- a/gnu/packages/emacs-xyz.scm > +++ b/gnu/packages/emacs-xyz.scm > @@ -11290,8 +11290,7 @@ (define-public emacs-selectrum > (license license:expat))) > > (define-public emacs-orderless > - (let ((commit "004cee6b8e01f8eb0cb1c683d0a637b14890600f")) > - (package > + (package > (name "emacs-orderless") > (version "1.0") > (source > @@ -11299,9 +11298,9 @@ (define-public emacs-orderless > (method git-fetch) > (uri (git-reference > (url "https://github.com/oantolin/orderless") > - (commit commit))) > + (commit version))) > (sha256 > - (base32 "115bwqi2yc44bgvcl7lha8p2s6jgh5hksn4wa9s0kpfxhi14jwmy")) > + (base32 "1jmwyici90v82gqjq44n0scrwhmg05pi9yplkn4bpss80c83dxp4")) > (file-name (git-file-name name version)))) > (build-system emacs-build-system) > (arguments > @@ -11322,7 +11321,7 @@ (define-public emacs-orderless > that match all of the components in any order. Each component can match in > any one of several ways: literally, as a regexp, as an initialism, in the flex > style, or as multiple word prefixes.") > - (license license:gpl3+)))) > + (license license:gpl3+))) > > (define-public emacs-consult > (package > > base-commit: b15381460ed74e72792ff182dd2ca7a06ba59b0c > -- > 2.39.2 I think it's fine to also change the indentation here, remove two leading spaces in every line after the "(package" one, your editor may do this for you. :) Thanks [1]: <https://www.gnu.org/prep/standards/standards.html#Change-Logs>
Hi Hilton, thank you for the guidance and patience. I hope the updated patch is correct now. On Tue, 15 Aug 2023 at 09:29, Hilton Chain <hako@ultrarare.space> wrote: > Hi Piotr, > > Thank you for the patch! There're some minor changes to make. > > On Mon, 14 Aug 2023 18:52:38 +0800, > Piotr Kwiecinski wrote: > > > > previously used commit was pointing to 0.8 instead 1.0 > > --- > > > Please write commit logs in ChangeLog format [1]. You can also check > the commit history for examples. > > For this commit, the following can be used: > --8<---------------cut here---------------start------------->8--- > gnu: emacs-orderless: Update to 1.0. > > * gnu/packages/emacs-xyz.scm (emacs-orderless): Update to 1.0, previously > used > commit was pointing to 0.8. > --8<---------------cut here---------------end--------------->8--- > > > > gnu/packages/emacs-xyz.scm | 9 ++++----- > > 1 file changed, 4 insertions(+), 5 deletions(-) > > > > diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm > > index 0f0751e39a..e62c71752e 100644 > > --- a/gnu/packages/emacs-xyz.scm > > +++ b/gnu/packages/emacs-xyz.scm > > @@ -11290,8 +11290,7 @@ (define-public emacs-selectrum > > (license license:expat))) > > > > (define-public emacs-orderless > > - (let ((commit "004cee6b8e01f8eb0cb1c683d0a637b14890600f")) > > - (package > > + (package > > (name "emacs-orderless") > > (version "1.0") > > (source > > @@ -11299,9 +11298,9 @@ (define-public emacs-orderless > > (method git-fetch) > > (uri (git-reference > > (url "https://github.com/oantolin/orderless") > > - (commit commit))) > > + (commit version))) > > (sha256 > > - (base32 > "115bwqi2yc44bgvcl7lha8p2s6jgh5hksn4wa9s0kpfxhi14jwmy")) > > + (base32 > "1jmwyici90v82gqjq44n0scrwhmg05pi9yplkn4bpss80c83dxp4")) > > (file-name (git-file-name name version)))) > > (build-system emacs-build-system) > > (arguments > > @@ -11322,7 +11321,7 @@ (define-public emacs-orderless > > that match all of the components in any order. Each component can > match in > > any one of several ways: literally, as a regexp, as an initialism, in > the flex > > style, or as multiple word prefixes.") > > - (license license:gpl3+)))) > > + (license license:gpl3+))) > > > > (define-public emacs-consult > > (package > > > > base-commit: b15381460ed74e72792ff182dd2ca7a06ba59b0c > > -- > > 2.39.2 > > > I think it's fine to also change the indentation here, remove two > leading spaces in every line after the "(package" one, your editor may > do this for you. :) > > > Thanks > > [1]: <https://www.gnu.org/prep/standards/standards.html#Change-Logs> >
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0f0751e39a..e62c71752e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11290,8 +11290,7 @@ (define-public emacs-selectrum (license license:expat))) (define-public emacs-orderless - (let ((commit "004cee6b8e01f8eb0cb1c683d0a637b14890600f")) - (package + (package (name "emacs-orderless") (version "1.0") (source @@ -11299,9 +11298,9 @@ (define-public emacs-orderless (method git-fetch) (uri (git-reference (url "https://github.com/oantolin/orderless") - (commit commit))) + (commit version))) (sha256 - (base32 "115bwqi2yc44bgvcl7lha8p2s6jgh5hksn4wa9s0kpfxhi14jwmy")) + (base32 "1jmwyici90v82gqjq44n0scrwhmg05pi9yplkn4bpss80c83dxp4")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (arguments @@ -11322,7 +11321,7 @@ (define-public emacs-orderless that match all of the components in any order. Each component can match in any one of several ways: literally, as a regexp, as an initialism, in the flex style, or as multiple word prefixes.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-consult (package