From unknown Wed Jun 18 00:26:23 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#60724 <60724@debbugs.gnu.org> To: bug#60724 <60724@debbugs.gnu.org> Subject: Status: [PATCH] gnu: normalize package versions Reply-To: bug#60724 <60724@debbugs.gnu.org> Date: Wed, 18 Jun 2025 07:26:23 +0000 retitle 60724 [PATCH] gnu: normalize package versions reassign 60724 guix-patches submitter 60724 Morgan.J.Smith@outlook.com severity 60724 normal tag 60724 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 10 22:02:53 2023 Received: (at submit) by debbugs.gnu.org; 11 Jan 2023 03:02:53 +0000 Received: from localhost ([127.0.0.1]:41493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFRO8-0004Ln-VK for submit@debbugs.gnu.org; Tue, 10 Jan 2023 22:02:53 -0500 Received: from lists.gnu.org ([209.51.188.17]:52044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFRO7-0004Lf-91 for submit@debbugs.gnu.org; Tue, 10 Jan 2023 22:02:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFRO6-00005q-QN for guix-patches@gnu.org; Tue, 10 Jan 2023 22:02:50 -0500 Received: from mail-bn8nam12olkn2060.outbound.protection.outlook.com ([40.92.21.60] helo=NAM12-BN8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFRO3-0004mn-Ui for guix-patches@gnu.org; Tue, 10 Jan 2023 22:02:50 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NkBhlfqmd22Ettp5VR9dXe7zNcikEUN1id9ZC137k+JSRCpOauzGIQ1p5/k2cyUhqh1zYdLWPeYt2pj6O2xSFbIyiC6pDVCJoGPAXMiiKIwEQBqQsjLwtLPr3taOAOrHS0X2Zlr+W9mEU8k1YZbrwDqWcIvIK58VbJ4sMj8sdgcSIhxChggU2NRpfVd9nKL8QEHZ9NyzIaHAC1L88jrSZad5misX767TFhLRFOyDprFOtjKYW7TpJpOfPDqVSECqsE+yU05nI5g0VHAUQ00KjEg/Hkg/VgPVlpJyMimaL931+3m4Q7QYhUf3BslYKo1iSoaVOInqGlstrALoBiD19w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=XykDs8FSGsMDSEJ3sUL1mjqTZMRBA4ChNat1a2fM1AA=; b=WRkDHyRXEBVcYihxSdM9b3N5kJ7rTMYBiIZod2MBDuzmhzfTU9zRPpAnxMYreKhawQekAMguSpJrjTQaSmHSfybFsaflsvfQrHdeRovz1vtQuT6Zp4vqeLHbComg0bX0lpzc8uirYZXmQ47s5V7Bk/SEDT5nRpoTTBwYd97H6c+eLqEDakhJXMW4ZsHGF1QdqzKDauScbB76jIPV8/tEy+AfVcaBIaCOAf39S38rtJBFtg+6+bRB0i8lS6FsTt1lICGcN7YhP3YgNsWTkzP7/AJywspOJZ9dc0plr47peUNwo238dvXdzs+5HhhQgZ4a+cLyMOPduEStObNa0z/z5A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XykDs8FSGsMDSEJ3sUL1mjqTZMRBA4ChNat1a2fM1AA=; b=jpvMEgoLWZDiJ+tyhfjBwhuUXReHye8GRtCSTSecBo7lalUJFRsfkLYdnr+K3zAZmBb5CVWM86S1sfSZh00XZSfp1hPSK8LLQC2i2q2waAoRUXQ9nEf0cNqY/No719CU68iQ7HZQnV9ww75RWmfdvVVxS/a4X2GxvdFD7tNr/ucXI/6e5le5UaZNiq+lEY9ikC8rrqCkJa6d/fWw87MKIybBdHrOgkwX9p+Ua4kT+nuyxvPsyvT3WZ1t4lLOiUfLP7h1R8EBV3QGRNp1NohIXlQp5ZFVB+sFtpmMl2iFEqB3NUOO6whwk13KwelvjlVxbnf2S+RpgLHPHulv0bliiw== Received: from DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) by BL1PR03MB6197.namprd03.prod.outlook.com (2603:10b6:208:30b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.13; Wed, 11 Jan 2023 03:02:44 +0000 Received: from DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::9d7c:7c0a:3e89:57dc]) by DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::9d7c:7c0a:3e89:57dc%4]) with mapi id 15.20.5986.018; Wed, 11 Jan 2023 03:02:44 +0000 From: Morgan.J.Smith@outlook.com To: guix-patches@gnu.org Subject: [PATCH] gnu: normalize package versions Date: Tue, 10 Jan 2023 21:58:31 -0500 Message-ID: X-Mailer: git-send-email 2.38.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [XpuysqD32ieLjWUTa207ZcJ6V2R+ceqq] X-ClientProxiedBy: YQBPR01CA0076.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:3::12) To DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) X-Microsoft-Original-Message-ID: <20230111025830.29291-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR03MB3163:EE_|BL1PR03MB6197:EE_ X-MS-Office365-Filtering-Correlation-Id: 99249d94-f8ec-4cee-bd86-08daf3804f42 X-MS-Exchange-SLBlob-MailProps: V85gaVfRD4+aId5iDE/vJgRVVWRzh1AuLA3/sUiEkZvRww2AAvRXtQpA9Z4uC0VMfKcGSwBF2GNZsRSSv5BTp19zJH2FLOJPKt5wlPZl3MTFK+7sSxpD41vvXybGO7IbMNxWHqMY5+QgwW08Vmb6B3DJFZ8ZPacRIcrNtwCzZxq4nLAN7bWJuB5/U2MbG8GZc0NpzslcuBHr/ygQkQ4EtyKLwHu27aIZLUa3ufNLqBELSbsS/yntznlMCN/EDZPtXkdKWZEHClk3wW/qjHRwaIQiCWGemHxXInAj7NVPmLIpd3hVqE02Qvbm6x0szgwPJeaHZZsfvEjrM9Bt5lMx4i31bOTj36LLlxAVrbJD0wiDyFXphz0v4uMKF+49bkadoKu7nZZvc0gAb/X9mcfUqQUCInbyrnTyY05wF/j9Z1XPR2ameFcZxvRNNxxQcI8wnE88sdxhECPP9ELgWXkeNPIgb+Ur5zSRdwiEUYiomtMm27CKjUmVaTJANqgnMpSbQonKATNVaZR618XWZ39wHxLB3ykjmimauL5WmnIlyVtFgY4KUz8IPPmG5CJ67tV80CuZw7hx+L/vWD8BsCHii1wBgDDAqMrFpClIXzV8UE0W1zpA7Ux93rnMP0yPZuHNv2Jj54lS+Hpt0/Cw+4LjVNmS4MWYBdGQKlYoix7vJ6PkucPK8OWI0nDN04uXdDVYFqmmVA2DB03KPYgskHdxZK7WsQMEwtX66mSohsyucWJ2rgs8WLu4uBGhgKPeaghEaiZsKaH9GOg3uDanYhDLmhv+dPCgF/q+xD+fugp31Gd7g16V43FxzmJax0pKDESzOF9kJFNAfWla47gBf/jJPg== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ab3vkHV15JxJBAdsdeH6qWzqDyCYDyRk4a7OxM1Z97v5/mRadEMiRvThExlyPuScTVVb5uYVSH0NuD7m8+WscjGBzPl7pgqERApl2UNxS6viYzTmWv0R6YjUKGhj3Gn0VFIRizx+VHDqEwlCWAqWPnoSBUVlbBdJS4FaiBzAhxExhkSiZYoNwtK6y+RRBS4LagTdEiEztB7jatia3xMI0D11dY42VlBGjwH5AzYIFRrZxozYM/wQ9gW8RrKu2CfxtYtTaLSl0NRLACxq7Lab8t3JajszzoLs5NClqqxZnLWu2VWDxW3r8LfXaL/9LyinSMSl36QUsAEJ1j6Bv7ATf6pAEOJ5rKe0mX8NM+nKh/fU5aoTx/vVH4gMTmRhEgYbR5eGjy2wItlkl/gt/XjgMvL5gJ2Qw5vJ1lmqINS0RLcvr42MY4UAkp/11lshnjtZDxezWCZFBd0bJ5mMy+kKTcxzGWdZeUohHWR8Sy9Yz60o3xKMXtFMv0ppdl1OrfuMQqxh/Pvqn5GmkWfY4D2i/EtKAXf955B/HA1Nkn+I1q9tUDRQCDCyz+fbiSEgZ/qUBPp9PzE/I2O0lFNGVogH1lmR8bIlLTLHpi9fJIl2PybksSHihCT+aMDLF62yvTEwWmuTiwI32Hb21A2f67PmKyygdIM1u66VelByZxcJTFNZJ4ptY6+YU07SX0V4fhAO X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xMZUAJ+kRRa+spDmA0qZanL635h2IPyUfAdjKvcy8PWqQK4Ub9zKkiNERg0W?= =?us-ascii?Q?4zQInc4JVjWV0xQaaNFUSk5uCbB8GMuY1y/hmt/EsBOl178jL9F8miwT8ApP?= =?us-ascii?Q?8yZyiNojaUJVXt+G4IlfhoARs5p6T3APb8g2TLwPP3lMWaLSS2A6YRAvpIht?= =?us-ascii?Q?yxatTc0NseWMekBVd2uNQLDf4N6bJVaDTYQJfKPAEwA0fua0suJ5BuK4NewS?= =?us-ascii?Q?U4DdhSAoq3JBTEVwBC77aRAg6QaJhYYMZISs/Ogq2hix8q+6/Q0pyv+LnclU?= =?us-ascii?Q?/DIhSnDejS4Xhc+JoEfKxQ3agf4xyFWIFlny5FdOBBO2VcFBkzT7M5ME7RO7?= =?us-ascii?Q?Lwe4EyeMkRTugJsazqvGaUOUCk7raOcFD7c1LZOzKoYFwgw111ESHiG2INwe?= =?us-ascii?Q?bRAyFn8Kmb81Dsw1OrRCMrV0+RRnLeTFAEjrCiE/Jft4RDPPUUkvUgsN+KoF?= =?us-ascii?Q?TRKKpnr0ZiByK4xalWPfFgsf570B/rb8CWFJNdLXJKFSjrtKD7gPgK1PlDbi?= =?us-ascii?Q?XDCA4zW6JvOREi9wDcjTCxas4bZRaBUQyn/5nmiL3zFJvxRQCv7FSN7/9ELi?= =?us-ascii?Q?i7u6a6KDF6dCHOrowBdSWQlBc7Hi8AhRIaluU4hS5aphx9s9g9A6oknraRk2?= =?us-ascii?Q?RBytlZp/RQXDALpUrgTb+xsOq7qIzFD0DcVhJlPZjt55Fi7joBEaYLJzEcy+?= =?us-ascii?Q?jM0xI6FkRU/G1V+PDZtiVVfCNpqysqKFxmhjM8OPtV3bc/BSw6DPhbbGbCVL?= =?us-ascii?Q?gOj60eokUzDqdt8zMJf5IZA3Z889CN4uFxf6fnVG/VMSoen+xX8RNRZqK1G/?= =?us-ascii?Q?aN84sfZKc8L1LHa45wm9zAQmqeR4NquPd3H5g8zBOPf9to6seZ6ah5TSICdZ?= =?us-ascii?Q?Vk1gCrlp8+mc0+uqtv6vPt1CLR9CP7c3inAJ/x+m5x7FrTwFbKPSXdcDTcHF?= =?us-ascii?Q?kf+VNjC0qMHRuvtrimn6V+guoxuYfZtoBm/kDZ2EVdTW/y3+mMyTONvQ4Vo0?= =?us-ascii?Q?dW7ZfhoAQSPI7cw4YtGm9tM1sclyt/i4729nmxIvZsunLbzGTyVPC4B09F+s?= =?us-ascii?Q?wMb8pOYnBkLyonPwqSb+W9LS1562QigTKnGlo413uKoOHRxg8y4FcjiwWTfp?= =?us-ascii?Q?/Lp43s1vNbW/AW1QBl1UBeiOqbh+YusyRGS/mW2M+KCtI0tD8UmohA8MhOoC?= =?us-ascii?Q?5vwAdM/Ex3MTvMqVrx9xieAyb4VckMpVn+eXXOt0GX1oLK0NgZ7+gwkKJiGn?= =?us-ascii?Q?gdr3p60HgCqfIznUwb1t88OoceT79c7BCfa7J19RsPZjisYiPoQZ6E8Z0gWB?= =?us-ascii?Q?G6U=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 99249d94-f8ec-4cee-bd86-08daf3804f42 X-MS-Exchange-CrossTenant-AuthSource: DM5PR03MB3163.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2023 03:02:44.1702 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR03MB6197 Received-SPF: pass client-ip=40.92.21.60; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM12-BN8-obe.outbound.protection.outlook.com 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Morgan Smith X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) From: Morgan Smith * gnu/packages/fpga.scm (abc): Use full commit sha. * gnu/packages/graphics.scm (flux): Use full commit sha and git-version. * gnu/packages/mail.scm (esmtp): Use full commit sha, git-version, and git-file-name. * gnu/packages/ruby.scm (ruby-minitest-5.14): Move version from name to version field. * gnu/packages/textutils.scm (cityhash): Use full commit sha, git-version, and git-file-name. --- repology has a script that parses our generated packages.json file. That script outputs some warnings related to these packages. No clue if this patch fixes that but it might. There are 714 dependent packages of the 5 I touched repology logs: https://repology.org/repositories/updates gnu/packages/fpga.scm | 2 +- gnu/packages/graphics.scm | 41 ++++++++++++++-------------- gnu/packages/mail.scm | 55 +++++++++++++++++++------------------- gnu/packages/ruby.scm | 3 +-- gnu/packages/textutils.scm | 7 ++--- 5 files changed, 55 insertions(+), 53 deletions(-) diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index acce5f8f82..f4562c27d7 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -65,7 +65,7 @@ (define-module (gnu packages fpga) #:use-module (gnu packages libusb)) (define-public abc - (let ((commit "70cb339f869e") + (let ((commit "70cb339f869e485802159d7f2b886130793556c4") (revision "2")) (package (name "abc") diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index f23fad7c50..fcc80c6bed 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -234,27 +234,28 @@ (define-public directfb (license license:lgpl2.1+))) (define-public flux - (package - (name "flux") - (version "1.4.4") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/deniskropp/flux") - (commit "e45758a"))) - (file-name (git-file-name name version)) - (sha256 - (base32 "11f3ypg0sdq5kj69zgz6kih1yrzgm48r16spyvzwvlswng147410")))) - (build-system gnu-build-system) - (native-inputs - (list autoconf automake libtool pkg-config)) - (synopsis "Interface description language") - (description "Flux is an interface description language used by DirectFB. + (let ((commit "e45758aa9384b9740ff021ea952399fd113eb0e9") + (revision "0")) + (package + (name "flux") + (version (git-version "1.4.4" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/deniskropp/flux") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11f3ypg0sdq5kj69zgz6kih1yrzgm48r16spyvzwvlswng147410")))) + (build-system gnu-build-system) + (native-inputs (list autoconf automake libtool pkg-config)) + (synopsis "Interface description language") + (description + "Flux is an interface description language used by DirectFB. Fluxcomp compiles .flux files to .cpp or .c files.") - (home-page "https://www.directfb.org/") - (license license:lgpl2.1+))) ; Same as DirectFB + (home-page "https://www.directfb.org/") + (license license:lgpl2.1+)))) ; Same as DirectFB (define-public fox (package diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index da2189c1ad..5449714c85 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2494,38 +2494,39 @@ (define-public libesmtp (license (list license:lgpl2.1+ license:gpl2+)))) (define-public esmtp - (package - (name "esmtp") - (version "1.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/andywingo/esmtp") - (commit "01bf9fc"))) - (sha256 - (base32 - "1ay282rrl92h0m0m8z5zzjnwiiagi7c78aq2qvhia5mw7prwfyw2")) - (file-name (string-append name "-" version "-checkout")) - (patches (search-patches "esmtp-add-lesmtp.patch")))) - (arguments - `(#:phases (modify-phases %standard-phases - (replace 'bootstrap - (lambda _ (invoke "autoreconf" "-vfi")))))) - (build-system gnu-build-system) - (native-inputs - (list bison flex autoconf automake libtool)) - (inputs - (list libesmtp)) - (home-page "https://sourceforge.net/projects/esmtp/") - (synopsis "Relay-only mail transfer agent (MTA)") - (description "Esmtp is a simple relay-only mail transfer agent built using + (let ((commit "01bf9fc9abc85f3f1c9c47d31591fb21da89e65f") + (revision "0")) + (package + (name "esmtp") + (version (git-version "1.2" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/andywingo/esmtp") + (commit commit))) + (sha256 + (base32 + "1ay282rrl92h0m0m8z5zzjnwiiagi7c78aq2qvhia5mw7prwfyw2")) + (file-name (git-file-name name version)) + (patches (search-patches "esmtp-add-lesmtp.patch")))) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'bootstrap + (lambda _ + (invoke "autoreconf" "-vfi")))))) + (build-system gnu-build-system) + (native-inputs (list bison flex autoconf automake libtool)) + (inputs (list libesmtp)) + (home-page "https://sourceforge.net/projects/esmtp/") + (synopsis "Relay-only mail transfer agent (MTA)") + (description + "Esmtp is a simple relay-only mail transfer agent built using libESMTP. It sends e-mail via a remote SMTP server using credentials from the user's @file{$HOME/.esmtprc} configuration file; see the @command{esmtprc} man page for more on configuration. This package also provides minimal compatibility shims for the @command{sendmail}, @command{mailq}, and @command{newaliases} commands.") - (license license:gpl2+))) + (license license:gpl2+)))) (define-public fdm (package diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 540aab23af..8f44795267 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4341,8 +4341,7 @@ (define-public ruby-minitest (define-public ruby-minitest-5.14 (package (inherit ruby-minitest) - (name "ruby-minitest-5.14") - (version "") + (version "5.14.4") (source (origin (method url-fetch) (uri (rubygems-uri "minitest" version)) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 151add964e..4fd545720b 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -316,16 +316,17 @@ (define-public libgtextutils (license license:agpl3+))) (define-public cityhash - (let ((commit "8af9b8c")) + (let ((commit "8af9b8c2b889d80c22d6bc26ba0df1afb79a30db") + (revision "2")) (package (name "cityhash") - (version (string-append "1.1-2." commit)) + (version (git-version "1.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/google/cityhash") (commit commit))) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (git-file-name name version)) (sha256 (base32 "0n6skf5dv8yfl1ckax8dqhvsbslkwc9158zf2ims0xqdvzsahbi6")))) -- 2.38.1