From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id WFkvLlKHrGL8KwAAbAwnHQ (envelope-from ) for ; Fri, 17 Jun 2022 15:53:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 0MIvLlKHrGJmIwEA9RJhRA (envelope-from ) for ; Fri, 17 Jun 2022 15:53:22 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 83F56797F for ; Fri, 17 Jun 2022 15:53:22 +0200 (CEST) Received: from localhost ([::1]:55744 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o2CPZ-0001Z4-By for larch@yhetil.org; Fri, 17 Jun 2022 09:53:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49244) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o2CPH-0001RP-Lq for bug-guix@gnu.org; Fri, 17 Jun 2022 09:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50596) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o2CPH-0007M2-Bu for bug-guix@gnu.org; Fri, 17 Jun 2022 09:53:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o2CPG-0007yB-B6 for bug-guix@gnu.org; Fri, 17 Jun 2022 09:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#55854: [PATCH 1/2] import: Check that GNOME minor version is not a semver prerelease. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 17 Jun 2022 13:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55854 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 55854@debbugs.gnu.org Cc: Kaelyn Received: via spool by 55854-submit@debbugs.gnu.org id=B55854.165547394630581 (code B ref 55854); Fri, 17 Jun 2022 13:53:02 +0000 Received: (at 55854) by debbugs.gnu.org; 17 Jun 2022 13:52:26 +0000 Received: from localhost ([127.0.0.1]:44490 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2COg-0007xB-9s for submit@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 ) id 1o2COd-0007wr-DJ for 55854@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@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 Date: Fri, 17 Jun 2022 15:44:02 +0200 Content-Transfer-Encoding: 7bit Message-ID: <8f37e2ae72f4e532f05f8cd010099a8e87e57c47.camel@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1655474002; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=GHiyaKZznkXc46PuUGukjmiReuNfFo5jxz6YT3XIecE=; b=YTkIegvufHGiBI+AzCRAoQPSADOIyfsq3qlbz00fmkfLYMjeoRjPLcQXlP9i3uHa7zvEn0 mwrnRHOHU3jVVGna4ughIFLCKq4vbynhQJal5p0eDNIccQCRp3NUWQw46Y/mk875m8B0CJ eClS58Ko8+KhDDMpa9ehMccWkvv5jKw6J6n6n/kIcQjq+J/w/WdOjNhJP+aoj3sU43RmGA 6nz1v4cyrRkDHIG4lgFT/+buxYFzdMq456Ndqhr3QlAv8DW/T7nQBL2mL8E4kW9PZcYUo8 qY2zJE1oPtZPKUT6irVoVRaJvhONIyugaD4pf1M2TGouAJoEG8EMkFjFfw/lew== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1655474002; a=rsa-sha256; cv=none; b=JeXmMn+8NV+gbuXQ4tgF0v+Gs4f2pMtvpo2KD9oqVIsYB2qReAuNZ6xum5V5/DYHJmpy2O K0b1OvxflF0JcUFj3NFhEkkgpCblWsk3NmFibB0ECUPWfz9+9Rmv2VQSxMdP6QEBhs5xs5 TFMd10ORCL76Bai1k0lmfI84m+5kXIS/hccRzEwLU1D7bUmbGi3z0/HJ9tBWPcNIcRysFO m4lsCOanjZLF1IA4GN/zjmBmOHBdDYpMHq1M18+eUZvV9GrbqXBYI3JfG3ytRMr44eEnh4 LIh4eTSRYluOfnvLj4eI0M/t+uqDIVBuCmSYJ4mO20gO0ny+HUbBWQsSHRLrjQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=BB+OsZlc; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 6.01 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=BB+OsZlc; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 83F56797F X-Spam-Score: 6.01 X-Migadu-Scanner: scn1.migadu.com X-TUID: 3r/3Obed/hNJ * 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