From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eNmUb-00083z-Dt for guix-patches@gnu.org; Sat, 09 Dec 2017 16:17:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eNmUY-0005Eb-Mp for guix-patches@gnu.org; Sat, 09 Dec 2017 16:17:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:45508) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eNmUY-0005EK-IW for guix-patches@gnu.org; Sat, 09 Dec 2017 16:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eNmUY-00040r-DR for guix-patches@gnu.org; Sat, 09 Dec 2017 16:17:02 -0500 Subject: [bug#29629] [PATCH 2/2] gnu: Switch to using the version-major procedure. Resent-Message-ID: From: Christopher Baines Date: Sat, 9 Dec 2017 21:16:50 +0000 Message-Id: <20171209211650.12619-2-mail@cbaines.net> In-Reply-To: <20171209211650.12619-1-mail@cbaines.net> References: <20171209211650.12619-1-mail@cbaines.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29629@debbugs.gnu.org * 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