Received: (at 55854) by debbugs.gnu.org; 17 Jun 2022 13:52:28 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jun 17 09:52:28 2022
Received: from localhost ([127.0.0.1]:44492 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1o2COi-0007xK-Gx
for submit <at> debbugs.gnu.org; Fri, 17 Jun 2022 09:52:28 -0400
Received: from mail-ed1-f68.google.com ([209.85.208.68]:34654)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <liliana.prikler@HIDDEN>) id 1o2COd-0007ws-TP
for 55854 <at> debbugs.gnu.org; Fri, 17 Jun 2022 09:52:25 -0400
Received: by mail-ed1-f68.google.com with SMTP id o10so6292048edi.1
for <55854 <at> debbugs.gnu.org>; Fri, 17 Jun 2022 06:52:23 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
h=from:date:subject:mime-version:to:cc:content-transfer-encoding
:message-id; bh=+tR18ovOOrPHFsTOi1tL0plaHxFsqvpisOhSRRDSNRA=;
b=hiHTr+NB80C4fogvzzN9/rLPYHDDJ8IRv8zyj9gdRi6/NXmTC3CGyhtw/goSP2A25N
6mnqHRAlvBjbys76KfMS/wzFgstDh4TQlpN8YuFth+7IaKUCqYAPND4lSdKnaCXGJ2AO
SJNr9Iwo8TNUdB3kAbfau92s03vDQlGVmBS1yoWGUK7k6QC7gpXND2vpwMBcgoMFZtf+
cGVh8wIqaT8ed6E9yENjPrfbEpjpy+qLD2iluZ2DhLMoRZQqWATffDMV+xV/w7c/+UA1
IgYspUexMvy/NrHNzYoyH7k5GrBjeukmh06+OD8F2B6jChKWlERrxgeE/9QwkHO+263I
oa9A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=x-gm-message-state:from:date:subject:mime-version:to:cc
:content-transfer-encoding:message-id;
bh=+tR18ovOOrPHFsTOi1tL0plaHxFsqvpisOhSRRDSNRA=;
b=yn3IkKGrOL9WAW5ZbC0TRY2zo4qk4BmprV7I7nu6pxD182rT+ZwxUuLknYQjK3yqqi
9Pq34a47TBcBC1MkmoQrMDew1QcBs73deiuhYZmNkgpHC/nlQxS7o+lffyRaI0F2mW9W
Ak8/lZ3QuHd/ff47M8QUYhH+FLlUG/B1J0j825MpkkS2D58D/rWkVXneSuZyBnHS7K7R
GoAQh2z2wKLzHUrorLNnwxjmtuOxVCuFOesmLxD2ErS/J80P3K35aviXA8lcFghFnNML
udcmoFv1iNNpfyj3R7Xjh10wgSOtM3L1aZTuFVP9St42S7OKmw5PypyvmEInO0vmMoxu
vhIA==
X-Gm-Message-State: AJIora+DHg9Zk96v9HrsQgvCWlFv3+xcawS7p983+RjMim+9w2wu3NDY
1nnxRFsW9MWEX/1zfy6VE4iH/QFaWIk=
X-Google-Smtp-Source: AGRyM1ueAJYVqRAw9yXWoz2D3EkzAqZ2Y4L//+pvrMqBFByylUby4PwOg6H8Dxuznyn2k2GfofVooA==
X-Received: by 2002:a05:6402:cab:b0:42d:c842:8369 with SMTP id
cn11-20020a0564020cab00b0042dc8428369mr12563579edb.181.1655473937890;
Fri, 17 Jun 2022 06:52:17 -0700 (PDT)
Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at.
[85.127.52.93]) by smtp.gmail.com with ESMTPSA id
y17-20020a170906471100b00704dccefd2bsm2146433ejq.204.2022.06.17.06.52.17
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 17 Jun 2022 06:52:17 -0700 (PDT)
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Date: Fri, 17 Jun 2022 15:46:29 +0200
Subject: [PATCH 2/2] gnu: Restrict gtk+ updaters to their major versions.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
to: 55854 <at> debbugs.gnu.org
Content-Transfer-Encoding: 8bit
Message-ID: <8d1df21d42539c5a0690be407e60e90c7335697a.camel@HIDDEN>
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 55854
Cc: Kaelyn <kaelyn.alexi@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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
bug-guix@HIDDEN:bug#55854; Package guix.
Full text available.
Received: (at 55854) by debbugs.gnu.org; 17 Jun 2022 13:52:26 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jun 17 09:52:26 2022
Received: from localhost ([127.0.0.1]:44490 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1o2COg-0007xB-9s
for submit <at> debbugs.gnu.org; Fri, 17 Jun 2022 09:52:26 -0400
Received: from mail-ej1-f68.google.com ([209.85.218.68]:38716)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <liliana.prikler@HIDDEN>) id 1o2COd-0007wr-DJ
for 55854 <at> debbugs.gnu.org; Fri, 17 Jun 2022 09:52:25 -0400
Received: by mail-ej1-f68.google.com with SMTP id n10so8928690ejk.5
for <55854 <at> debbugs.gnu.org>; Fri, 17 Jun 2022 06:52:23 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
h=from:date:subject:to:cc:content-transfer-encoding:message-id
:mime-version; bh=GHiyaKZznkXc46PuUGukjmiReuNfFo5jxz6YT3XIecE=;
b=BB+OsZlc2EKVnGfENDeIyaEvAXKKqpbsCUgsfjm3rhEuPu6G8TnD+VRVzsRX/FFgRL
ICd29U/g0eeVoWXwfHSpEh7wWjHjCyluMVbpKc7+Yx0MK6VdA5zMncfNTh2zHHvuIze4
u8GJ7NMv/wiDM2lMqUpfCMhqMLfrsfCdVAjJdOf5UxKEkbqWg1icdJAGJTgRJistUpGJ
cOcUXCa5sDj6qUXdEnQ8Yw4JyygDUpEdZ1TskKII7XQIjUjZj5w6+n94lETTxxg6UFLF
taOrP3HPkfn+0YIcGMMeIB8j8/JmddTetUH7wHY2gYrVTNNnz1r5umRO3PdgzV7OEOZT
Fvlw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=x-gm-message-state:from:date:subject:to:cc
:content-transfer-encoding:message-id:mime-version;
bh=GHiyaKZznkXc46PuUGukjmiReuNfFo5jxz6YT3XIecE=;
b=j8P/Qc0dYP7pDlcLclKa0fkke9k5p69xxv+tPirwW4bNV0GVvcEvCKjxbi44dt8RQF
OmLz88gaoZZAg5WMq/2oU64YTG2js6adsAErYRIrrYIEJ171bWqTuexLz6Tk0CCEUmSS
3RQxXIcNlKx87VAANyRBpLXUhej6jD+N36wCYlyn/VFCgHRaFNBPPt1xMzy0VbUiIaST
p6omfyB5a94qa1RW4nUnZxjGfywGImiCn6+q1vhakluKqWeAcplRNI2Ht140d8ruPutB
46kTqHkSbWqFaB8qumRa5KJ8PY9xaWxAuo0ybfzFuZ4vBIdQyoFYDQFoQNtXCwxk7+Jz
S1yA==
X-Gm-Message-State: AJIora90tUye25AWQEuzO0neyT4LI1zAZBy+3ZYbb6FUSKZxqb7/Kp4s
nDtrboN356Zis24fr/HDiR0yGDcW0yM=
X-Google-Smtp-Source: AGRyM1tX3xfmbhxxm9otYXEz5jxLKXuPkMM2FA+snR7tGUPLrXum/MJZwQbzzp9CGOyRzXSAVgf4mQ==
X-Received: by 2002:a17:907:97d5:b0:706:76ba:f28f with SMTP id
js21-20020a17090797d500b0070676baf28fmr9030606ejc.367.1655473937295;
Fri, 17 Jun 2022 06:52:17 -0700 (PDT)
Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at.
[85.127.52.93]) by smtp.gmail.com with ESMTPSA id
y17-20020a170906471100b00704dccefd2bsm2146433ejq.204.2022.06.17.06.52.16
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 17 Jun 2022 06:52:16 -0700 (PDT)
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Date: Fri, 17 Jun 2022 15:44:02 +0200
Subject: [PATCH 1/2] import: Check that GNOME minor version is not a semver
prerelease.
to: 55854 <at> debbugs.gnu.org
Content-Transfer-Encoding: 7bit
Message-ID: <8f37e2ae72f4e532f05f8cd010099a8e87e57c47.camel@HIDDEN>
MIME-Version: 1.0
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 55854
Cc: Kaelyn <kaelyn.alexi@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/import/gnome.scm (latest-gnome-release)[even-minor-version]: Rename
to...
[stable-minor-version?]: ... this. Also check that minor < 90.
---
guix/import/gnome.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/guix/import/gnome.scm b/guix/import/gnome.scm
index 43966c1028..1a0786ab8d 100644
--- a/guix/import/gnome.scm
+++ b/guix/import/gnome.scm
@@ -60,10 +60,10 @@ (define (latest-gnome-release package)
(define %not-dot
(char-set-complement (char-set #\.)))
- (define (even-minor-version? version)
+ (define (stable-minor-version? version)
(match (string-tokenize version %not-dot)
(((= string->number major) (= string->number minor) . rest)
- (and minor (even? minor)))
+ (and minor (even? minor) (< minor 90)))
(((= string->number major) . _)
;; It should at last start with a digit.
major)))
@@ -94,7 +94,7 @@ (define upstream-name
(let* ((releases (assoc-ref releases upstream-name))
(latest (fold (match-lambda*
(((key . value) result)
- (cond ((even-minor-version? key)
+ (cond ((stable-minor-version? key)
(match result
(#f
(cons key value))
--
2.36.1
bug-guix@HIDDEN:bug#55854; Package guix.
Full text available.Received: (at submit) by debbugs.gnu.org; 8 Jun 2022 17:19:11 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Jun 08 13:19:11 2022 Received: from localhost ([127.0.0.1]:44221 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1nyzKp-0005mc-0G for submit <at> debbugs.gnu.org; Wed, 08 Jun 2022 13:19:11 -0400 Received: from lists.gnu.org ([209.51.188.17]:59400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <kaelyn.alexi@HIDDEN>) id 1nyzKn-0005mU-4S for submit <at> debbugs.gnu.org; Wed, 08 Jun 2022 13:19:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <kaelyn.alexi@HIDDEN>) id 1nyzKm-0003jR-O7 for bug-guix@HIDDEN; Wed, 08 Jun 2022 13:19:08 -0400 Received: from mail-40130.protonmail.ch ([185.70.40.130]:43141) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <kaelyn.alexi@HIDDEN>) id 1nyzKk-0004XT-Bc for bug-guix@HIDDEN; Wed, 08 Jun 2022 13:19:08 -0400 Date: Wed, 08 Jun 2022 17:18:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1654708744; x=1654967944; bh=2w+GitbYZfjWcIkQ9DJfAT0bSfsJnBSqaLmr4Mq5sQU=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=Z4FZyqhiwYLCHNHPX5gu2R4J9Tzt9oSmLMrTGMFVkCXTdAgLTrSY943YyKd4CLJPG btG46Nl5n1HZwisnJkBd3lq2WE9qlQf1rJIoVFZ/g/uQwfKnGRcAjbt+GkJSR9a16D Biyq23exucc+nBQ0FUMM1+SVTSicYD06R0EzJpO7B7nYaPjZVEY7/xQfvQmAd7HAWt GvoeoVJZqhFS2Rd9FOFMrBGlnp7paSjO37kOVjaunHOBGXePUzbg1O9ib7YwxkVGBB SZhvFyqC53uY0CV/wupJxOBHK8iG8DaJ/jYl+BOV/I/j1KKOlRecu1/5TLvcMTTRmg IzPuo8Swgt8kw== To: "bug-guix@HIDDEN" <bug-guix@HIDDEN> From: Kaelyn <kaelyn.alexi@HIDDEN> Subject: "guix refresh" doesn't handle older versions like gtk+@2 Message-ID: <bpII8BMbxEJbaiPdFNKwLKOzgKF3fpl3t_Fl8yesV6QnyKVgD_Wl2z5Ip8rT8KIOHULjf9wIi_qbDshR2aC2gxdwwAUARVmWQxZ9H8JIiRg=@protonmail.com> Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.40.130; envelope-from=kaelyn.alexi@HIDDEN; helo=mail-40130.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Reply-To: Kaelyn <kaelyn.alexi@HIDDEN> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.3 (--) When attempting a mass "guix refresh -ru" of system and home profile packag= es, some bogus updates were encountered. One category of those is older/mul= tiple versions of a package all being updated to the latest, as was seen wi= th gtk+@2, libsigc++@2, and the gtkmm packages. For example: $ guix refresh gtk+@2 gnu/packages/gtk.scm:851:13: gtk+ would be upgraded from 2.24.33 to 3.94.0 Per the IRC discussion at https://logs.guix.gnu.org/guix/2022-06-08.log#185= 744, those packages should only be upgraded within the same major version. = Maxime suggested adding a REQUIRED-MAJOR-VERSION field to such packages so = they are updated correctly: https://logs.guix.gnu.org/guix/2022-06-08.log#1= 85842 (Side note: I believe gtk+ uses a numbering scheme of x.9y.0 for pre-releas= es of the (x+1).0.0 release; i.e. gtk+ 3.94.0 is a pre-release of gtk 4.)
Kaelyn <kaelyn.alexi@HIDDEN>:bug-guix@HIDDEN.
Full text available.bug-guix@HIDDEN:bug#55854; Package guix.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.