bug-guix
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#55854: [PATCH 2/2] gnu: Restrict gtk+ updaters to their major versio


From: Liliana Marie Prikler
Subject: bug#55854: [PATCH 2/2] gnu: Restrict gtk+ updaters to their major versions.
Date: Fri, 17 Jun 2022 15:46:29 +0200

* gnu/packages/gtk.scm (gtk+-2, gtk+)[properties]: Add update-major-version.
* guix/import/gnome.scm (lastest-gnome-release): Add ‘allowed-major-version?’
and use it to filter latest releases.
---
 gnu/packages/gtk.scm  |  6 ++++--
 guix/import/gnome.scm | 33 +++++++++++++++++++++++----------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 4d6a690fbb..73b313520f 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -939,7 +939,8 @@ (define-public gtk+-2
 suitable for projects ranging from small one-off tools to complete
 application suites.")
     (license license:lgpl2.0+)
-    (home-page "https://www.gtk.org/";)))
+    (home-page "https://www.gtk.org/";)
+    (properties `((update-major-version . 2)))))
 
 (define-public gtk+
   (package
@@ -1073,7 +1074,8 @@ (define-public gtk+
     (native-search-paths
      (list (search-path-specification
             (variable "GUIX_GTK3_PATH")
-            (files '("lib/gtk-3.0")))))))
+            (files '("lib/gtk-3.0")))))
+    (properties `((update-major-version . 3)))))
 
 (define-public gtk
   (package
diff --git a/guix/import/gnome.scm b/guix/import/gnome.scm
index 1a0786ab8d..94a2598ab2 100644
--- a/guix/import/gnome.scm
+++ b/guix/import/gnome.scm
@@ -68,6 +68,17 @@ (define (stable-minor-version? version)
        ;; It should at last start with a digit.
        major)))
 
+  (define allowed-major-version?
+    (let ((fixed-major (assoc-ref (package-properties package)
+                                  'update-major-version)))
+      (if fixed-major
+          (lambda (version)
+            (match (string-tokenize version %not-dot)
+              (((= string->number major) . _)
+               (= major fixed-major))
+              (_ #f)))
+          (const #t))))
+
   (define upstream-name
     ;; Some packages like "NetworkManager" have camel-case names.
     (package-upstream-name package))
@@ -94,16 +105,18 @@ (define upstream-name
          (let* ((releases (assoc-ref releases upstream-name))
                 (latest   (fold (match-lambda*
                                   (((key . value) result)
-                                   (cond ((stable-minor-version? key)
-                                          (match result
-                                            (#f
-                                             (cons key value))
-                                            ((newest . _)
-                                             (if (version>? key newest)
-                                                 (cons key value)
-                                                 result))))
-                                         (else
-                                          result))))
+                                   (cond
+                                    ((not (allowed-major-version? key))
+                                     result)
+                                    ((stable-minor-version? key)
+                                     (match result
+                                       (#f
+                                        (cons key value))
+                                       ((newest . _)
+                                        (if (version>? key newest)
+                                            (cons key value)
+                                            result))))
+                                    (else result))))
                                 #f
                                 releases)))
            (and latest
-- 
2.36.1






reply via email to

[Prev in Thread] Current Thread [Next in Thread]