GNU bug report logs - #29629
[PATCH] Add version-major helper, and switch to using it.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 29629 in the body.
You can then email your comments to 29629 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: guix-patches <at> gnu.org
Subject: [PATCH] Add version-major helper, and switch to using it.
Date: Sat, 09 Dec 2017 20:51:36 +0000

[Message part 1 (text/plain, inline)]

This is part of #28769, with some of my changes on top.

Christopher Baines (1):
  gnu: Switch to using the version-major procedure.

nee (1):
  guix: utils: Add version-major.

 gnu/packages/audio.scm          | 2 +-
 gnu/packages/bioinformatics.scm | 2 +-
 gnu/packages/messaging.scm      | 2 +-
 gnu/packages/statistics.scm     | 2 +-
 guix/utils.scm                  | 5 +++++
 5 files changed, 9 insertions(+), 4 deletions(-)

[signature.asc (application/pgp-signature, inline)]

Message #8 received at 29629 <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: 29629 <at> debbugs.gnu.org
Subject: [PATCH 1/2] guix: utils: Add version-major.
Date: Sat,  9 Dec 2017 21:16:49 +0000

From: nee <nee.git <at> cock.li>

* guix/utils.scm (version-major): New procedure.
---
 guix/utils.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/guix/utils.scm b/guix/utils.scm
index fed31f4ca..92e45de61 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -82,6 +82,7 @@
             version>=?
             version-prefix
             version-major+minor
+            version-major
             guile-version>?
             string-replace-substring
             arguments-from-environment-variable
@@ -497,6 +498,10 @@ For example, (version-prefix \"2.1.47.4.23\" 3) returns \"2.1.47\""
 minor version numbers from version-string."
   (version-prefix version-string 2))
 
+(define (version-major version-string)
+  "Return the major version number as string from the version-string."
+  (version-prefix version-string 1))
+
 (define (version>? a b)
   "Return #t when A denotes a version strictly newer than B."
   (eq? '> (version-compare a b)))
-- 
2.15.1

Message #11 received at 29629 <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: 29629 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: Switch to using the version-major procedure.
Date: Sat,  9 Dec 2017 21:16:50 +0000

* gnu/packages/audio.scm (ardour)[arguments]: Switch to using version-major.
  (hmmer)[source]: Switch to using version-major.
  (pidgin)[native-search-paths]: Switch to using version-major.
  (r-minimal)[source]: Switch to using version-major.
---
 gnu/packages/audio.scm          | 2 +-
 gnu/packages/bioinformatics.scm | 2 +-
 gnu/packages/messaging.scm      | 2 +-
 gnu/packages/statistics.scm     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 4f6e4a409..b0c3eca0c 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -222,7 +222,7 @@ namespace ARDOUR { const char* revision = \"" version "\" ; }")))))
        (modify-phases %standard-phases
          (add-after
           'unpack 'set-rpath-in-LDFLAGS
-          ,(ardour-rpath-phase (version-prefix version 1))))
+          ,(ardour-rpath-phase (version-major version))))
        #:test-target "test"
        #:python ,python-2))
     (inputs
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 171b13d0d..f81db2c84 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2917,7 +2917,7 @@ indexing scheme is called a @dfn{Hierarchical Graph FM index} (HGFM).")
        (method url-fetch)
        (uri (string-append
              "http://eddylab.org/software/hmmer"
-             (version-prefix version 1) "/"
+             (version-major version) "/"
              version "/hmmer-" version ".tar.gz"))
        (sha256
         (base32
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 9525c9f5d..1780536d0 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -387,7 +387,7 @@ authentication.")
      (list (search-path-specification
             (variable "PURPLE_PLUGIN_PATH")
             (files (list (string-append "lib/purple-"
-                                        (version-prefix version 1))
+                                        (version-major version))
                          "lib/pidgin")))))
     (home-page "http://www.pidgin.im/")
     (synopsis "Graphical multi-protocol instant messaging client")
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index fc18719f3..5e356a3b6 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -114,7 +114,7 @@ be output in text, PostScript, PDF or HTML.")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://cran/src/base/R-"
-                                  (version-prefix version 1) "/R-"
+                                  (version-major version) "/R-"
                                   version ".tar.gz"))
               (sha256
                (base32
-- 
2.15.1

Message #14 received at 29629 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Christopher Baines <mail <at> cbaines.net>
Cc: 29629 <at> debbugs.gnu.org
Subject: Re: [bug#29629] [PATCH 1/2] guix: utils: Add version-major.
Date: Mon, 11 Dec 2017 16:50:46 +0100

Christopher Baines <mail <at> cbaines.net> skribis:

> From: nee <nee.git <at> cock.li>
>
> * guix/utils.scm (version-major): New procedure.

OK!

Message #17 received at 29629 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Christopher Baines <mail <at> cbaines.net>
Cc: 29629 <at> debbugs.gnu.org
Subject: Re: [bug#29629] [PATCH 2/2] gnu: Switch to using the version-major
 procedure.
Date: Mon, 11 Dec 2017 16:51:14 +0100

Christopher Baines <mail <at> cbaines.net> skribis:

> * gnu/packages/audio.scm (ardour)[arguments]: Switch to using version-major.
>   (hmmer)[source]: Switch to using version-major.
>   (pidgin)[native-search-paths]: Switch to using version-major.
>   (r-minimal)[source]: Switch to using version-major.

LGTM, thanks!

Ludo'.

Message #22 received at 29629-done <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 29629-done <at> debbugs.gnu.org
Subject: Re: [bug#29629] [PATCH 2/2] gnu: Switch to using the version-major
 procedure.
Date: Mon, 11 Dec 2017 19:15:11 +0000

[Message part 1 (text/plain, inline)]

Ludovic Courtès <ludo <at> gnu.org> writes:

> Christopher Baines <mail <at> cbaines.net> skribis:
>
>> * gnu/packages/audio.scm (ardour)[arguments]: Switch to using version-major.
>>   (hmmer)[source]: Switch to using version-major.
>>   (pidgin)[native-search-paths]: Switch to using version-major.
>>   (r-minimal)[source]: Switch to using version-major.
>
> LGTM, thanks!

Great, I've pushed this now.

Thanks for reviewing :)

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.