[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/163: utils: Add a version-minor procedure.
From: |
guix-commits |
Subject: |
01/163: utils: Add a version-minor procedure. |
Date: |
Mon, 25 Jan 2021 02:01:13 -0500 (EST) |
apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.
commit 9cd2b9a7b210d3a449c0523912e50b0a1f1ca3ac
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Jan 21 23:05:58 2021 -0500
utils: Add a version-minor procedure.
* guix/utils.scm (version-components): New procedure.
(version-prefix): Use it.
(version-major): Likewise.
(version-minor): New procedure.
---
guix/utils.scm | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/guix/utils.scm b/guix/utils.scm
index 678954d..cd4e595 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -8,7 +8,7 @@
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2018, 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -93,6 +93,7 @@
version-major+minor+point
version-major+minor
version-major
+ version-minor
guile-version>?
version-prefix?
string-replace-substring
@@ -573,10 +574,14 @@ or '= when they denote equal versions."
((negative? result) '<)
(else '=))))))
+(define (version-components version-string)
+ "Return the dot-separated version components as a list."
+ (string-split version-string #\.))
+
(define (version-prefix version-string num-parts)
"Truncate version-string to the first num-parts components of the version.
For example, (version-prefix \"2.1.47.4.23\" 3) returns \"2.1.47\""
- (string-join (take (string-split version-string #\.) num-parts) "."))
+ (string-join (take (version-components version-string) num-parts) "."))
(define (version-major+minor+point version-string)
"Return \"major>.<minor>.<point>\", where major, minor and point are the
@@ -595,7 +600,11 @@ minor version numbers from version-string."
(define (version-major version-string)
"Return the major version number as string from the version-string."
- (version-prefix version-string 1))
+ (first (version-components version-string)))
+
+(define (version-minor version-string)
+ "Return the minor version number as string from the version-string."
+ (second (version-components version-string)))
(define (version>? a b)
"Return #t when A denotes a version strictly newer than B."
- branch cu/farewell-to-pythonpath created (now c8e1f2c), guix-commits, 2021/01/25
- 01/163: utils: Add a version-minor procedure.,
guix-commits <=
- 07/163: build/python: Adjust wrap phase to use the new GUIX_PYTHONPATH., guix-commits, 2021/01/25
- 09/163: gnu: dstat: Adjust wrap phase., guix-commits, 2021/01/25
- 10/163: gnu: solaar: Do not read PYTHONPATH from environment., guix-commits, 2021/01/25
- 04/163: build/python: Replace PYTHONPATH by GUIX_PYTHONPATH_X_Y in add-installed-pythonpath., guix-commits, 2021/01/25
- 18/163: gnu: couger: Adjust wrap phase., guix-commits, 2021/01/25
- 11/163: gnu: intel-xed: Adjust build phase., guix-commits, 2021/01/25
- 03/163: build/python: Add a new guix-pythonpath procedure., guix-commits, 2021/01/25
- 22/163: gnu: python-scanpy: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 21/163: gnu: filtlong: Adjust wrap phase., guix-commits, 2021/01/25
- 24/163: gnu: cdemu-client: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25