[PATCH] Add version-major helper, and switch to using it.

  • Done
  • quality assurance status badge
Details
2 participants
  • Ludovic Courtès
  • Christopher Baines
Owner
unassigned
Submitted by
Christopher Baines
Severity
normal

Debbugs page

Christopher Baines wrote 7 years ago
(address . guix-patches@gnu.org)
877etv7hgn.fsf@cbaines.net
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(-)
-----BEGIN PGP SIGNATURE-----

iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlosTNlfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE
9Xd4bw/+PGF39OXukYwswEVV7faJy6tNzgKnjX+vT4TfzFNfvLJKVTG7vDSdUWYV
zA3SnxYNE87aZQ2snUTxmRoQdlJvMF3emNEUeValBZQ8M+v8EyUhWHOA5V/XOJfG
S0bnDH1bKlzzeWZYHN70wn/VGiASx0nid6h/KZcNb/tmHap4Y3iEjGDkOyfodk+J
YLDcRKXb2RSq3QkXuh1ypnW8dLEwmjKeHuZr5EmqRTUn4DS5EeQzy5nb+708Qqrk
ZgIk7hTAptf6tRYm62uxvS+ZAqa7AClo7cdCcw+M6Y94m8ZVTqVKy8ZHc4r+d/jw
TU+5swG37e4+NdmGVdG9c1iu5QKcnd/p63AgsksWpgg7OOh5XAd9deFPc8vd+EsQ
xsygxu2j7+ddRSlWR7/pb2Y3XaatT01lAgR03M2xdgqccEar4J9vlAJzVGvlYj+w
SdXwD3q9Bl9A47oQ2pWj5w4tSbuB190+idZ28+DOO9JFtSsAMWtnSr1OGEFaiBcY
XU6Duis84Vom0FpRKx7l9dKLQHDjAKa2RfGI94XwZe1NfmQSzQxdn4AW0hoc/1uG
E1SFI92GTaVdkJeB8N7Z42lAC9hmHIytRwda4Ckvq2MBLCgGDl+sMdKyrMHw0sry
a+xm6Nxoqfrquf59epPtWGg0j2GW3ImTVrAwDa83C9Up5F4QR5A=
=h2KP
-----END PGP SIGNATURE-----

Christopher Baines wrote 7 years ago
[PATCH 1/2] guix: utils: Add version-major.
(address . 29629@debbugs.gnu.org)
20171209211650.12619-1-mail@cbaines.net
From: nee <nee.git@cock.li>

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

Toggle diff (25 lines)
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
Christopher Baines wrote 7 years ago
[PATCH 2/2] gnu: Switch to using the version-major procedure.
(address . 29629@debbugs.gnu.org)
20171209211650.12619-2-mail@cbaines.net
* 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(-)

Toggle diff (54 lines)
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
Ludovic Courtès wrote 7 years ago
Re: [bug#29629] [PATCH 1/2] guix: utils: Add version-major.
(name . Christopher Baines)(address . mail@cbaines.net)(address . 29629@debbugs.gnu.org)
87k1xtz2jt.fsf@gnu.org
Christopher Baines <mail@cbaines.net> skribis:

Toggle quote (4 lines)
> From: nee <nee.git@cock.li>
>
> * guix/utils.scm (version-major): New procedure.

OK!
Ludovic Courtès wrote 7 years ago
Re: [bug#29629] [PATCH 2/2] gnu: Switch to using the version-major procedure.
(name . Christopher Baines)(address . mail@cbaines.net)(address . 29629@debbugs.gnu.org)
87fu8hz2j1.fsf@gnu.org
Christopher Baines <mail@cbaines.net> skribis:

Toggle quote (5 lines)
> * 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'.
Christopher Baines wrote 7 years ago
(name . Ludovic Courtès)(address . ludo@gnu.org)(address . 29629-done@debbugs.gnu.org)
87zi6p5b5s.fsf@cbaines.net
Ludovic Courtès <ludo@gnu.org> writes:

Toggle quote (9 lines)
> Christopher Baines <mail@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 :)
-----BEGIN PGP SIGNATURE-----

iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlou2T9fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE
9XdcHBAAi5hefDQ6VT9uAoULdafQYJMHdPRYmWXHWsp7faw4VrOtGYUG5StJvwWz
Iku7X+9E14KFJC1K2tLN0REIRh3d0b9e7ZBNISEpZeDuGrCK+IXajW4jjdWOYMvs
7SmLtc/swWPc8AMBYqdrtZizv47NayYQaqnSIZKqDEq1EH8oVg5U7JVqio8pA7+U
L2Jj5xR6F+PTHsuLhamrGXM2VQVN0FOt1QVRrOpmNDbyF8Z1BIMMbILoPuqtRMef
pmkWKBSh9Gw3F6TELG8lKb0JcB6MmnZk0X1XGjRekbXmdEmts7VlOlZD4TlB24a1
Tj8J9938eCpgGHsINb4R+6YPaRgUnCJaAtzs6gMQaG2e0hGEwfEEKzO2CpNzp4Y6
lv5EkCY8hbEv3K3u++ASOLgb+R/s2/aW6f9oSTxk9ae1d7PwVf1WuKMffrb0UZJp
dSDXuxjj9VM6FGnfLM4Q9X7XwNAMldFNHeYffjIslhk6OgfKQ8JfU8oePQPaAhjK
TKPNcJ2os29/rbT+W1iIgT/5dHCDfAP2fm5AMjj0JfwhBv2DU16iC4lWEqLkWeTf
c/WfTba4s62h4ljqGzXiIiyBpLmNNJ3ujZrBSe3tLFyoIIAX33byRPduSaeT/m0S
p3RZovNkY27wI+E+nxfB2a3fzaNvP6E3eRTs9CZNv/7C0/tKGlQ=
=rs5n
-----END PGP SIGNATURE-----

Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 29629@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 29629
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help