[bug#29496] [PATCH] doc: Update the example VCS snapshot package definition.

[bug#29496] [PATCH] doc: Update the example VCS snapshot package definition.

[Kei Kebreau]

In commit ee17a9e06e636400e3354796a42ac445dbcc8f96, the helpers git-version
and git-file-name removed the need to build version and file name strings
manually for packages that use VCS snapshots.

doc/guix.texi (Version Numbers): Use git-version and git-file-name.
---
 doc/guix.texi | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 777ca2738..0bd6b6a79 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19880,16 +19880,14 @@ definition may look like this:
   (let ((commit "c3f29bc928d5900971f65965feaae59e1272a3f7")
         (revision "1"))          ;Guix package revision
     (package
-      (version (string-append "0.9-" revision "."
-                              (string-take commit 7)))
+      (version (git-version "0.9" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
                       (url "git://example.org/my-package.git")
                       (commit commit)))
                 (sha256 (base32 "1mbikn@dots{}"))
-                (file-name (string-append "my-package-" version
-                                          "-checkout"))))
+                (file-name (git-file-name name version))))
       ;; @dots{}
       )))
 @end example
-- 
2.15.0

[bug#29496] [PATCH] doc: Update the example VCS snapshot package definition.

[Ludovic Courtès]

Kei Kebreau <kkebreau@posteo.net> skribis:

> In commit ee17a9e06e636400e3354796a42ac445dbcc8f96, the helpers git-version
> and git-file-name removed the need to build version and file name strings
> manually for packages that use VCS snapshots.
>
> doc/guix.texi (Version Numbers): Use git-version and git-file-name.

LGTM, thanks!

Ludo’, who didn’t know about ‘git-version’.

bug#29496: [PATCH] doc: Update the example VCS snapshot package definition.

[Kei Kebreau]

[-- Attachment #1: Type: text/plain, Size: 531 bytes --]

ludo@gnu.org (Ludovic Courtès) writes:

> Kei Kebreau <kkebreau@posteo.net> skribis:
>
>> In commit ee17a9e06e636400e3354796a42ac445dbcc8f96, the helpers git-version
>> and git-file-name removed the need to build version and file name strings
>> manually for packages that use VCS snapshots.
>>
>> doc/guix.texi (Version Numbers): Use git-version and git-file-name.
>
> LGTM, thanks!
>
> Ludo’, who didn’t know about ‘git-version’.

Pushed! Thanks to you for reviewing and to Leo for making me this change.

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

[bug#29496] [PATCH] doc: Update the example VCS snapshot package definition.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 660 bytes --]

On Thu, Nov 30, 2017 at 06:07:40PM +0100, Ludovic Courtès wrote:
> Kei Kebreau <kkebreau@posteo.net> skribis:
> 
> > In commit ee17a9e06e636400e3354796a42ac445dbcc8f96, the helpers git-version
> > and git-file-name removed the need to build version and file name strings
> > manually for packages that use VCS snapshots.
> >
> > doc/guix.texi (Version Numbers): Use git-version and git-file-name.
> 
> LGTM, thanks!
> 
> Ludo’, who didn’t know about ‘git-version’.

I also missed it when this was added, but was grateful for it when
making all the Git-based packages in (gnu packages syncthing). I don't
remember how I found it now...

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