From patchwork Sat Jul 26 02:39:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43269 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E34C427BC4B; Sat, 26 Jul 2025 03:41:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1689827BC49 for ; Sat, 26 Jul 2025 03:41:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUqT-0008P8-A3; Fri, 25 Jul 2025 22:41:09 -0400 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 1ufUqR-0008OI-7Y for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:07 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ufUqQ-0005OL-Rj for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=D8jm7wNynGt4AZq/mnR7UERLiqMrQLmEHfU/BYEFBu0=; b=m5Mpr5Aigh/Yio5N1wrm5cmTkcHwLDFyyJRB35CIaEmfiQ2qsEBLry8BvCPzkqWi9mrQ+2f/qv6vPkTHbpXw5gqyyI7ssHzjSSpk+3mSG7Z9xovrXYK8kCJAU+BGTrUaIGYbquABTkSeG4SXzd2EFqU3PLrkM1zT0DnvAUemW43xg1E1fmPqpLP8EDFGnTGPrJsFkBrZZV/jjKpNGnITofSz/JCtUUL/rI3d2J8FUu/PSSHLkBI6MrgxsFop49j6Kug8281+HgobtFwHmAi0IF9Bbx7uTn0DtY5aPriIY6UOFcYXt5/aHXHFZDqPKNugNT6Z2de+CPe9/2r94bBB9g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqQ-0007rU-Gi for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 14/34] gnu/packages/e*.scm: Use make-git-version. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Jul 2025 02:41:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79099 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 79099@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 79099-submit@debbugs.gnu.org id=B79099.175349763229849 (code B ref 79099); Sat, 26 Jul 2025 02:41:06 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:40:32 +0000 Received: from localhost ([127.0.0.1]:38102 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUpr-0007lD-RH for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:31 -0400 Received: from 2.mo563.mail-out.ovh.net ([46.105.33.33]:40843) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpY-0007fP-LP for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:14 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqv1R8qz5yZr; Sat, 26 Jul 2025 02:40:11 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79099@debbugs.gnu.org>; Sat, 26 Jul 2025 02:40:11 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.164.115]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqt70mkz5xQQ; Sat, 26 Jul 2025 02:40:10 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 9EBE63E3062; Sat, 26 Jul 2025 02:40:10 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-109S003de0ca215-a796-4276-8d0c-cfb9c6f81f42, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:20 +0200 Message-ID: <20250726023951.11862-14-ngraves@ngraves.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250726023951.11862-1-ngraves@ngraves.fr> References: <20250726023951.11862-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4614500771792151266 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvheelieffheetvdelhfffffejfefgudfhteekveehieetudeiudfgkeeutdehjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledtleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=D8jm7wNynGt4AZq/mnR7UERLiqMrQLmEHfU/BYEFBu0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497611; v=1; b=44nlKrNZT/dKnqAYV63CcR0cTNUshJwvWW6CTUCBeq9lhv/5d53ErrnfnfoCOExBnqLXYfaz 6GzUFqrF9SzqPoF/Badr2X8P/g0iILxSwR5uFMWrTf4rFf8Dz7Z0ZzzX1aJpZEpRI9CgLEGxzh4 CfNASBU6g+xznHkFP8TcSvkiOM8iEWbEfBzRNQQL90Z6zbghQtbhiKemW9Lk7h0kHUj8KP8IOR9 Hgn7Y0Z+wuk1UVpmyR2VbOvIzdHCefLukOKTkY61bDFTppMe3qUEPwC+uq58mcs9Lguxz3uZh7r VlmI2n7q1INctv53MI3eTXrW2ozZjE4chBjVfUN2LjJjg== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches find gnu/packages/ -type f -name "e*.scm" -exec sed -i 's/(git-version /(make-git-version /g' {} + Then manually checked the potential usage of `version` on the build-side. --- gnu/packages/education.scm | 4 +- gnu/packages/efi.scm | 2 +- gnu/packages/electronics.scm | 12 +- gnu/packages/elm.scm | 2 +- gnu/packages/emacs-build.scm | 6 +- gnu/packages/emacs-xyz.scm | 1013 +++++++++++++++++----------------- gnu/packages/emacs.scm | 4 +- gnu/packages/embedded.scm | 14 +- gnu/packages/emulators.scm | 35 +- gnu/packages/engineering.scm | 46 +- gnu/packages/erlang.scm | 2 +- gnu/packages/esolangs.scm | 2 +- 12 files changed, 573 insertions(+), 569 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index c27ca88c73a..61df93fee85 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -282,7 +282,7 @@ (define-public gotypist (commit "03f8618f8e23acdaa94cda3bcf197da520db8dd4")) (package (name "gotypist") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -753,7 +753,7 @@ (define-public kanatest (revision "0")) (package (name "kanatest") - (version (git-version "0.4.10" revision commit)) + (version (make-git-version "0.4.10" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index 99b41e91693..92edcb388b2 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -68,7 +68,7 @@ (define-public efi-analyzer (revision "0")) (package (name "efi-analyzer") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index b1a02f8f9e2..5978ad626b9 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -123,7 +123,7 @@ (define-public libsigrok (revision "2")) (package (name "libsigrok") - (version (git-version "0.5.2" revision commit)) + (version (make-git-version "0.5.2" revision commit)) (source (origin (method git-fetch) @@ -196,7 +196,7 @@ (define-public libsigrokdecode (revision "1")) (package (name "libsigrokdecode") - (version (git-version "0.5.3" revision commit)) + (version (make-git-version "0.5.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -430,7 +430,7 @@ (define-public prjtrellis (revision "0")) (package (name "prjtrellis") - (version (git-version "1.4" revision commit)) + (version (make-git-version "1.4" revision commit)) (source (origin (method git-fetch) @@ -488,7 +488,7 @@ (define-public opensta (package (name "opensta") ;; The version string is taken from the CMakeLists.txt. - (version (git-version "2.6.2" revision commit)) + (version (make-git-version "2.6.2" revision commit)) (source (origin (method git-fetch) @@ -603,7 +603,7 @@ (define-public python-cocotb-bus (revision "0")) (package (name "python-cocotb-bus") - (version (git-version "0.2.1" revision commit)) + (version (make-git-version "0.2.1" revision commit)) (source (origin (method git-fetch) @@ -824,7 +824,7 @@ (define-public sigrok-firmware-fx2lafw (revision "1")) (package (name "sigrok-firmware-fx2lafw") - (version (git-version "0.1.7" revision commit)) + (version (make-git-version "0.1.7" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/elm.scm b/gnu/packages/elm.scm index a74d294ae54..5f280659b89 100644 --- a/gnu/packages/elm.scm +++ b/gnu/packages/elm.scm @@ -511,7 +511,7 @@ (define-public elm-todomvc (revision "1")) (package (name "elm-todomvc") - (version (git-version "1" revision commit)) + (version (make-git-version "1" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/emacs-build.scm b/gnu/packages/emacs-build.scm index f92eb05c8e4..1af3d75aa18 100644 --- a/gnu/packages/emacs-build.scm +++ b/gnu/packages/emacs-build.scm @@ -37,7 +37,7 @@ (define-public emacs-ansi (revision "2")) (package (name "emacs-ansi") - (version (git-version "0.4.1" revision commit)) + (version (make-git-version "0.4.1" revision commit)) (source (origin (method git-fetch) @@ -269,7 +269,7 @@ (define-public emacs-el-mock (revision "1")) (package (name "emacs-el-mock") - (version (git-version "1.25.1" revision commit)) + (version (make-git-version "1.25.1" revision commit)) (source (origin (method git-fetch) @@ -528,7 +528,7 @@ (define-public makel (revision "0")) (package (name "makel") - (version (git-version "0.8.0" revision commit)) + (version (make-git-version "0.8.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 187666abc6c..a823cf92d51 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -323,7 +323,7 @@ (define-public emacs-0x0 (revision "0")) (package (name "emacs-0x0") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -348,7 +348,7 @@ (define-public emacs-ac-ispell (revision "1")) (package (name "emacs-ac-ispell") - (version (git-version "0.07" revision commit)) + (version (make-git-version "0.07" revision commit)) (source (origin (method git-fetch) @@ -371,7 +371,7 @@ (define-public emacs-elisp-autofmt (revision "0")) (package (name "emacs-elisp-autofmt") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -441,7 +441,7 @@ (define-public emacs-ace-jump-helm-line (revision "0")) (package (name "emacs-ace-jump-helm-line") - (version (git-version "0.5.0" revision commit)) + (version (make-git-version "0.5.0" revision commit)) (source (origin (method git-fetch) @@ -686,7 +686,7 @@ (define-public emacs-gptel-quick (revision "1")) (package (name "emacs-gptel-quick") - (version (git-version "0.0.5" revision commit)) + (version (make-git-version "0.0.5" revision commit)) (source (origin (uri (git-reference @@ -792,7 +792,7 @@ (define-public emacs-ac-geiser (revision "0")) (package (name "emacs-ac-geiser") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (uri (git-reference @@ -818,7 +818,7 @@ (define-public emacs-geiser-gauche (revision "0")) (package (name "emacs-geiser-gauche") - (version (git-version "0.14" revision commit)) + (version (make-git-version "0.14" revision commit)) (source (origin (method git-fetch) @@ -1016,7 +1016,7 @@ (define-public emacs-inspector (revision "1")) (package (name "emacs-inspector") - (version (git-version "0.38" revision commit)) + (version (make-git-version "0.38" revision commit)) (source (origin (uri (git-reference @@ -1046,7 +1046,7 @@ (define-public emacs-inspirehep (revision "0")) (package (name "emacs-inspirehep") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -1212,7 +1212,7 @@ (define-public emacs-hgignore-mode (package (name "emacs-hgignore-mode") ;; `Version:' header says 0.1.20150329 - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1348,7 +1348,7 @@ (define-public emacs-vline (revision "0")) (package (name "emacs-vline") - (version (git-version "1.11" revision commit)) + (version (make-git-version "1.11" revision commit)) (source (origin (method git-fetch) @@ -1376,7 +1376,7 @@ (define-public emacs-xhair (package (name "emacs-xhair") ;; No tag, version comes from source code - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -1426,7 +1426,7 @@ (define-public emacs-hg-histedit (revision "0")) (package (name "emacs-hg-histedit") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1500,7 +1500,7 @@ (define-public emacs-puni (revision "3")) (package (name "emacs-puni") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1630,7 +1630,7 @@ (define-public emacs-snow (revision "1")) (package (name "emacs-snow") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -1653,7 +1653,7 @@ (define-public emacs-spongebob (revision "0")) (package (name "emacs-spongebob") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -1741,7 +1741,7 @@ (define-public emacs-project-mode-line-tag (revision "0")) (package (name "emacs-project-mode-line-tag") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1765,7 +1765,7 @@ (define-public emacs-project-tab-groups (revision "1")) (package (name "emacs-project-tab-groups") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -1877,7 +1877,7 @@ (define-public emacs-golden-ratio (revision "0")) (package (name "emacs-golden-ratio") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -1968,7 +1968,7 @@ (define-public emacs-libgit (revision "1")) (package (name "emacs-libgit") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2415,7 +2415,7 @@ (define-public emacs-fzf (revision "1")) (package (name "emacs-fzf") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2447,7 +2447,7 @@ (define-public emacs-ezf (revision "0")) (package (name "emacs-ezf") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2610,7 +2610,7 @@ (define-public emacs-acme-theme (revision "0")) (package (name "emacs-acme-theme") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -2633,7 +2633,7 @@ (define-public emacs-catppuccin-theme (revision "2")) (package (name "emacs-catppuccin-theme") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -2811,7 +2811,7 @@ (define-public emacs-typing (revision "0")) (package (name "emacs-typing") - (version (git-version "1.1.4" revision commit)) + (version (make-git-version "1.1.4" revision commit)) (source (origin (method git-fetch) @@ -2910,7 +2910,7 @@ (define-public emacs-graphql-mode (revision "1")) (package (name "emacs-graphql-mode") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -3039,7 +3039,7 @@ (define-public emacs-scribble-mode (revision "2")) (package (name "emacs-scribble-mode") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3108,7 +3108,7 @@ (define-public emacs-solidity (revision "0")) (package (name "emacs-solidity") - (version (git-version "0.1.10" revision commit)) + (version (make-git-version "0.1.10" revision commit)) (source (origin (method git-fetch) @@ -3133,7 +3133,7 @@ (define-public emacs-unpackaged (revision "4")) (package (name "emacs-unpackaged") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -3167,7 +3167,7 @@ (define-public emacs-haskell-mode (revision "0")) (package (name "emacs-haskell-mode") - (version (git-version "17.5" revision commit)) + (version (make-git-version "17.5" revision commit)) (source (origin (method git-fetch) @@ -3238,7 +3238,8 @@ (define emacs-prefix? (cut string-prefix? "emacs-" <>)) (let* ((out (assoc-ref outputs "out")) (el-dir (emacs:elpa-directory out)) (doc (string-append - out "/share/doc/haskell-mode-" #$version)) + out "/share/doc/haskell-mode-" + #$(package-version this-package))) (info (string-append out "/share/info"))) (define (copy-to-dir dir files) (for-each (lambda (f) @@ -3421,7 +3422,7 @@ (define-public emacs-flycheck-clj-kondo (revision "1")) (package (name "emacs-flycheck-clj-kondo") - (version (git-version "0.0.4" revision commit)) + (version (make-git-version "0.0.4" revision commit)) (source (origin (method git-fetch) @@ -3492,7 +3493,7 @@ (define-public emacs-flymake-clippy (revision "0")) (package (name "emacs-flymake-clippy") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (uri (git-reference @@ -3582,7 +3583,7 @@ (define-public emacs-flymake-perlcritic (revision "1")) (package (name "emacs-flymake-perlcritic") - (version (git-version "1.0.3" revision commit)) + (version (make-git-version "1.0.3" revision commit)) (source (origin (method git-fetch) @@ -3666,7 +3667,7 @@ (define-public emacs-flymake-quickdef (commit "150c5839768a3d32f988f9dc08052978a68f2ad7")) (package (name "emacs-flymake-quickdef") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -3709,7 +3710,7 @@ (define-public emacs-flymake-shellcheck (revision "1")) (package (name "emacs-flymake-shellcheck") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -3815,7 +3816,7 @@ (define-public emacs-ahg (revision "0")) (package (name "emacs-ahg") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3873,7 +3874,7 @@ (define-public emacs-world-time-mode (revision "0")) (package (name "emacs-world-time-mode") - (version (git-version "0.0.6" revision commit)) + (version (make-git-version "0.0.6" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3975,7 +3976,7 @@ (define-public emacs-ample-regexps (revision "2")) (package (name "emacs-ample-regexps") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -4025,7 +4026,7 @@ (define-public emacs-ample-theme (revision "1")) (package (name "emacs-ample-theme") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4094,7 +4095,7 @@ (define-public emacs-rescript-mode (revision "0")) (package (name "emacs-rescript-mode") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4166,7 +4167,7 @@ (define-public emacs-relative-buffers (commit "9762fe268e9ff150dcec2e2e45d862d82d5c4008")) (package (name "emacs-relative-buffers") - (version (git-version release revision commit)) + (version (make-git-version release revision commit)) (source (origin (method git-fetch) @@ -4221,7 +4222,7 @@ (define-public emacs-bug-hunter (revision "1")) (package (name "emacs-bug-hunter") - (version (git-version "1.3.1" revision commit)) + (version (make-git-version "1.3.1" revision commit)) (source (origin (method git-fetch) @@ -4372,7 +4373,7 @@ (define-public emacs-dnt (revision "1")) (package (name "emacs-dnt") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -4640,7 +4641,7 @@ (define-public emacs-eradio (revision "0")) (package (name "emacs-eradio") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4695,7 +4696,7 @@ (define-public emacs-app-launcher (revision "0")) (package (name "emacs-app-launcher") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -4801,7 +4802,7 @@ (define-public emacs-read-only-cfg (revision "0")) (package (name "emacs-read-only-cfg") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -4826,7 +4827,7 @@ (define-public emacs-rebecca-theme (revision "0")) (package (name "emacs-rebecca-theme") - (version (git-version "1.3.2" revision commit)) + (version (make-git-version "1.3.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4849,7 +4850,7 @@ (define-public emacs-reverso (revision "0")) (package (name "emacs-reverso") - (version (git-version "0.1.2" revision commit)) + (version (make-git-version "0.1.2" revision commit)) (source (origin (method git-fetch) @@ -4900,7 +4901,7 @@ (define-public emacs-bbdb-vcard (commit "113c66115ce68316e209f51ebce56de8dded3606")) (package (name "emacs-bbdb-vcard") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5026,7 +5027,7 @@ (define-public emacs-bar-cursor (commit "78f195b6db63459033c4f1c7e7add5d82f3ce424")) (package (name "emacs-bar-cursor") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5075,7 +5076,7 @@ (define-public emacs-carp (revision "0")) (package (name "emacs-carp") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (uri (git-reference @@ -5304,7 +5305,7 @@ (define-public emacs-dhall-mode (commit "484bcf8f78f1183ef45c3b04a362bb73690c6b9b")) (package (name "emacs-dhall-mode") - (version (git-version "0.1.3" revision commit)) + (version (make-git-version "0.1.3" revision commit)) (source (origin (method git-fetch) @@ -5339,7 +5340,7 @@ (define-public emacs-link-hint (revision "4")) (package (name "emacs-link-hint") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -5409,7 +5410,7 @@ (define-public emacs-aio (commit "289c1e9530b59b4e2fd88f87f303547b23f2a3e3")) (package (name "emacs-aio") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5522,7 +5523,7 @@ (define-public emacs-latex-extra (revision "0")) (package (name "emacs-latex-extra") - (version (git-version "1.14" revision commit)) + (version (make-git-version "1.14" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5782,7 +5783,7 @@ (define-public emacs-campus (revision "0")) (package (name "emacs-campus") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) @@ -5827,7 +5828,7 @@ (define-public emacs-chocolate-theme (revision "0")) (package (name "emacs-chocolate-theme") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -6244,7 +6245,7 @@ (define-public emacs-font-lock+ (revision "0")) (package (name "emacs-font-lock+") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -6294,7 +6295,7 @@ (define-public emacs-font-utils (revision "0")) (package (name "emacs-font-utils") - (version (git-version "0.7.8" revision commit)) + (version (make-git-version "0.7.8" revision commit)) (source (origin (method git-fetch) @@ -6367,7 +6368,7 @@ (define-public emacs-xcscope (revision "0")) (package (name "emacs-xcscope") - (version (git-version "1.5" revision commit)) + (version (make-git-version "1.5" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -6400,7 +6401,7 @@ (define-public emacs-ggtags (revision "0")) (package (name "emacs-ggtags") - (version (git-version "0.9.0" revision commit)) + (version (make-git-version "0.9.0" revision commit)) (source (origin (method git-fetch) @@ -6504,7 +6505,7 @@ (define-public emacs-google-maps (revision "1")) (package (name "emacs-google-maps") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -6526,7 +6527,7 @@ (define-public emacs-geoclue (revision "1")) (package (name "emacs-geoclue") - (version (git-version "0.8.1" revision commit)) + (version (make-git-version "0.8.1" revision commit)) (source (origin (method git-fetch) @@ -6548,7 +6549,7 @@ (define-public emacs-nominatim (commit "f814e16f8f4e2cfd633f52b29699a009ab704fbf")) (package (name "emacs-nominatim") - (version (git-version "0.9.3" revision commit)) + (version (make-git-version "0.9.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -6570,7 +6571,7 @@ (define-public emacs-org-street (commit "17913afe01504ee0cbcf83abaca18c5c618f9b33")) (package (name "emacs-org-street") - (version (git-version "0.7.1" revision commit)) + (version (make-git-version "0.7.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -6648,7 +6649,7 @@ (define-public emacs-imenu-list (version "0.9")) (package (name "emacs-imenu-list") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -6845,7 +6846,7 @@ (define-public emacs-djvu3 (package (name "emacs-djvu3") ;; `Version:' header says 1.0 - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -7002,7 +7003,7 @@ (define-public emacs-org-pdftools (commit "5613b7ae561e0af199f25aacc0a9c34c16638408")) (package (name "emacs-org-pdftools") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -7036,7 +7037,7 @@ (define-public emacs-sage-shell-mode (revision "1")) (package (name "emacs-sage-shell-mode") - (version (git-version "0.3" revision commit)) + (version (make-git-version "0.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -7108,7 +7109,7 @@ (define-public emacs-pdfgrep (revision "1")) (package (name "emacs-pdfgrep") - (version (git-version "1.4" revision commit)) + (version (make-git-version "1.4" revision commit)) (source (origin (method git-fetch) @@ -7168,7 +7169,7 @@ (define-public emacs-guix (revision "8")) (package (name "emacs-guix") - (version (git-version "0.5.2" revision commit)) + (version (make-git-version "0.5.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -7277,7 +7278,7 @@ (define-public emacs-extempore-mode (revision "2")) (package (name "emacs-extempore-mode") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -7330,7 +7331,7 @@ (define-public emacs-kakoune (revision "0")) (package (name "emacs-kakoune") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -7359,7 +7360,7 @@ (define-public emacs-kana (revision "0")) (package (name "emacs-kana") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -7384,7 +7385,7 @@ (define-public emacs-kanji (revision "0")) (package (name "emacs-kanji") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -7409,7 +7410,7 @@ (define-public emacs-migemo (revision "0")) (package (name "emacs-migemo") - (version (git-version "1.9.2" revision commit)) + (version (make-git-version "1.9.2" revision commit)) (source (origin (method git-fetch) @@ -7439,7 +7440,7 @@ (define-public emacs-kbd (revision "1")) (package (name "emacs-kbd") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -7541,7 +7542,7 @@ (define-public emacs-ligature (revision "1")) (package (name "emacs-ligature") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -7615,7 +7616,7 @@ (define-public emacs-undo-fu (revision "0")) (package (name "emacs-undo-fu") - (version (git-version "0.5" revision commit)) + (version (make-git-version "0.5" revision commit)) (source (origin (method git-fetch) @@ -7641,7 +7642,7 @@ (define-public emacs-undo-fu-session (revision "0")) (package (name "emacs-undo-fu-session") - (version (git-version "0.6" revision commit)) + (version (make-git-version "0.6" revision commit)) (source (origin (method git-fetch) @@ -7791,7 +7792,7 @@ (define-public emacs-sx (commit "8c1c28f33d714fc8869e49f5642e1a585c8c85af")) (package (name "emacs-sx") - (version (git-version "0.3" revision commit)) + (version (make-git-version "0.3" revision commit)) (source (origin (method git-fetch) @@ -7873,7 +7874,7 @@ (define-public emacs-toml-mode (commit "f6c61817b00f9c4a3cab1bae9c309e0fc45cdd06")) (package (name "emacs-toml-mode") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -7947,7 +7948,7 @@ (define-public emacs-fringe-helper (revision "1")) (package (name "emacs-fringe-helper") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -8001,7 +8002,7 @@ (define-public emacs-git-gutter-fringe (revision "2")) (package (name "emacs-git-gutter-fringe") - (version (git-version "0.23" revision commit)) + (version (make-git-version "0.23" revision commit)) (source (origin (method git-fetch) @@ -8239,7 +8240,7 @@ (define-public emacs-spark (revision "1")) (package (name "emacs-spark") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -8263,7 +8264,7 @@ (define-public emacs-spray (commit "74d9dcfa2e8b38f96a43de9ab0eb13364300cb46")) (package (name "emacs-spray") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -8336,7 +8337,7 @@ (define-public emacs-explain-pause-mode (revision "0")) (package (name "emacs-explain-pause-mode") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -8608,7 +8609,7 @@ (define-public emacs-chruby (revision "0")) (package (name "emacs-chruby") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -8632,7 +8633,7 @@ (define-public emacs-zeno-theme (revision "0")) (package (name "emacs-zeno-theme") - (version (git-version "1.0.2" revision commit)) + (version (make-git-version "1.0.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -8655,7 +8656,7 @@ (define-public emacs-zig-mode (revision "2")) (package (name "emacs-zig-mode") - (version (git-version "0.0.8" revision commit)) + (version (make-git-version "0.0.8" revision commit)) (source (origin (method git-fetch) @@ -8764,7 +8765,7 @@ (define-public emacs-erc-status-sidebar (revision "1")) (package (name "emacs-erc-status-sidebar") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -8887,7 +8888,7 @@ (define-public emacs-litable (let ((commit "b0278f3f8dcff424bfbdfdefb545b1fbff33206f")) (package (name "emacs-litable") - (version (git-version "0.1" "0" commit)) + (version (make-git-version "0.1" "0" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -8931,7 +8932,7 @@ (define-public emacs-calc-currency (revision "0")) (package (name "emacs-calc-currency") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -8963,7 +8964,7 @@ (define-public emacs-literate-calc-mode (revision "2")) (package (name "emacs-literate-calc-mode") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -9142,7 +9143,7 @@ (define-public emacs-org-chef (revision "0")) (package (name "emacs-org-chef") - (version (git-version "0.1.3" revision commit)) + (version (make-git-version "0.1.3" revision commit)) (source (origin (method git-fetch) @@ -9223,7 +9224,7 @@ (define-public emacs-comment-tags (revision "1")) (package (name "emacs-comment-tags") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -9268,7 +9269,7 @@ (define-public emacs-org-fancy-priorities (revision "1")) (package (name "emacs-org-fancy-priorities") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) @@ -9317,7 +9318,7 @@ (define-public emacs-ob-erlang (commit "a029c23902b4ad73b84f262a7fc5b98d87b63dfd")) (package (name "emacs-ob-erlang") - (version (git-version "20210321" revision commit)) + (version (make-git-version "20210321" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -9339,7 +9340,7 @@ (define-public emacs-ob-go (revision "0")) (package (name "emacs-ob-go") - (version (git-version "0.02" revision commit)) + (version (make-git-version "0.02" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -9373,7 +9374,7 @@ (define-public emacs-ob-restclient (let ((commit "1b021ce1c67c97fa1aa4d2c0816edb7add129e48")) (package (name "emacs-ob-restclient") - (version (git-version "0.02" "3" commit)) + (version (make-git-version "0.02" "3" commit)) (source (origin (method git-fetch) @@ -9396,7 +9397,7 @@ (define-public emacs-org-now (let ((commit "8f6b277a73f1c66e58ccb4b7f40d406851befc91")) (package (name "emacs-org-now") - (version (git-version "0.1-pre" "1" commit)) + (version (make-git-version "0.1-pre" "1" commit)) (source (origin (method git-fetch) @@ -9610,7 +9611,7 @@ (define-public emacs-rspec (revision "1")) (package (name "emacs-rspec") - (version (git-version "1.11" revision commit)) + (version (make-git-version "1.11" revision commit)) (source (origin (method git-fetch) @@ -9745,7 +9746,7 @@ (define-public emacs-mode-line-idle (revision "0")) (package (name "emacs-mode-line-idle") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -9830,7 +9831,7 @@ (define-public emacs-sqlite (package (name "emacs-sqlite") (build-system emacs-build-system) - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -9909,7 +9910,7 @@ (define-public emacs-pretty-speedbar (revision "0")) (package (name "emacs-pretty-speedbar") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (uri (git-reference (url "https://github.com/kcyarn/pretty-speedbar") @@ -9935,7 +9936,7 @@ (define-public emacs-sr-speedbar (revision "0")) (package (name "emacs-sr-speedbar") - (version (git-version "20161025" revision commit)) + (version (make-git-version "20161025" revision commit)) (source (origin (method git-fetch) @@ -10004,7 +10005,7 @@ (define-public emacs-shx (revision "1")) (package (name "emacs-shx") - (version (git-version "1.5.0" revision commit)) + (version (make-git-version "1.5.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -10042,7 +10043,7 @@ (define-public emacs-names (revision "8")) (package (name "emacs-names") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -10089,7 +10090,7 @@ (define-public emacs-nano-theme (revision "0")) (package (name "emacs-nano-theme") - (version (git-version "0.3.4" revision commit)) + (version (make-git-version "0.3.4" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -10166,7 +10167,7 @@ (define-public emacs-evil-textobj-syntax (revision "1")) (package (name "emacs-evil-textobj-syntax") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -10192,7 +10193,7 @@ (define-public emacs-flycheck-flow (revision "1")) (package (name "emacs-flycheck-flow") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -11046,7 +11047,7 @@ (define-public emacs-combobulate (revision "2")) (package (name "emacs-combobulate") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -11083,7 +11084,7 @@ (define-public emacs-companion-mode (package (name "emacs-companion-mode") ;; Version is extracted from the main file. - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -11512,7 +11513,7 @@ (define-public emacs-compdef (revision "2")) (package (name "emacs-compdef") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -11556,7 +11557,7 @@ (define-public emacs-handle (revision "2")) (package (name "emacs-handle") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -11603,7 +11604,7 @@ (define-public emacs-phi-search (revision "1")) (package (name "emacs-phi-search") - (version (git-version "20160630" revision commit)) + (version (make-git-version "20160630" revision commit)) (source (origin (method git-fetch) @@ -11625,7 +11626,7 @@ (define-public emacs-phi-search-mc (revision "1")) (package (name "emacs-phi-search-mc") - (version (git-version "2.2.1" revision commit)) + (version (make-git-version "2.2.1" revision commit)) (source (origin (method git-fetch) @@ -11674,7 +11675,7 @@ (define-public emacs-multifiles (revision "1")) (package (name "emacs-multifiles") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -11771,7 +11772,7 @@ (define-public emacs-typo (revision "0")) (package (name "emacs-typo") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (home-page "https://github.com/jorgenschaefer/typoel") (source (origin (method git-fetch) @@ -11877,7 +11878,7 @@ (define-public emacs-9lc-mode (revision "1")) (package (name "emacs-9lc-mode") - (version (git-version "0.7" revision commit)) + (version (make-git-version "0.7" revision commit)) (source (origin (method git-fetch) @@ -11899,7 +11900,7 @@ (define-public emacs-tl1-mode (revision "1")) (package (name "emacs-tl1-mode") - (version (git-version "1.3" revision commit)) + (version (make-git-version "1.3" revision commit)) (source (origin (method git-fetch) @@ -11951,7 +11952,7 @@ (define-public emacs-scel (commit "aeea3ad4be9306d14c3a734a4ff54fee10ac135b")) (package (name "emacs-scel") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -12004,7 +12005,7 @@ (define-public emacs-soothe-theme (revision "0")) (package (name "emacs-soothe-theme") - (version (git-version "20141027.2233" revision commit)) + (version (make-git-version "20141027.2233" revision commit)) (source (origin (method git-fetch) @@ -12029,7 +12030,7 @@ (define-public emacs-company-auctex (revision "1")) (package (name "emacs-company-auctex") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -12239,7 +12240,7 @@ (define-public emacs-popup-kill-ring (revision "0")) (package (name "emacs-popup-kill-ring") - (version (git-version "0.2.8" revision commit)) + (version (make-git-version "0.2.8" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -12284,7 +12285,7 @@ (define-public emacs-pydoc (revision "0")) (package (name "emacs-pydoc") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (uri (git-reference @@ -12398,7 +12399,7 @@ (define-public emacs-pythonic (revision "1")) (package (name "emacs-pythonic") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -12425,7 +12426,7 @@ (define-public emacs-anaconda-mode (revision "0")) (package (name "emacs-anaconda-mode") - (version (git-version "0.1.16" revision commit)) + (version (make-git-version "0.1.16" revision commit)) (source (origin (method git-fetch) @@ -12460,7 +12461,7 @@ (define-public emacs-jack (revision "0")) (package (name "emacs-jack") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -12655,7 +12656,7 @@ (define-public emacs-cov (revision "0")) (package (name "emacs-cov") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -12723,7 +12724,7 @@ (define-public emacs-purescript-mode (commit "0acd1af446424ba855153161fe07a20f67dc0a89")) (package (name "emacs-purescript-mode") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -12757,7 +12758,7 @@ (define-public emacs-new-purescript-mode (revision "0")) (package (name "emacs-new-purescript-mode") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -12910,7 +12911,7 @@ (define-public emacs-company-cabal (revision "1")) (package (name "emacs-company-cabal") - (version (git-version "0.3.0" revision commit)) + (version (make-git-version "0.3.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13009,7 +13010,7 @@ (define-public emacs-feature-mode (commit "11ae1671629bfedaa553c7b819676d64eb320992")) (package (name "emacs-feature-mode") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13079,7 +13080,7 @@ (define-public emacs-org-dailies (revision "2")) (package (name "emacs-org-dailies") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -13134,7 +13135,7 @@ (define-public emacs-anki-editor (version "0.3.3")) (package (name "emacs-anki-editor") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -13258,7 +13259,7 @@ (define-public emacs-org-pandoc-import (revision "0")) (package (name "emacs-org-pandoc-import") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -13298,7 +13299,7 @@ (define-public emacs-org-pomodoro (revision "1")) (package (name "emacs-org-pomodoro") - (version (git-version "2.1.0" revision commit)) + (version (make-git-version "2.1.0" revision commit)) (source (origin (method git-fetch) @@ -13418,7 +13419,7 @@ (define-public emacs-org-tanglesync (revision "3")) (package (name "emacs-org-tanglesync") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) @@ -13444,7 +13445,7 @@ (define-public emacs-company-flow (revision "1")) (package (name "emacs-company-flow") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13468,7 +13469,7 @@ (define-public emacs-habitica (revision "1")) (package (name "emacs-habitica") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -13491,7 +13492,7 @@ (define-public emacs-atom-one-dark-theme (revision "0")) (package (name "emacs-atom-one-dark-theme") - (version (git-version "0.4.0" revision commit)) + (version (make-git-version "0.4.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13512,7 +13513,7 @@ (define-public emacs-atomic-chrome (revision "1")) (package (name "emacs-atomic-chrome") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13639,7 +13640,7 @@ (define-public emacs-color-theme-solarized (revision "0")) (package (name "emacs-color-theme-solarized") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13673,7 +13674,7 @@ (define-public emacs-color-identifiers-mode (revision "0")) (package (name "emacs-color-identifiers-mode") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) @@ -13697,7 +13698,7 @@ (define-public emacs-poet-theme (revision "1")) (package (name "emacs-poet-theme") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -13745,7 +13746,7 @@ (define-public emacs-color-theme-modern (revision "1")) (package (name "emacs-color-theme-modern") - (version (git-version "0.0.3" revision commit)) + (version (make-git-version "0.0.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13795,7 +13796,7 @@ (define-public emacs-spacegray-theme (revision "0")) (package (name "emacs-spacegray-theme") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13820,7 +13821,7 @@ (define-public emacs-org-cv (revision "0")) (package (name "emacs-org-cv") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -13919,7 +13920,7 @@ (define-public emacs-4clojure (revision "1")) (package (name "emacs-4clojure") - (version (git-version "0.2.1" revision commit)) + (version (make-git-version "0.2.1" revision commit)) (source (origin (method git-fetch) @@ -14260,7 +14261,7 @@ (define-public emacs-consult-mu (revision "0")) (package (name "emacs-consult-mu") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -14291,7 +14292,7 @@ (define-public emacs-consult-notes (revision "0")) (package (name "emacs-consult-notes") - (version (git-version "0.7" revision commit)) + (version (make-git-version "0.7" revision commit)) (source (origin (method git-fetch) @@ -14343,7 +14344,7 @@ (define-public emacs-consult-org-roam (revision "1")) (package (name "emacs-consult-org-roam") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -14472,7 +14473,7 @@ (define-public emacs-consult-xdg-recent-files (revision "0")) (package (name "emacs-consult-xdg-recent-files") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -14503,7 +14504,7 @@ (define-public emacs-consult-yasnippet (revision "0")) (package (name "emacs-consult-yasnippet") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -14567,7 +14568,7 @@ (define-public emacs-smartparens (revision "1")) (package (name "emacs-smartparens") - (version (git-version "1.11.0" revision commit)) + (version (make-git-version "1.11.0" revision commit)) (source (origin (method git-fetch) @@ -14637,7 +14638,7 @@ (define-public emacs-dumbparens (revision "1")) (package (name "emacs-dumbparens") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -14668,7 +14669,7 @@ (define-public emacs-highlight-symbol (revision "1")) (package (name "emacs-highlight-symbol") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -14901,7 +14902,7 @@ (define-public emacs-eyebrowse (revision "0")) (package (name "emacs-eyebrowse") - (version (git-version "0.7.8" revision commit)) + (version (make-git-version "0.7.8" revision commit)) (source (origin (method git-fetch) @@ -14992,7 +14993,7 @@ (define-public emacs-loccur (revision "1")) (package (name "emacs-loccur") - (version (git-version "1.2.5" revision commit)) + (version (make-git-version "1.2.5" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -15081,7 +15082,7 @@ (define-public emacs-rmsbolt (version "0.1.2")) (package (name "emacs-rmsbolt") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -15106,7 +15107,7 @@ (define-public emacs-request (revision "1")) (package (name "emacs-request") - (version (git-version "0.3.2" revision commit)) + (version (make-git-version "0.3.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -15133,7 +15134,7 @@ (define-public emacs-ruby-electric (commit "c53376da891713e0c49f01aad2ff64d4fbb0b812")) (package (name "emacs-ruby-electric") - (version (git-version "2.3.3" revision commit)) + (version (make-git-version "2.3.3" revision commit)) (source (origin (method git-fetch) @@ -15359,7 +15360,7 @@ (define-public emacs-sway (revision "0")) (package (name "emacs-sway") - (version (git-version "0.7" revision commit)) + (version (make-git-version "0.7" revision commit)) (source (origin (method git-fetch) @@ -15384,7 +15385,7 @@ (define-public emacs-sweet-theme (revision "0")) (package (name "emacs-sweet-theme") - (version (git-version "4" revision commit)) + (version (make-git-version "4" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -15430,7 +15431,7 @@ (define-public emacs-ivy-xref (revision "1")) (package (name "emacs-ivy-xref") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -15455,7 +15456,7 @@ (define-public emacs-ivy-pass (revision "1")) (package (name "emacs-ivy-pass") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -15481,7 +15482,7 @@ (define-public emacs-ivy-yasnippet (revision "2")) (package (name "emacs-ivy-yasnippet") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -15594,7 +15595,7 @@ (define-public emacs-windsize (commit "62c2846bbe95b0a73e996c75e4a644d05f57aaaa")) (package (name "emacs-windsize") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -15750,7 +15751,7 @@ (define-public emacs-lispy (let ((commit "df1b7e614fb0f73646755343e8892ddda310f427")) (package (name "emacs-lispy") - (version (git-version "0.27.0" "3" commit)) + (version (make-git-version "0.27.0" "3" commit)) (home-page "https://github.com/abo-abo/lispy") (source (origin (method git-fetch) @@ -15817,7 +15818,7 @@ (define-public emacs-lispyville (revision "3")) (package (name "emacs-lispyville") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/noctuid/lispyville") (source (origin (method git-fetch) @@ -15846,7 +15847,7 @@ (define-public emacs-function-args (revision "0")) (package (name "emacs-function-args") - (version (git-version "0.6.0" revision commit)) + (version (make-git-version "0.6.0" revision commit)) (source (origin (method git-fetch) @@ -15873,7 +15874,7 @@ (define-public emacs-lpy (revision "6")) (package (name "emacs-lpy") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -15927,7 +15928,7 @@ (define-public emacs-clj-deps-new (revision "0")) (package (name "emacs-clj-deps-new") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -15995,7 +15996,7 @@ (define-public emacs-clojure-snippets (commit "6068dca90467a0f4ebc2cd39338a173d6f5ddc04")) (package (name "emacs-clojure-snippets") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -16023,7 +16024,7 @@ (define-public emacs-anakondo (commit "c48518560815c49d8d78fb9069906d17e883385e")) (package (name "emacs-anakondo") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -16094,7 +16095,7 @@ (define-public emacs-counsel-notmuch (revision "0")) (package (name "emacs-counsel-notmuch") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -16319,7 +16320,7 @@ (define-public emacs-sphinx-doc (revision "1")) (package (name "emacs-sphinx-doc") - (version (git-version "0.3.0" revision commit)) + (version (make-git-version "0.3.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -16443,7 +16444,7 @@ (define-public emacs-julia-mode (revision "0")) (package (name "emacs-julia-mode") - (version (git-version "1.0.2" revision commit)) + (version (make-git-version "1.0.2" revision commit)) (source (origin (method git-fetch) @@ -16784,7 +16785,7 @@ (define-public emacs-evil-markdown (revision "2")) (package (name "emacs-evil-markdown") - (version (git-version "0.0.2" revision commit)) + (version (make-git-version "0.0.2" revision commit)) (source (origin (method git-fetch) @@ -16867,7 +16868,7 @@ (define-public emacs-skeletor (revision "1")) (package (name "emacs-skeletor") - (version (git-version "1.6.1" revision commit)) + (version (make-git-version "1.6.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -16981,7 +16982,7 @@ (define-public emacs-elfeed-org (revision "0")) (package (name "emacs-elfeed-org") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -17354,7 +17355,7 @@ (define-public emacs-highlight-indent-guides (commit "c2c9de4d01edfb89609c91d4d7f1d81312015a2c")) (package (name "emacs-highlight-indent-guides") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -17383,7 +17384,7 @@ (define-public emacs-highlight-indentation (revision "1")) (package (name "emacs-highlight-indentation") - (version (git-version "0.7.0" revision commit)) + (version (make-git-version "0.7.0" revision commit)) (source (origin (method git-fetch) @@ -17417,7 +17418,7 @@ (define-public emacs-elpy (revision "2")) (package (name "emacs-elpy") - (version (git-version "1.35.0" revision commit)) + (version (make-git-version "1.35.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -17538,7 +17539,7 @@ (define-public emacs-railscasts-theme (revision "0")) (package (name "emacs-railscasts-theme") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -17661,7 +17662,7 @@ (define-public emacs-ryo-modal (revision "0")) (package (name "emacs-ryo-modal") - (version (git-version "0.45" revision commit)) + (version (make-git-version "0.45" revision commit)) (source (origin (method git-fetch) @@ -17740,7 +17741,7 @@ (define-public emacs-visual-replace (name "emacs-visual-replace") ;; XXX: when updating version, please ensure substitution in install-info ;; phase is still accurate. - (version (git-version "1.2" revision commit)) + (version (make-git-version "1.2" revision commit)) (source (origin (method git-fetch) @@ -17959,7 +17960,7 @@ (define-public emacs-yari (commit "de61285ceb21f56c29f4be12e2e65b2aa2bccf56")) (package (name "emacs-yari") - (version (git-version "0.8" revision commit)) + (version (make-git-version "0.8" revision commit)) (source (origin (method git-fetch) @@ -18153,7 +18154,7 @@ (define-public emacs-helm-org (revision "3")) (package (name "emacs-helm-org") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -18277,7 +18278,7 @@ (define-public emacs-taskrunner (revision "1")) (package (name "emacs-taskrunner") - (version (git-version "0.6" revision commit)) + (version (make-git-version "0.6" revision commit)) (source (origin (method git-fetch) @@ -18325,7 +18326,7 @@ (define-public emacs-ivy-taskrunner (revision "1")) (package (name "emacs-ivy-taskrunner") - (version (git-version "0.9" revision commit)) + (version (make-git-version "0.9" revision commit)) (source (origin (method git-fetch) @@ -18350,7 +18351,7 @@ (define-public emacs-helm-taskrunner (revision "1")) (package (name "emacs-helm-taskrunner") - (version (git-version "0.9" revision commit)) + (version (make-git-version "0.9" revision commit)) (source (origin (method git-fetch) @@ -18375,7 +18376,7 @@ (define-public emacs-helm-make (revision "0")) (package (name "emacs-helm-make") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -18533,7 +18534,7 @@ (define-public emacs-sly ;; important fixes. (package (name "emacs-sly") - (version (git-version "1.0.43" revision commit)) + (version (make-git-version "1.0.43" revision commit)) (source (origin (method git-fetch) @@ -18557,7 +18558,9 @@ (define-public emacs-sly (lambda _ (let* ((info-dir (string-append #$output "/share/info")) (doc-dir (string-append #$output "/share/doc/" - #$name "-" #$version)) + #$name "-" + #$(package-version + this-package))) (doc-files '( ;; "doc/sly-refcard.pdf" ; See sly-refcard.pdf below. "README.md" "NEWS.md" "PROBLEMS.md" "CONTRIBUTING.md"))) @@ -18616,7 +18619,7 @@ (define-public emacs-sly-quicklisp (revision "1")) (package (name "emacs-sly-quicklisp") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (home-page "https://github.com/joaotavora/sly-quicklisp") (source (origin @@ -18675,7 +18678,7 @@ (define-public emacs-sly-named-readtables (revision "1")) (package (name "emacs-sly-named-readtables") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/joaotavora/sly-named-readtables") (source (origin @@ -18709,7 +18712,7 @@ (define-public emacs-sly-macrostep (revision "2")) (package (name "emacs-sly-macrostep") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/joaotavora/sly-macrostep") (source (origin @@ -18741,7 +18744,7 @@ (define-public emacs-sly-stepper (let ((commit "da84e3bba8466c2290c2dc7c27d7f4c48c27b39e")) (package (name "emacs-sly-stepper") - (version (git-version "0.0.0" "2" commit)) + (version (make-git-version "0.0.0" "2" commit)) (source (origin (method git-fetch) @@ -18791,7 +18794,7 @@ (define-public emacs-sly-package-inferred (revision "1")) (package (name "emacs-sly-package-inferred") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/40ants/sly-package-inferred") (source (origin @@ -18824,7 +18827,7 @@ (define-public emacs-lua-mode (revision "1")) (package (name "emacs-lua-mode") - (version (git-version "20221027" revision commit)) + (version (make-git-version "20221027" revision commit)) (source (origin (method git-fetch) @@ -18893,7 +18896,7 @@ (define-public emacs-ebuku (commit "0c6cf404a49bd68800221446df186fffa0139325")) (package (name "emacs-ebuku") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -18918,7 +18921,7 @@ (define-public emacs-evil (revision "0")) (package (name "emacs-evil") - (version (git-version "1.15.0" revision commit)) + (version (make-git-version "1.15.0" revision commit)) (source (origin (method git-fetch) @@ -18993,7 +18996,7 @@ (define-public emacs-evil-goggles (revision "0")) (package (name "emacs-evil-goggles") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -19073,7 +19076,7 @@ (define-public emacs-evil-owl (revision "3")) (package (name "emacs-evil-owl") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -19135,7 +19138,7 @@ (define-public emacs-evil-args (revision "1")) (package (name "emacs-evil-args") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -19185,7 +19188,7 @@ (define-public emacs-evil-exchange (revision "1")) (package (name "emacs-evil-exchange") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -19221,7 +19224,7 @@ (define-public emacs-evil-replace-with-register (revision "1")) (package (name "emacs-evil-replace-with-register") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -19247,7 +19250,7 @@ (define-public emacs-evil-indent-plus (revision "1")) (package (name "emacs-evil-indent-plus") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -19274,7 +19277,7 @@ (define-public emacs-evil-text-object-python (revision "1")) (package (name "emacs-evil-text-object-python") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -19298,7 +19301,7 @@ (define-public emacs-evil-lion (revision "1")) (package (name "emacs-evil-lion") - (version (git-version "0.0.2" revision commit)) + (version (make-git-version "0.0.2" revision commit)) (source (origin (method git-fetch) @@ -19325,7 +19328,7 @@ (define-public emacs-evil-expat (revision "1")) (package (name "emacs-evil-expat") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -19412,7 +19415,7 @@ (define-public emacs-evil-visualstar (revision "1")) (package (name "emacs-evil-visualstar") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -19549,7 +19552,7 @@ (define-public emacs-writefreely (revision "0")) (package (name "emacs-writefreely") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -19725,7 +19728,7 @@ (define-public emacs-org-count-words (revision "0")) (package (name "emacs-org-count-words") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -19819,7 +19822,7 @@ (define-public emacs-org-pretty-table (revision "0")) (package (name "emacs-org-pretty-table") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -19842,7 +19845,7 @@ (define-public emacs-ob-sclang (revision "1")) (package (name "emacs-ob-sclang") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -19940,7 +19943,7 @@ (define-public emacs-afternoon-theme (revision "0")) (package (name "emacs-afternoon-theme") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -20205,7 +20208,7 @@ (define-public emacs-cl-print (revision "1")) (package (name "emacs-cl-print") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -20228,7 +20231,7 @@ (define-public emacs-el-search (revision "2")) (package (name "emacs-el-search") - (version (git-version "1.12.6.1" revision commit)) + (version (make-git-version "1.12.6.1" revision commit)) (source (origin (method git-fetch) @@ -20727,7 +20730,7 @@ (define-public emacs-bazel (revision "0")) (package (name "emacs-bazel") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -20751,7 +20754,7 @@ (define-public emacs-clue (revision "0")) (package (name "emacs-clue") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -20847,7 +20850,7 @@ (define-public emacs-mu4e-alert (revision "1")) (package (name "emacs-mu4e-alert") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -20932,7 +20935,7 @@ (define-public emacs-mu4e-jump-to-list (revision "1")) (package (name "emacs-mu4e-jump-to-list") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -21008,7 +21011,7 @@ (define-public emacs-message-view-patch (revision "2")) (package (name "emacs-message-view-patch") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -21094,7 +21097,7 @@ (define-public emacs-tempel-collection (revision "2")) (package (name "emacs-tempel-collection") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -21192,7 +21195,7 @@ (define-public emacs-doom-snippets (commit "bc613f448eed1bd363e61c41691a61e9fd139534")) (package (name "emacs-doom-snippets") - (version (git-version release revision commit)) + (version (make-git-version release revision commit)) (source (origin (method git-fetch) @@ -21307,7 +21310,7 @@ (define-public emacs-dired-git-info (revision "0")) (package (name "emacs-dired-git-info") - (version (git-version "0.3.1" revision commit)) + (version (make-git-version "0.3.1" revision commit)) (source (origin (method git-fetch) @@ -21353,7 +21356,7 @@ (define-public emacs-diss (revision "1")) (package (name "emacs-diss") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -21376,7 +21379,7 @@ (define-public emacs-dired-toggle-sudo (revision "0")) (package (name "emacs-dired-toggle-sudo") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -21525,7 +21528,7 @@ (define-public emacs-idle-highlight (revision "0")) (package (name "emacs-idle-highlight") - (version (git-version "1.1.4" revision commit)) + (version (make-git-version "1.1.4" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -21737,7 +21740,7 @@ (define-public emacs-diminish (revision "1")) (package (name "emacs-diminish") - (version (git-version "0.46" revision commit)) + (version (make-git-version "0.46" revision commit)) (source (origin (method git-fetch) @@ -21887,7 +21890,7 @@ (define-public emacs-exotica-theme (revision "0")) (package (name "emacs-exotica-theme") - (version (git-version "1.0.2" revision commit)) + (version (make-git-version "1.0.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -22039,7 +22042,7 @@ (define-public emacs-cal-china-x (commit "94005e678a1d2522b7a00299779f40c5c77286b8")) (package (name "emacs-cal-china-x") - (version (git-version "2.6b" revision commit)) + (version (make-git-version "2.6b" revision commit)) (source (origin (method git-fetch) @@ -22154,7 +22157,7 @@ (define-public emacs-vala-mode (revision "0")) (package (name "emacs-vala-mode") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -22240,7 +22243,7 @@ (define-public emacs-composer (revision "0")) (package (name "emacs-composer") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -22267,7 +22270,7 @@ (define-public emacs-pippel (revision "0")) (package (name "emacs-pippel") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -22466,7 +22469,7 @@ (define-public emacs-mini-frame (revision "0")) (package (name "emacs-mini-frame") - (version (git-version "1.19" revision commit)) + (version (make-git-version "1.19" revision commit)) (source (origin (uri (git-reference @@ -22965,7 +22968,7 @@ (define-public emacs-transpose-mark (revision "0")) (package (name "emacs-transpose-mark") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -23240,7 +23243,7 @@ (define-public emacs-doctest (revision "0")) (package (name "emacs-doctest") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -23489,7 +23492,7 @@ (define-public emacs-restclient ;upstream doesn't have official releases (package (name "emacs-restclient") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -23535,7 +23538,7 @@ (define-public emacs-whitespace-cleanup-mode (revision "2")) (package (name "emacs-whitespace-cleanup-mode") - (version (git-version "0.10" revision commit)) + (version (make-git-version "0.10" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -23561,7 +23564,7 @@ (define-public emacs-eimp (revision "1")) (package (name "emacs-eimp") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -23597,7 +23600,7 @@ (define-public emacs-dired-hacks (revision "3")) (package (name "emacs-dired-hacks") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -23725,7 +23728,7 @@ (define-public emacs-which-key-posframe (revision "0")) (package (name "emacs-which-key-posframe") - (version (git-version "0.2.0.50" revision commit)) + (version (make-git-version "0.2.0.50" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -23872,7 +23875,7 @@ (define-public emacs-ws-butler (revision "0")) (package (name "emacs-ws-butler") - (version (git-version "1.3" revision commit)) + (version (make-git-version "1.3" revision commit)) (source (origin (method git-fetch) @@ -23921,7 +23924,7 @@ (define-public emacs-openwith (commit "5fe01dee520d24c839ad5ee18822667457d9f352")) (package (name "emacs-openwith") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -24113,7 +24116,7 @@ (define-public emacs-rpm-spec-mode (revision "0")) (package (name "emacs-rpm-spec-mode") - (version (git-version "0.16" revision commit)) + (version (make-git-version "0.16" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -24350,7 +24353,7 @@ (define-public emacs-enh-ruby-mode (commit "7e76d754e1632b4fc9a024fa393c3fc837bcc86b")) (package (name "emacs-enh-ruby-mode") - (version (git-version "20191111" revision commit)) + (version (make-git-version "20191111" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -24531,7 +24534,7 @@ (define-public emacs-idris-mode (revision "1")) (package (name "emacs-idris-mode") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -24606,7 +24609,7 @@ (define-public emacs-tiny (revision "1")) (package (name "emacs-tiny") - (version (git-version "0.2.1" revision commit)) + (version (make-git-version "0.2.1" revision commit)) (source (origin (method git-fetch) @@ -24707,7 +24710,7 @@ (define-public emacs-make-it-so (revision "2")) (package (name "emacs-make-it-so") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -24738,7 +24741,7 @@ (define-public emacs-unidecode (revision "1")) (package (name "emacs-unidecode") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -24947,7 +24950,7 @@ (define-public emacs-slack (revision "11")) (package (name "emacs-slack") - (version (git-version "0.0.2" revision commit)) + (version (make-git-version "0.0.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -24985,7 +24988,7 @@ (define-public emacs-helm-slack (revision "1")) (package (name "emacs-helm-slack") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -25014,7 +25017,7 @@ (define-public emacs-bash-completion (revision "0")) (package (name "emacs-bash-completion") - (version (git-version "3.2" revision commit)) + (version (make-git-version "3.2" revision commit)) (source (origin (method git-fetch) @@ -25176,7 +25179,7 @@ (define-public emacs-ansible-doc (version "0.4")) (package (name "emacs-ansible-doc") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -25306,7 +25309,7 @@ (define-public emacs-powershell (package (name "emacs-powershell") (build-system emacs-build-system) - (version (git-version "0.3" revision commit)) + (version (make-git-version "0.3" revision commit)) (source (origin (method git-fetch) @@ -25570,7 +25573,7 @@ (define-public emacs-jenkinsfile-mode (revision "1")) (package (name "emacs-jenkinsfile-mode") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -25594,7 +25597,7 @@ (define-public emacs-kotlin-mode (revision "1")) (package (name "emacs-kotlin-mode") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -25619,7 +25622,7 @@ (define-public emacs-org-tree-slide (revision "0")) (package (name "emacs-org-tree-slide") - (version (git-version "2.8.22" revision commit)) + (version (make-git-version "2.8.22" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -25830,7 +25833,7 @@ (define-public emacs-jupyter (revision "2")) (package (name "emacs-jupyter") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -25968,7 +25971,7 @@ (define-public emacs-frog-jump-buffer (revision "1")) (package (name "emacs-frog-jump-buffer") - (version (git-version "0.1.4" revision commit)) + (version (make-git-version "0.1.4" revision commit)) (source (origin (method git-fetch) @@ -26060,7 +26063,7 @@ (define-public emacs-emmet-mode (revision "1")) (package (name "emacs-emmet-mode") - (version (git-version "1.0.8" revision commit)) + (version (make-git-version "1.0.8" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -26185,7 +26188,7 @@ (define-public emacs-auth-source-pass (revision "2")) (package (name "emacs-auth-source-pass") - (version (git-version "5.0.0" revision commit)) + (version (make-git-version "5.0.0" revision commit)) (source (origin (method git-fetch) @@ -26244,7 +26247,7 @@ (define-public emacs-passage (revision "0")) (package (name "emacs-passage") - (version (git-version "2.0" revision commit)) + (version (make-git-version "2.0" revision commit)) (source (origin (method git-fetch) @@ -26270,7 +26273,7 @@ (define-public emacs-psc-ide (revision "2")) (package (name "emacs-psc-ide") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -26308,7 +26311,7 @@ (define-public emacs-evil-anzu (revision "0")) (package (name "emacs-evil-anzu") - (version (git-version "0.03" revision commit)) + (version (make-git-version "0.03" revision commit)) (source (origin (method git-fetch) @@ -26638,7 +26641,7 @@ (define-public emacs-outorg (let ((commit "78b0695121fb974bc4e971eb4ef7f8afd6d89d64")) (package (name "emacs-outorg") - (version (git-version "2.0" "1" commit)) + (version (make-git-version "2.0" "1" commit)) (source (origin (method git-fetch) @@ -26690,7 +26693,7 @@ (define-public emacs-outshine (revision "1")) (package (name "emacs-outshine") - (version (git-version "3.0.1" revision commit)) + (version (make-git-version "3.0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -26738,7 +26741,7 @@ (define-public emacs-org-recent-headings (revision "0")) (package (name "emacs-org-recent-headings") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -26799,7 +26802,7 @@ (define-public emacs-org-timeblock (commit "b423b01712b9c25dff3e4203c7cde736225f62ef")) (package (name "emacs-org-timeblock") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -26881,7 +26884,7 @@ (define-public emacs-elegant-agenda-mode (revision "1")) (package (name "emacs-elegant-agenda-mode") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -27206,7 +27209,7 @@ (define-public emacs-org-auto-expand (revision "1")) (package (name "emacs-org-auto-expand") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -27411,7 +27414,7 @@ (define-public emacs-helm-bibtex (revision "2")) (package (name "emacs-helm-bibtex") - (version (git-version "2.0.1" revision commit)) + (version (make-git-version "2.0.1" revision commit)) (source (origin (method git-fetch) @@ -27491,7 +27494,7 @@ (define-public emacs-erc-image (revision "3")) (package (name "emacs-erc-image") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -27637,7 +27640,7 @@ (define-public emacs-rainbow-blocks (let ((commit "dd435d7bb34ff6f162a5f315df308b90b7e9f842")) (package (name "emacs-rainbow-blocks") - (version (git-version "1.0.0" "1" commit)) + (version (make-git-version "1.0.0" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -27707,7 +27710,7 @@ (define-public emacs-pulseaudio-control (revision "0")) (package (name "emacs-pulseaudio-control") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -27738,7 +27741,7 @@ (define-public emacs-smudge (revision "1")) (package (name "emacs-smudge") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -28065,7 +28068,7 @@ (define-public emacs-esup (revision "1")) (package (name "emacs-esup") - (version (git-version "0.7.1" revision commit)) + (version (make-git-version "0.7.1" revision commit)) (source (origin (method git-fetch) @@ -28094,7 +28097,7 @@ (define-public emacs-restart-emacs (revision "1")) (package (name "emacs-restart-emacs") - (version (git-version "0.1.1" revision commit)) + (version (make-git-version "0.1.1" revision commit)) (source (origin (method git-fetch) @@ -28188,7 +28191,7 @@ (define-public emacs-svg-icon (revision "1")) (package (name "emacs-svg-icon") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -28333,7 +28336,7 @@ (define-public emacs-lacarte (revision "1")) (package (name "emacs-lacarte") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -28361,7 +28364,7 @@ (define-public emacs-latex-preview-pane (revision "0")) (package (name "emacs-latex-preview-pane") - (version (git-version "20151021" revision commit)) + (version (make-git-version "20151021" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -28389,7 +28392,7 @@ (define-public emacs-isearch-prop (revision "2")) (package (name "emacs-isearch-prop") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -28415,7 +28418,7 @@ (define-public emacs-company-lua (revision "2")) (package (name "emacs-company-lua") - (version (git-version "0.1" "2" commit)) + (version (make-git-version "0.1" "2" commit)) (source (origin (method git-fetch) @@ -28506,7 +28509,7 @@ (define-public emacs-mbsync (revision "5")) (package (name "emacs-mbsync") - (version (git-version "0.1.2" revision commit)) + (version (make-git-version "0.1.2" revision commit)) (source (origin (method git-fetch) @@ -28709,7 +28712,7 @@ (define-public emacs-helm-shell-history (let ((commit "110d3c35c52fe4b89b29e79ea4c8626bce7266a1")) (package (name "emacs-helm-shell-history") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) @@ -28769,7 +28772,7 @@ (define-public emacs-org-ref (revision "0")) (package (name "emacs-org-ref") - (version (git-version "3.1" revision commit)) + (version (make-git-version "3.1" revision commit)) (source (origin (method git-fetch) @@ -28835,7 +28838,7 @@ (define-public emacs-org-reveal (let ((commit "f55c851bf6aeb1bb2a7f6cf0f2b7bd0e79c4a5a0")) (package (name "emacs-org-reveal") - (version (git-version "20222711" "1" commit)) + (version (make-git-version "20222711" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -28959,7 +28962,7 @@ (define-public emacs-hideshowvis (revision "1")) (package (name "emacs-hideshowvis") - (version (git-version "0.7" revision commit)) + (version (make-git-version "0.7" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -29011,7 +29014,7 @@ (define-public emacs-navi-mode (let ((commit "c1d38e8237f4e14af020a0b7d4f118ea198ab674")) (package (name "emacs-navi-mode") - (version (git-version "2.0" "1" commit)) + (version (make-git-version "2.0" "1" commit)) (source (origin (method git-fetch) @@ -29177,7 +29180,7 @@ (define-public emacs-magit-gerrit (revision "1")) (package (name "emacs-magit-gerrit") - (version (git-version "0.4" revision commit)) + (version (make-git-version "0.4" revision commit)) (source (origin (method git-fetch) @@ -29313,7 +29316,7 @@ (define-public emacs-academic-phrases (let ((commit "0823ed8c24b26c32f909b896a469833ec4d7b656")) (package (name "emacs-academic-phrases") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) @@ -29346,7 +29349,7 @@ (define-public emacs-auto-yasnippet (revision "3")) (package (name "emacs-auto-yasnippet") - (version (git-version "0.3.0" revision commit)) + (version (make-git-version "0.3.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -29564,7 +29567,7 @@ (define-public emacs-racket-mode (revision "8")) (package (name "emacs-racket-mode") - (version (git-version "1" revision commit)) + (version (make-git-version "1" revision commit)) (source (origin (method git-fetch) @@ -29626,7 +29629,7 @@ (define-public emacs-grep-context (revision "1")) (package (name "emacs-grep-context") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -29834,7 +29837,7 @@ (define-public emacs-stumpwm-mode (revision "3")) (package (name "emacs-stumpwm-mode") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -29942,7 +29945,7 @@ (define-public emacs-on (revision "0")) (package (name "emacs-on") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -29987,7 +29990,7 @@ (define-public emacs-highlight-escape-sequences (revision "0")) (package (name "emacs-highlight-escape-sequences") - (version (git-version "0.4" revision commit)) + (version (make-git-version "0.4" revision commit)) (source (origin (method git-fetch) @@ -30066,7 +30069,7 @@ (define-public emacs-grid (package (name "emacs-grid") ;; Taken from source code - (version (git-version "0.1-pre" revision commit)) + (version (make-git-version "0.1-pre" revision commit)) (source (origin (method git-fetch) @@ -30138,7 +30141,7 @@ (define-public emacs-eros (package (name "emacs-eros") ;; No tag or release, version taken from `eros.el'. - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -30259,7 +30262,7 @@ (define-public emacs-scroll-on-drag (revision "2")) (package (name "emacs-scroll-on-drag") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -30309,7 +30312,7 @@ (define-public emacs-noflet (commit "7ae84dc3257637af7334101456dafe1759c6b68a")) (package (name "emacs-noflet") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -30485,7 +30488,7 @@ (define-public emacs-isearch+ (revision "2")) (package (name "emacs-isearch+") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -30604,7 +30607,7 @@ (define-public emacs-desktop-environment (revision "0")) (package (name "emacs-desktop-environment") - (version (git-version "0.5.0" revision commit)) + (version (make-git-version "0.5.0" revision commit)) (source (origin (method git-fetch) @@ -30632,7 +30635,7 @@ (define-public emacs-org-caldav (revision "0")) (package (name "emacs-org-caldav") - (version (git-version "3.1" revision commit)) + (version (make-git-version "3.1" revision commit)) (source (origin (method git-fetch) @@ -30661,7 +30664,7 @@ (define-public emacs-zotra (revision "0")) (package (name "emacs-zotra") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -30793,7 +30796,7 @@ (define-public emacs-evil-mc (revision "2")) (package (name "emacs-evil-mc") - (version (git-version "0.0.3" revision commit)) + (version (make-git-version "0.0.3" revision commit)) (source (origin (method git-fetch) @@ -30826,7 +30829,7 @@ (define-public emacs-evil-org (revision "2")) (package (name "emacs-evil-org") - (version (git-version "1.0.3" revision commit)) + (version (make-git-version "1.0.3" revision commit)) (source (origin (method git-fetch) @@ -31134,7 +31137,7 @@ (define-public emacs-lingva (package (name "emacs-lingva") (version - (git-version "0.2" revision commit)) + (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -31183,7 +31186,7 @@ (define-public emacs-helm-descbinds (let ((commit "033be73f21778633813264ce1634a6e1ad873d8e")) (package (name "emacs-helm-descbinds") - (version (git-version "1.13" "1" commit)) + (version (make-git-version "1.13" "1" commit)) (source (origin (method git-fetch) @@ -31211,7 +31214,7 @@ (define-public emacs-helm-emms (let ((commit "37e5aa029abfa5a5c48636314de8157142944fa2")) (package (name "emacs-helm-emms") - (version (git-version "1.3" "3" commit)) + (version (make-git-version "1.3" "3" commit)) (source (origin (method git-fetch) @@ -31262,7 +31265,7 @@ (define-public emacs-helm-flycheck (let ((commit "3cf7d3bb194acacc6395f88360588013d92675d6")) (package (name "emacs-helm-flycheck") - (version (git-version "0.4" "1" commit)) + (version (make-git-version "0.4" "1" commit)) (source (origin (method git-fetch) @@ -31322,7 +31325,7 @@ (define-public emacs-helm-mu (let ((commit "77e6fea24e01481418738421dbcfe28ef1bd63cf")) (package (name "emacs-helm-mu") - (version (git-version "20180513" "1" commit)) + (version (make-git-version "20180513" "1" commit)) (source (origin (method git-fetch) @@ -31384,7 +31387,7 @@ (define-public emacs-image+ (let ((commit "6834d0c09bb4df9ecc0d7a559bd7827fed48fffc")) (package (name "emacs-image+") - (version (git-version "0.6.2" "1" commit)) + (version (make-git-version "0.6.2" "1" commit)) (source (origin (method git-fetch) @@ -31552,7 +31555,7 @@ (define-public emacs-mu4e-dashboard (revision "1")) (package (name "emacs-mu4e-dashboard") - (version (git-version "0.1.1" revision commit)) + (version (make-git-version "0.1.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -31585,7 +31588,7 @@ (define-public emacs-pinentry (revision "2")) (package (name "emacs-pinentry") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -31647,7 +31650,7 @@ (define-public emacs-srfi (revision "0")) (package (name "emacs-srfi") - (version (git-version "0.3" revision commit)) + (version (make-git-version "0.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -31727,7 +31730,7 @@ (define-public emacs-github-review (revision "2")) (package (name "emacs-github-review") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -31868,7 +31871,7 @@ (define-public emacs-hlint-refactor-mode (revision "1")) (package (name "emacs-hlint-refactor-mode") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -31893,7 +31896,7 @@ (define-public emacs-ccls (revision "5")) (package (name "emacs-ccls") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -31966,7 +31969,7 @@ (define-public emacs-org-board (revision "2")) (package (name "emacs-org-board") - (version (git-version "1138" revision commit)) + (version (make-git-version "1138" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -32031,7 +32034,7 @@ (define-public emacs-recent-addresses (package (name "emacs-recent-addresses") (home-page "https://nschum.de/src/emacs/recent-addresses/") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -32056,7 +32059,7 @@ (define-public emacs-fold-dwim (revision "0")) (package (name "emacs-fold-dwim") - (version (git-version "1.2" revision commit)) + (version (make-git-version "1.2" revision commit)) (home-page "https://github.com/emacsattic/fold-dwim") (source (origin (method git-fetch) @@ -32152,7 +32155,7 @@ (define-public emacs-org-asciidoc (revision "0")) (package (name "emacs-org-asciidoc") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -32178,7 +32181,7 @@ (define-public emacs-racer (revision "0")) (package (name "emacs-racer") - (version (git-version "1.2" revision commit)) + (version (make-git-version "1.2" revision commit)) (source (origin (method git-fetch) @@ -32286,7 +32289,7 @@ (define-public emacs-cargo (revision "0")) (package (name "emacs-cargo") - (version (git-version "0.4.1" revision commit)) + (version (make-git-version "0.4.1" revision commit)) (source (origin (method git-fetch) @@ -32367,7 +32370,7 @@ (define-public emacs-helm-org-contacts (revision "2")) (package (name "emacs-helm-org-contacts") - (version (git-version "20201202" revision commit)) + (version (make-git-version "20201202" revision commit)) (source (origin (method git-fetch) @@ -32493,7 +32496,7 @@ (define-public emacs-pcre2el (revision "0")) (package (name "emacs-pcre2el") - (version (git-version "1.12" revision commit)) + (version (make-git-version "1.12" revision commit)) (source (origin (method git-fetch) @@ -32583,7 +32586,7 @@ (define-public emacs-git-annex (revision "2")) (package (name "emacs-git-annex") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) @@ -32672,7 +32675,7 @@ (define-public emacs-youtube-dl (revision "2")) (package (name "emacs-youtube-dl") - (version (git-version "1.0" "2" commit)) + (version (make-git-version "1.0" "2" commit)) (source (origin (method git-fetch) @@ -32715,7 +32718,7 @@ (define-public emacs-ytdl (revision "0")) (package (name "emacs-ytdl") - (version (git-version "1.3.6" revision commit)) + (version (make-git-version "1.3.6" revision commit)) (source (origin (method git-fetch) @@ -32757,7 +32760,7 @@ (define-public emacs-ytel (revision "0")) (package (name "emacs-ytel") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -32793,7 +32796,7 @@ (define-public emacs-ytel-show (revision "0")) (package (name "emacs-ytel-show") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -32910,7 +32913,7 @@ (define-public emacs-org-rss-publishing (revision "0")) (package (name "emacs-org-rss-publishing") - (version (git-version "0.8" revision commit)) + (version (make-git-version "0.8" revision commit)) (source (origin (method git-fetch) @@ -32935,7 +32938,7 @@ (define-public emacs-blimp (let ((commit "e420763d6d18b5d1be552cdbc47f91418343db03")) (package (name "emacs-blimp") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -33024,7 +33027,7 @@ (define-public emacs-nerd-icons (revision "1")) (package (name "emacs-nerd-icons") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (home-page "https://github.com/rainstormstudio/nerd-icons.el") (source (origin @@ -33151,7 +33154,7 @@ (define-public emacs-browse-kill-ring (revision "0")) (package (name "emacs-browse-kill-ring") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) @@ -33231,7 +33234,7 @@ (define-public emacs-spaceline-next (package (inherit emacs-spaceline) (name "emacs-spaceline-next") - (version (git-version last-release-version revision commit)) + (version (make-git-version last-release-version revision commit)) (source (origin (method git-fetch) @@ -33247,7 +33250,7 @@ (define-public emacs-column-enforce-mode (revision "1")) (package (name "emacs-column-enforce-mode") - (version (git-version "1.0.4" revision commit)) + (version (make-git-version "1.0.4" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -33292,7 +33295,7 @@ (define-public emacs-slime-repl-ansi-color (let ((commit "ad03263f5d4de473bc173b64a6fc3dc1106393d7")) (package (name "emacs-slime-repl-ansi-color") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -33496,7 +33499,7 @@ (define-public emacs-wordnut (revision "0")) (package (name "emacs-wordnut") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/gromnitsky/wordnut") (source (origin (method git-fetch) @@ -33528,7 +33531,7 @@ (define-public emacs-frame-local (commit "7ee1106c3bcd4022f48421f8cb1ef4f995da816e")) (package (name "emacs-frame-local") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -33631,7 +33634,7 @@ (define-public emacs-general (revision "4")) (package (name "emacs-general") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -33667,7 +33670,7 @@ (define-public emacs-tldr (revision "2")) (package (name "emacs-tldr") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -33785,7 +33788,7 @@ (define-public emacs-leetcode (revision "1")) (package (name "emacs-leetcode") - (version (git-version "0" "1" commit)) + (version (make-git-version "0" "1" commit)) (home-page "https://github.com/ginqi7/leetcode-emacs") (source (origin (method git-fetch) @@ -33808,7 +33811,7 @@ (define-public emacs-epc (let ((commit "e1bfa5ca163273859336e3cc89b4b6460f7f8cda")) (package (name "emacs-epc") - (version (git-version "0.1.1" "1" commit)) + (version (make-git-version "0.1.1" "1" commit)) (home-page "https://github.com/kiwanami/emacs-epc") (source (origin (method git-fetch) @@ -33834,7 +33837,7 @@ (define-public emacs-edbi (let ((commit "6f50aaf4bde75255221f2292c7a4ad3fa9d918c0")) (package (name "emacs-edbi") - (version (git-version "0.1.3" "1" commit)) + (version (make-git-version "0.1.3" "1" commit)) (home-page "https://github.com/kiwanami/emacs-edbi") (source (origin (method git-fetch) @@ -33882,7 +33885,7 @@ (define-public emacs-edbi-sqlite (let ((commit "52cb9ca1af7691b592f2cfd2f007847e7a4ccd5f")) (package (name "emacs-edbi-sqlite") - (version (git-version "0.1.1" "1" commit)) + (version (make-git-version "0.1.1" "1" commit)) (home-page "https://github.com/proofit404/edbi-sqlite") (source (origin (method git-fetch) @@ -33906,7 +33909,7 @@ (define-public emacs-nice-citation (revision "0")) (package (name "emacs-nice-citation") - (version (git-version "0.0.2" revision commit)) + (version (make-git-version "0.0.2" revision commit)) (source (origin (method git-fetch) @@ -33957,7 +33960,7 @@ (define-public emacs-nyxt (revision "0")) (package (name "emacs-nyxt") - (version (git-version "0.1.1" revision commit)) + (version (make-git-version "0.1.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -34051,7 +34054,7 @@ (define-public emacs-kodi-remote (revision "0")) (package (name "emacs-kodi-remote") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -34158,7 +34161,7 @@ (define-public emacs-vterm (revision "2")) (package (name "emacs-vterm") - (version (git-version "0.0.2" revision commit)) + (version (make-git-version "0.0.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -34224,7 +34227,7 @@ (define-public emacs-vterm-toggle (revision "1")) (package (name "emacs-vterm-toggle") - (version (git-version "0.0.4" revision commit)) + (version (make-git-version "0.0.4" revision commit)) (source (origin (method git-fetch) @@ -34248,7 +34251,7 @@ (define-public emacs-multi-vterm (revision "1")) (package (name "emacs-multi-vterm") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -34272,7 +34275,7 @@ (define-public emacs-simple-mpc (revision "1")) (package (name "emacs-simple-mpc") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -34499,7 +34502,7 @@ (define-public emacs-google-c-style (revision "0")) (package (name "emacs-google-c-style") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -34521,7 +34524,7 @@ (define-public emacs-redshank (revision "1")) (package (name "emacs-redshank") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -34549,7 +34552,7 @@ (define-public emacs-disk-usage (revision "0")) (package (name "emacs-disk-usage") - (version (git-version "1.3.3" revision commit)) + (version (make-git-version "1.3.3" revision commit)) (source (origin (method git-fetch) @@ -34654,7 +34657,7 @@ (define-public emacs-lorem-ipsum (revision "1")) (package (name "emacs-lorem-ipsum") - (version (git-version "0.4" revision commit)) + (version (make-git-version "0.4" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -34677,7 +34680,7 @@ (define-public emacs-lisp-extra-font-lock (let ((commit "4605eccbe1a7fcbd3cacf5b71249435413b4db4f")) (package (name "emacs-lisp-extra-font-lock") - (version (git-version "0.0.6" "1" commit)) + (version (make-git-version "0.0.6" "1" commit)) (home-page "https://github.com/Lindydancer/lisp-extra-font-lock") (source (origin (method git-fetch) @@ -34796,7 +34799,7 @@ (define-public emacs-lsp-mode (revision "0")) (package (name "emacs-lsp-mode") - (version (git-version "9.0.1" revision commit)) ;taken from lsp-mode.el + (version (make-git-version "9.0.1" revision commit)) ;taken from lsp-mode.el (source (origin (method git-fetch) @@ -35278,7 +35281,7 @@ (define-public emacs-libyaml (commit "961e0d8b9ef47464c049e07be7fcefd3903f8cbc")) (package (name "emacs-libyaml") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -35327,7 +35330,7 @@ (define-public emacs-lsp-java (revision "1")) (package (name "emacs-lsp-java") - (version (git-version "3.1" revision commit)) + (version (make-git-version "3.1" revision commit)) (source (origin (method git-fetch) @@ -35358,7 +35361,7 @@ (define-public emacs-lsp-metals (revision "1")) (package (name "emacs-lsp-metals") - (version (git-version "1.2.0" revision commit)) + (version (make-git-version "1.2.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -35417,7 +35420,7 @@ (define-public emacs-lsp-lua-emmy (let ((commit "ab53fb2a8b8942804eb75bab5624fd19f1d360bf")) (package (name "emacs-lsp-lua-emmy") - (version (git-version "0.1.0" "1" commit)) + (version (make-git-version "0.1.0" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -35686,7 +35689,7 @@ (define-public emacs-matcha (let ((commit "dc4a940b3360aadeb2d9eaab7bd0c85e1e85ab76")) (package (name "emacs-matcha") - (version (git-version "0.0.1" "2" commit)) ;no upstream release + (version (make-git-version "0.0.1" "2" commit)) ;no upstream release (source (origin (method git-fetch) (uri (git-reference @@ -35710,7 +35713,7 @@ (define-public emacs-undo-propose (revision "3")) (package (name "emacs-undo-propose") - (version (git-version "3.0.0" revision commit)) + (version (make-git-version "3.0.0" revision commit)) (source (origin (method git-fetch) @@ -35741,7 +35744,7 @@ (define-public emacs-elisp-docstring-mode (revision "1")) (package (name "emacs-elisp-docstring-mode") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -35765,7 +35768,7 @@ (define-public emacs-vimrc-mode (revision "1")) (package (name "emacs-vimrc-mode") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -35788,7 +35791,7 @@ (define-public emacs-flycheck-elm (commit "1b60050efd4729bfba548f3e5adbcb58436667cb")) (package (name "emacs-flycheck-elm") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -35812,7 +35815,7 @@ (define-public emacs-flycheck-haskell (revision "2")) (package (name "emacs-flycheck-haskell") - (version (git-version "0.8" revision commit)) + (version (make-git-version "0.8" revision commit)) (source (origin (method git-fetch) @@ -35843,7 +35846,7 @@ (define-public emacs-js2-refactor (revision "2")) (package (name "emacs-js2-refactor") - (version (git-version "0.9.0" revision commit)) + (version (make-git-version "0.9.0" revision commit)) (source (origin (method git-fetch) @@ -35910,7 +35913,7 @@ (define-public emacs-prettier (revision "1")) (package (name "emacs-prettier") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -35978,7 +35981,7 @@ (define-public emacs-springboard (revision "1")) (package (name "emacs-springboard") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -36004,7 +36007,7 @@ (define-public emacs-tco (revision "1")) (package (name "emacs-tco") - (version (git-version "0.3" revision commit)) + (version (make-git-version "0.3" revision commit)) (source (origin (method git-fetch) @@ -36091,7 +36094,7 @@ (define-public emacs-vdiff-magit (revision "8")) (package (name "emacs-vdiff-magit") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -36163,7 +36166,7 @@ (define-public emacs-exwm-edit (revision "3")) (package (name "emacs-exwm-edit") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -36189,7 +36192,7 @@ (define-public emacs-exwm-mff (revision "1")) (package (name "emacs-exwm-mff") - (version (git-version "1.2.1" revision commit)) + (version (make-git-version "1.2.1" revision commit)) (source (origin (method git-fetch) @@ -36233,7 +36236,7 @@ (define-public emacs-exwm-firefox-core (revision "1")) (package (name "emacs-exwm-firefox-core") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -36445,7 +36448,7 @@ (define-public emacs-flow-minor-mode (revision "4")) (package (name "emacs-flow-minor-mode") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -36512,7 +36515,7 @@ (define-public emacs-origami (revision "1")) (package (name "emacs-origami") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -36549,7 +36552,7 @@ (define-public emacs-peep-dired (revision "1")) (package (name "emacs-peep-dired") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -36601,7 +36604,7 @@ (define-public emacs-ivy-clipmenu (let ((commit "d2071f2c5043a05d610cd1952e84176ca78c31dc")) (package (name "emacs-ivy-clipmenu") - (version (git-version "0.0.1" "1" commit)) + (version (make-git-version "0.0.1" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -36626,7 +36629,7 @@ (define-public emacs-org-download (package (name "emacs-org-download") ;; Not released version. - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -36652,7 +36655,7 @@ (define-public emacs-org-drill-table (revision "0")) (package (name "emacs-org-drill-table") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -36731,7 +36734,7 @@ (define-public emacs-dash-docs (revision "2")) (package (name "emacs-dash-docs") - (version (git-version "1.4.0" revision commit)) + (version (make-git-version "1.4.0" revision commit)) (source (origin (method git-fetch) @@ -36775,7 +36778,7 @@ (define-public emacs-helm-dash (revision "2")) (package (name "emacs-helm-dash") - (version (git-version "1.3.0" revision commit)) + (version (make-git-version "1.3.0" revision commit)) (source (origin (method git-fetch) @@ -36800,7 +36803,7 @@ (define-public emacs-counsel-dash (revision "4")) (package (name "emacs-counsel-dash") - (version (git-version "0.1.3" revision commit)) + (version (make-git-version "0.1.3" revision commit)) (source (origin (method git-fetch) @@ -36846,7 +36849,7 @@ (define-public emacs-cascading-dir-locals (commit "efdf5e6d62b955ee0ca3c170eae1d388799f9fa0")) (package (name "emacs-cascading-dir-locals") - (version (git-version release revision commit)) + (version (make-git-version release revision commit)) (home-page "https://github.com/fritzgrabo/cascading-dir-locals") (source (origin @@ -37079,7 +37082,7 @@ (define-public emacs-info-plus (revision "4")) (package (name "emacs-info-plus") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -37219,7 +37222,7 @@ (define-public emacs-ob-elm (revision "0")) (package (name "emacs-ob-elm") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) @@ -37346,7 +37349,7 @@ (define-public emacs-tramp-auto-auth (let ((commit "f15a12dfab651aff60f4a9d70f868030a12344ac")) (package (name "emacs-tramp-auto-auth") - (version (git-version "20191027" "1" commit)) + (version (make-git-version "20191027" "1" commit)) (source (origin (method git-fetch) @@ -37394,7 +37397,7 @@ (define-public emacs-semantic-refactor (let ((commit "6f2c97d17fb70f4ca2112f5a2b99a8ec162004f5")) (package (name "emacs-semantic-refactor") - (version (git-version "0.5" "1" commit)) + (version (make-git-version "0.5" "1" commit)) (source (origin (method git-fetch) @@ -37470,7 +37473,7 @@ (define-public emacs-helm-wikipedia (let ((commit "126f044e0a0e1432e0791c33ce2a41875d704a9b")) (package (name "emacs-helm-wikipedia") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (home-page "https://github.com/emacs-helm/helm-wikipedia/") (source (origin @@ -37618,7 +37621,7 @@ (define-public emacs-evil-cleverparens (revision "1")) (package (name "emacs-evil-cleverparens") - (version (git-version "2017-07-17" revision commit)) + (version (make-git-version "2017-07-17" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -37661,7 +37664,7 @@ (define-public emacs-nushell-mode (revision "0")) (package (name "emacs-nushell-mode") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -37861,7 +37864,7 @@ (define-public emacs-everywhere (revision "0")) (package (name "emacs-everywhere") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -37991,7 +37994,7 @@ (define-public emacs-org-redmine (let ((commit "e77d013bc3784947c46a5c53f03cd7d3c68552fc")) (package (name "emacs-org-redmine") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -38013,7 +38016,7 @@ (define-public emacs-multi-term (revision "0")) (package (name "emacs-multi-term") - (version (git-version "1.5" revision commit)) + (version (make-git-version "1.5" revision commit)) (source (origin (method git-fetch) @@ -38133,7 +38136,7 @@ (define-public emacs-gnus-alias (package (name "emacs-gnus-alias") ;; The version string is specified in gnus-alias.el. - (version (git-version "1.7.0" revision commit)) + (version (make-git-version "1.7.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -38224,7 +38227,7 @@ (define-public emacs-ox-gemini (revision "1")) (package (name "emacs-ox-gemini") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -38341,7 +38344,7 @@ (define-public emacs-ox-reveal (revision "0")) (package (name "emacs-ox-reveal") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -38397,7 +38400,7 @@ (define-public emacs-ox-rss (revision "0")) (package (name "emacs-ox-rss") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -38503,7 +38506,7 @@ (define-public emacs-fedi (revision "2")) (package (name "emacs-fedi") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -38651,7 +38654,7 @@ (define-public emacs-spell-fu (revision "1")) (package (name "emacs-spell-fu") - (version (git-version "0.3" revision commit)) + (version (make-git-version "0.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -38675,7 +38678,7 @@ (define-public emacs-org-emms (package (name "emacs-org-emms") (version - (git-version "0.1" revision commit)) + (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -38808,7 +38811,7 @@ (define-public emacs-ssh-config-mode (revision "2")) (package (name "emacs-ssh-config-mode") - (version (git-version "8.0" revision commit)) + (version (make-git-version "8.0" revision commit)) (source (origin (method git-fetch) @@ -38911,7 +38914,7 @@ (define-public emacs-tao-theme (revision "1")) (package (name "emacs-tao-theme") - (version (git-version "1.1.1" revision commit)) + (version (make-git-version "1.1.1" revision commit)) (source (origin (method git-fetch) @@ -38940,7 +38943,7 @@ (define-public emacs-almost-mono-themes (revision "0")) (package (name "emacs-almost-mono-themes") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -38964,7 +38967,7 @@ (define-public emacs-quasi-monochrome (revision "0")) (package (name "emacs-quasi-monochrome") - (version (git-version "1.2" revision commit)) + (version (make-git-version "1.2" revision commit)) (source (origin (method git-fetch) @@ -38988,7 +38991,7 @@ (define-public emacs-doom-themes (revision "0")) (package (name "emacs-doom-themes") - (version (git-version "2.3.0" revision commit)) + (version (make-git-version "2.3.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -39073,7 +39076,7 @@ (define-public emacs-plan9-theme (package (name "emacs-plan9-theme") (home-page "https://github.com/john2x/plan9-theme.el") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -39095,7 +39098,7 @@ (define-public emacs-punpun-theme (revision "0")) (package (name "emacs-punpun-theme") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -39142,7 +39145,7 @@ (define-public emacs-starlit-theme (revision "0")) (package (name "emacs-starlit-theme") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -39189,7 +39192,7 @@ (define-public emacs-dimmer (revision "1")) (package (name "emacs-dimmer") - (version (git-version "0.4.2" revision commit)) + (version (make-git-version "0.4.2" revision commit)) (source (origin (method git-fetch) @@ -39385,7 +39388,7 @@ (define-public emacs-framemove (revision "0")) (package (name "emacs-framemove") - (version (git-version "0.10" revision commit)) + (version (make-git-version "0.10" revision commit)) (source (origin (method git-fetch) @@ -39492,7 +39495,7 @@ (define-public emacs-helm-themes (revision "1")) (package (name "emacs-helm-themes") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -39542,7 +39545,7 @@ (define-public emacs-telega-server (revision "0")) (package (name "emacs-telega-server") - (version (git-version "0.8.2" revision commit)) + (version (make-git-version "0.8.2" revision commit)) (source (origin (method git-fetch) @@ -39589,7 +39592,7 @@ (define-public emacs-telega (revision "0")) (package (name "emacs-telega") - (version (git-version "0.8.452" revision commit)) + (version (make-git-version "0.8.452" revision commit)) (source (origin (method git-fetch) @@ -39757,7 +39760,7 @@ (define-public emacs-frames-only-mode (revision "0")) (package (name "emacs-frames-only-mode") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -39840,7 +39843,7 @@ (define-public emacs-org-present (revision "1")) (package (name "emacs-org-present") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -39887,7 +39890,7 @@ (define-public emacs-eshell-toggle (revision "1")) (package (name "emacs-eshell-toggle") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (origin (method git-fetch) @@ -39979,7 +39982,7 @@ (define-public emacs-liberime (revision "0")) (package (name "emacs-liberime") - (version (git-version "0.0.6" revision commit)) + (version (make-git-version "0.0.6" revision commit)) (source (origin (method git-fetch) @@ -40040,7 +40043,7 @@ (define-public emacs-blackout (revision "1")) (package (name "emacs-blackout") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -40063,7 +40066,7 @@ (define-public emacs-ivy-omni-org (revision "1")) (package (name "emacs-ivy-omni-org") - (version (git-version "0.2.1" revision commit)) + (version (make-git-version "0.2.1" revision commit)) (source (origin (method git-fetch) @@ -40131,7 +40134,7 @@ (define-public emacs-showtip (revision "0")) (package (name "emacs-showtip") - (version (git-version "0.01" revision commit)) + (version (make-git-version "0.01" revision commit)) (source (origin (method git-fetch) @@ -40154,7 +40157,7 @@ (define-public emacs-sdcv (revision "0")) (package (name "emacs-sdcv") - (version (git-version "1.5.2" revision commit)) + (version (make-git-version "1.5.2" revision commit)) (source (origin (method git-fetch) @@ -40179,7 +40182,7 @@ (define-public emacs-helm-lacarte (revision "1")) (package (name "emacs-helm-lacarte") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -40205,7 +40208,7 @@ (define-public emacs-esh-help (revision "1")) (package (name "emacs-esh-help") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -40230,7 +40233,7 @@ (define-public emacs-isearch-dabbrev (revision "1")) (package (name "emacs-isearch-dabbrev") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -40253,7 +40256,7 @@ (define-public emacs-helm-linux-disks (revision "1")) (package (name "emacs-helm-linux-disks") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -40279,7 +40282,7 @@ (define-public emacs-debase (revision "1")) (package (name "emacs-debase") - (version (git-version "0.7" revision commit)) + (version (make-git-version "0.7" revision commit)) (source (origin (method git-fetch) @@ -40302,7 +40305,7 @@ (define-public emacs-discomfort (revision "1")) (package (name "emacs-discomfort") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -40324,7 +40327,7 @@ (define-public emacs-psession (revision "1")) (package (name "emacs-psession") - (version (git-version "1.5" revision commit)) + (version (make-git-version "1.5" revision commit)) (source (origin (method git-fetch) @@ -40455,7 +40458,7 @@ (define-public emacs-edn (let ((commit "be9e32d1b49e35247b263b0243df7cfdc8d413ab")) (package (name "emacs-edn") - (version (git-version "1.1.2" "1" commit)) + (version (make-git-version "1.1.2" "1" commit)) (home-page "https://github.com/expez/edn.el") (source (origin (method git-fetch) @@ -40506,7 +40509,7 @@ (define-public emacs-helm-clojuredocs (let ((commit "5a7f0f2cb401be0b09e73262a1c18265ab9a3cea")) (package (name "emacs-helm-clojuredocs") - (version (git-version "0.3" "1" commit)) + (version (make-git-version "0.3" "1" commit)) (home-page "https://github.com/mbuczko/helm-clojuredocs") (source (origin (method git-fetch) @@ -40568,7 +40571,7 @@ (define-public emacs-helm-wordnut (let ((commit "9681a9535a839cd5d042c302945ae595852fe7bf")) (package (name "emacs-helm-wordnut") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (home-page "https://github.com/emacs-helm/helm-wordnut") (source (origin @@ -40633,7 +40636,7 @@ (define-public emacs-helm-css-scss (revision "0")) (package (name "emacs-helm-css-scss") - (version (git-version "1.3" revision commit)) + (version (make-git-version "1.3" revision commit)) (source (origin (method git-fetch) @@ -40661,7 +40664,7 @@ (define-public emacs-metal-mercury-mode (version "0.0.0")) (package (name "emacs-metal-mercury-mode") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -40794,7 +40797,7 @@ (define-public emacs-mwim (revision "0")) (package (name "emacs-mwim") - (version (git-version "0.4" revision commit)) + (version (make-git-version "0.4" revision commit)) (source (origin (method git-fetch) @@ -40838,7 +40841,7 @@ (define-public emacs-unkillable-scratch (revision "0")) (package (name "emacs-unkillable-scratch") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -40909,7 +40912,7 @@ (define-public emacs-dmenu (revision "0")) (package (name "emacs-dmenu") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -40984,7 +40987,7 @@ (define-public emacs-message-x (revision "0")) (package (name "emacs-message-x") - (version (git-version "1.23" revision commit)) + (version (make-git-version "1.23" revision commit)) (source (origin (method git-fetch) @@ -41012,7 +41015,7 @@ (define-public emacs-gleam-mode (revision "0")) (package (name "emacs-gleam-mode") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -41035,7 +41038,7 @@ (define-public emacs-glsl-mode (revision "0")) (package (name "emacs-glsl-mode") - (version (git-version "2.4" revision commit)) + (version (make-git-version "2.4" revision commit)) (source (origin (method git-fetch) @@ -41060,7 +41063,7 @@ (define-public emacs-gnus-harvest (revision "0")) (package (name "emacs-gnus-harvest") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -41121,7 +41124,7 @@ (define-public emacs-persid (revision "2")) (package (name "emacs-persid") - (version (git-version "0.1.1" revision commit)) + (version (make-git-version "0.1.1" revision commit)) (source (origin (method git-fetch) @@ -41404,7 +41407,7 @@ (define-public emacs-weblorg (revision "0")) (package (name "emacs-weblorg") - (version (git-version "0.1.2" revision commit)) + (version (make-git-version "0.1.2" revision commit)) (source (origin (method git-fetch) @@ -41434,7 +41437,7 @@ (define-public emacs-ddskk (revision "0")) (package (name "emacs-ddskk") - (version (git-version "17.1" revision commit)) + (version (make-git-version "17.1" revision commit)) (source (origin (method git-fetch) @@ -41560,7 +41563,7 @@ (define-public emacs-haskell-snippets (let ((commit "1c29c4a68ce89848b8d371c6510d1de3b586c8b3")) (package (name "emacs-haskell-snippets") - (version (git-version "0.1.0" "1" commit)) + (version (make-git-version "0.1.0" "1" commit)) (source (origin (method git-fetch) @@ -41599,7 +41602,7 @@ (define-public emacs-orca (revision "0")) (package (name "emacs-orca") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -41815,7 +41818,7 @@ (define-public emacs-org-roam-bibtex (revision "0")) (package (name "emacs-org-roam-bibtex") - (version (git-version "0.6.2" revision commit)) + (version (make-git-version "0.6.2" revision commit)) (source (origin (method git-fetch) @@ -41874,7 +41877,7 @@ (define-public emacs-org-glossary (revision "0")) (package (name "emacs-org-glossary") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -41939,7 +41942,7 @@ (define-public emacs-uml-mode (revision "1")) (package (name "emacs-uml-mode") - (version (git-version "0.0.4" revision commit)) + (version (make-git-version "0.0.4" revision commit)) (source (origin (method git-fetch) @@ -41986,7 +41989,7 @@ (define-public emacs-ukrainian-holidays (commit "e52b0c92843e9f4d0415a7ba3b8559785497d23d")) (package (name "emacs-ukrainian-holidays") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -42228,7 +42231,7 @@ (define-public emacs-shell-pop (revision "0")) (package (name "emacs-shell-pop") - (version (git-version "0.64" revision commit)) + (version (make-git-version "0.64" revision commit)) (source (origin (method git-fetch) @@ -42253,7 +42256,7 @@ (define-public emacs-shell-here (revision "1")) (package (name "emacs-shell-here") - (version (git-version "1.3" revision commit)) + (version (make-git-version "1.3" revision commit)) (source (origin (method git-fetch) @@ -42277,7 +42280,7 @@ (define-public emacs-hyperspace (revision "1")) (package (name "emacs-hyperspace") - (version (git-version "0.8.5" revision commit)) + (version (make-git-version "0.8.5" revision commit)) (source (origin (method git-fetch) @@ -42304,7 +42307,7 @@ (define-public emacs-nssh (revision "1")) (package (name "emacs-nssh") - (version (git-version "0.9.12" revision commit)) + (version (make-git-version "0.9.12" revision commit)) (source (origin (method git-fetch) @@ -42329,7 +42332,7 @@ (define-public emacs-tshell (revision "0")) (package (name "emacs-tshell") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -42433,7 +42436,7 @@ (define-public emacs-highlight (revision "2")) (package (name "emacs-highlight") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -42567,7 +42570,7 @@ (define-public emacs-company-org-block (revision "1")) (package (name "emacs-company-org-block") - (version (git-version "0.3" revision commit)) + (version (make-git-version "0.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -42593,7 +42596,7 @@ (define-public emacs-html-to-hiccup (revision "0")) (package (name "emacs-html-to-hiccup") - (version (git-version "1" revision commit)) + (version (make-git-version "1" revision commit)) (source (origin (method git-fetch) @@ -42646,7 +42649,7 @@ (define-public emacs-bind-map (revision "0")) (package (name "emacs-bind-map") - (version (git-version "1.1.2" revision commit)) + (version (make-git-version "1.1.2" revision commit)) (source (origin (method git-fetch) @@ -42699,7 +42702,7 @@ (define-public emacs-spaceleader (revision "1")) (package (name "emacs-spaceleader") - (version (git-version "0.0.3" revision commit)) + (version (make-git-version "0.0.3" revision commit)) (source (origin (method git-fetch) @@ -42800,7 +42803,7 @@ (define-public emacs-promise (revision "1")) (package (name "emacs-promise") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) @@ -42851,7 +42854,7 @@ (define-public emacs-rocket-chat (let ((commit "96fe27a8678de5ae4061f635108a7192eee13f98")) (package (name "emacs-rocket-chat") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -42902,7 +42905,7 @@ (define-public emacs-xonsh-mode (revision "0")) (package (name "emacs-xonsh-mode") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -42971,7 +42974,7 @@ (define-public emacs-weyland-yutani-theme (revision "0")) (package (name "emacs-weyland-yutani-theme") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -42993,7 +42996,7 @@ (define-public emacs-janet-mode (let ((commit "2f5bcabcb6953e1ed1926ba6a2328c453e8b4ac7")) (package (name "emacs-janet-mode") - (version (git-version "0.1.0" "1" commit)) + (version (make-git-version "0.1.0" "1" commit)) (source (origin (method git-fetch) @@ -43014,7 +43017,7 @@ (define-public emacs-inf-janet (let ((commit "df46651d3aad32593b2195c80ca91fb64d571fb7")) (package (name "emacs-inf-janet") - (version (git-version "0.1.0" "1" commit)) + (version (make-git-version "0.1.0" "1" commit)) (source (origin (method git-fetch) @@ -43180,7 +43183,7 @@ (define-public emacs-webpaste (revision "1")) (package (name "emacs-webpaste") - (version (git-version "3.2.2" revision commit)) + (version (make-git-version "3.2.2" revision commit)) (source (origin (method git-fetch) @@ -43226,7 +43229,7 @@ (define-public emacs-keystore-mode (commit "43bd5926348298d077c7221f37902c990df3f951")) (package (name "emacs-keystore-mode") - (version (git-version release revision commit)) + (version (make-git-version release revision commit)) (home-page "https://github.com/peterpaul/keystore-mode") (source (origin @@ -43437,7 +43440,7 @@ (define-public emacs-lexic (revision "0")) (package (name "emacs-lexic") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -43625,7 +43628,7 @@ (define-public emacs-seeing-is-believing (package (name "emacs-seeing-is-believing") (home-page "https://github.com/jcinnamond/seeing-is-believing") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -43697,7 +43700,7 @@ (define-public emacs-riscv-mode (revision "1")) (package (name "emacs-riscv-mode") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -43779,7 +43782,7 @@ (define-public emacs-global-tags (revision "0")) (package (name "emacs-global-tags") - (version (git-version "0.7" revision commit)) + (version (make-git-version "0.7" revision commit)) (home-page "https://git.launchpad.net/global-tags.el/") (source (origin (method git-fetch) @@ -43922,7 +43925,7 @@ (define-public emacs-ed-mode (revision "0")) (package (name "emacs-ed-mode") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -44044,7 +44047,7 @@ (define-public emacs-org-margin (revision "0")) (package (name "emacs-org-margin") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -44083,7 +44086,7 @@ (define-public emacs-pyimport (revision "0")) (package (name "emacs-pyimport") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) @@ -44120,7 +44123,7 @@ (define-public emacs-straight (revision "4")) (package (name "emacs-straight") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -44235,7 +44238,7 @@ (define-public emacs-corfu-doc-terminal (revision "0")) (package (name "emacs-corfu-doc-terminal") - (version (git-version "0.9" revision commit)) + (version (make-git-version "0.9" revision commit)) (source (origin (method git-fetch) @@ -44308,7 +44311,7 @@ (define-public emacs-consult-projectile (revision "1")) (package (name "emacs-consult-projectile") - (version (git-version "0.7" revision commit)) + (version (make-git-version "0.7" revision commit)) (source (origin (method git-fetch) @@ -44357,7 +44360,7 @@ (define-public emacs-purs-mode (revision "1")) (package (name "emacs-purs-mode") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -44380,7 +44383,7 @@ (define-public emacs-pdb-capf (revision "0")) (package (name "emacs-pdb-capf") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -44428,7 +44431,7 @@ (define-public emacs-vunit-mode (revision "0")) (package (name "emacs-vunit-mode") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -44497,7 +44500,7 @@ (define-public emacs-hare-mode (revision "0")) (package (name "emacs-hare-mode") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -44519,7 +44522,7 @@ (define-public emacs-org-cliplink (revision "0")) (package (name "emacs-org-cliplink") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -44610,7 +44613,7 @@ (define-public emacs-mpv (revision "0")) (package (name "emacs-mpv") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -44646,7 +44649,7 @@ (define-public emacs-apel-lb (commit "1a6fd3bab2cc6b0a450c2d801f77a1c9da0f72fb")) (package (name "emacs-apel-lb") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -44672,7 +44675,7 @@ (define-public emacs-flim-lb (revision "147")) (package (name "emacs-flim-lb") - (version (git-version "1.14.9" revision commit)) + (version (make-git-version "1.14.9" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -44731,7 +44734,7 @@ (define-public emacs-semi-epg (revision "250")) (package (name "emacs-semi-epg") - (version (git-version "1.14.6" revision commit)) + (version (make-git-version "1.14.6" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -44759,7 +44762,7 @@ (define-public emacs-wallabag (revision "1")) (package (name "emacs-wallabag") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -44785,7 +44788,7 @@ (define-public emacs-wanderlust (revision "846")) (package (name "emacs-wanderlust") - (version (git-version "2.15.9" revision commit)) + (version (make-git-version "2.15.9" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -44882,7 +44885,7 @@ (define-public emacs-waveform (revision "0")) (package (name "emacs-waveform") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -44919,7 +44922,7 @@ (define-public emacs-project-x (commit "eafc9828f54dddd594887bb28a7249cf1584230c")) (package (name "emacs-project-x") - (version (git-version "0.1.6" revision commit)) + (version (make-git-version "0.1.6" revision commit)) (source (origin (method git-fetch) @@ -44965,7 +44968,7 @@ (define-public emacs-vcard-mode (package (name "emacs-vcard-mode") (home-page "https://github.com/dochang/vcard-mode") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -45013,7 +45016,7 @@ (define-public emacs-transient-posframe (revision "0")) (package (name "emacs-transient-posframe") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -45079,7 +45082,7 @@ (define-public emacs-tintin-mode (revision "1")) (package (name "emacs-tintin-mode") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -45147,7 +45150,7 @@ (define-public emacs-x509-mode (revision "1")) (package (name "emacs-x509-mode") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -45188,7 +45191,7 @@ (define-public emacs-totp (package (name "emacs-totp") (home-page "https://github.com/juergenhoetzel/emacs-totp") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 566601b9218..4c4f4b77423 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -631,7 +631,7 @@ (define-public emacs-next-minimal (package (inherit emacs-minimal) (name "emacs-next-minimal") - (version (git-version "31.0.50" revision commit)) + (version (make-git-version "31.0.50" revision commit)) (source (origin (inherit (package-source emacs-minimal)) @@ -677,7 +677,7 @@ (define-public guile-emacs (package (inherit emacs) (name "guile-emacs") - (version (git-version upstream-version revision commit)) + (version (make-git-version upstream-version revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 73a8797aabe..8442661d84f 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -447,7 +447,7 @@ (define make-base-newlib-arm-none-eabi-7-2018-q2-update (revision "0")) (package (inherit base) - (version (git-version "3.0.0" revision commit)) + (version (make-git-version "3.0.0" revision commit)) (source (origin (method git-fetch) @@ -491,7 +491,7 @@ (define make-gcc-arm-none-eabi-9-2020-q2-update (commit "13861a80750d118fbdca6006ab175903bacbb7ec") (revision "1")) (package (inherit xgcc) - (version (git-version "9-2020-q2-update" revision commit)) + (version (make-git-version "9-2020-q2-update" revision commit)) (source (origin (inherit (package-source xgcc)) @@ -586,7 +586,7 @@ (define make-base-newlib-arm-none-eabi-9-2020-q2-update (revision "0")) (package (inherit base) - (version (git-version "3.3.0" revision commit)) + (version (make-git-version "3.3.0" revision commit)) (source (origin (method git-fetch) @@ -671,7 +671,7 @@ (define make-base-newlib-arm-none-eabi-12.3.rel1 (revision "0")) (package (inherit base) - (version (git-version "4.3.0" revision commit)) + (version (make-git-version "4.3.0" revision commit)) (source (origin (method git-fetch) @@ -1517,7 +1517,7 @@ (define-public imx-usb-loader (package (name "imx-usb-loader") ;; For the version string, see IMX_LOADER_VERSION in imx_loader.h. - (version (git-version "0.2pre" revision commit)) + (version (make-git-version "0.2pre" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2064,7 +2064,7 @@ (define-public agent-proxy (revision "0")) (package (name "agent-proxy") - (version (git-version "1.98" revision commit)) + (version (make-git-version "1.98" revision commit)) (home-page "https://git.kernel.org/pub/scm/utils/kernel/kgdb/agent-proxy.git") (source (origin @@ -2155,7 +2155,7 @@ (define-public ts4900-utils (commit "e10a12f8050d1d1229e711c7cfab8a0d5d93ee58")) (package (name "ts4900-utils") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index f2a1d4811db..814a57e7dc9 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -330,7 +330,7 @@ (define-public dolphin-emu (revision "13669")) (package (name "dolphin-emu") - (version (git-version "5.0" revision commit)) + (version (make-git-version "5.0" revision commit)) (source (origin (method git-fetch) @@ -543,7 +543,7 @@ (define-public libretro-dolphin-emu (package (inherit dolphin-emu) (name "libretro-dolphin-emu") - (version (git-version "5.0" revision commit)) + (version (make-git-version "5.0" revision commit)) (source (origin (inherit (package-source dolphin-emu)) (method git-fetch) @@ -747,7 +747,7 @@ (define-public emulation-station (revision "1")) (package (name "emulation-station") - (version (git-version "2.0.1" revision commit)) + (version (make-git-version "2.0.1" revision commit)) (source (origin (method git-fetch) ; no tarball available (uri (git-reference @@ -783,7 +783,7 @@ (define-public higan (revision "0")) (package (name "higan") - (version (git-version "110" revision commit)) + (version (make-git-version "110" revision commit)) (source (origin (method git-fetch) @@ -1571,7 +1571,7 @@ (define-public mupen64plus-video-gliden64 (revision "0")) (package (name "mupen64plus-video-gliden64") - (version (git-version "4.0" revision commit)) + (version (make-git-version "4.0" revision commit)) (source (origin (method git-fetch) @@ -1676,7 +1676,7 @@ (define (make-libretro-beetle-psx name hw) (package (name name) ;; Use Mednafen core version as base. Defined in libretro_options.h:10 - (version (git-version "0.9.44.1" revision commit)) + (version (make-git-version "0.9.44.1" revision commit)) (source (origin (method git-fetch) @@ -1762,7 +1762,7 @@ (define-public libretro-mupen64plus-nx (revision "0")) (package (name "libretro-mupen64plus-nx") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1779,7 +1779,7 @@ (define-public libretro-mupen64plus-nx #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) (string-append "CXX=" #$(cxx-for-target)) - (string-append "GIT_VERSION=" #$version) + (string-append "GIT_VERSION=" #$(package-version this-package)) (string-append "PREFIX=" #$output) "LLE=1" "HAVE_THR_AL=1" ;for the angrylion video plugin @@ -1940,7 +1940,7 @@ (define-public libretro-slang-shaders (revision "0")) (package (name "libretro-slang-shaders") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -3461,7 +3461,7 @@ (define-public bsnes (revision "0")) (package (name "bsnes") - (version (git-version "115" revision commit)) + (version (make-git-version "115" revision commit)) (source (origin (method git-fetch) @@ -3510,7 +3510,7 @@ (define-public bsnes-hd (name "bsnes-hd") ;; As of 10.6, there only ever was beta releases -- treat these as the ;; stable releases for now. - (version (git-version "10.6" revision commit)) + (version (make-git-version "10.6" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3736,7 +3736,7 @@ (define-public libretro-beetle-gba (package (name "libretro-beetle-gba") ;; Use Mednafen core version as base. Defined in libretro.cpp:73. - (version (git-version "0.9.36" revision commit)) + (version (make-git-version "0.9.36" revision commit)) (source (origin (method git-fetch) @@ -3769,7 +3769,7 @@ (define-public libretro-bsnes-jg (package (inherit jg-bsnes) (name "libretro-bsnes-jg") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (inherit (package-source jg-bsnes)) (uri (git-reference @@ -3782,7 +3782,8 @@ (define-public libretro-bsnes-jg (arguments (substitute-keyword-arguments (package-arguments jg-bsnes) ((#:make-flags flags) - #~(cons* #$(string-append "GIT_VERSION=" version) + #~(cons* #$(string-append "GIT_VERSION=" + (package-version this-package)) (string-append "prefix=" #$output) #$flags)) ((#:phases phases) @@ -4223,7 +4224,7 @@ (define-public freedisksysrom (revision "0")) (package (name "freedisksysrom") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4325,7 +4326,7 @@ (define-public uxn (revision "1")) (package (name "uxn") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4454,7 +4455,7 @@ (define-public emu8051 (revision "1")) (package (name "emu8051") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 45b9b2a996a..d9fd0bf973e 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -193,7 +193,7 @@ (define-public aacircuit (revision "0")) (package (name "aacircuit") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -911,7 +911,7 @@ (define-public fritzing-parts (revision "0")) (package (name "fritzing-parts") - (version (git-version "0.9.6" revision commit)) + (version (make-git-version "0.9.6" revision commit)) (source (origin (method git-fetch) @@ -1081,7 +1081,7 @@ (define-public translate2geda (revision "2")) (package (name "translate2geda") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1128,7 +1128,7 @@ (define-public libfive (revision "5")) (package (name "libfive") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1235,7 +1235,7 @@ (define-public inspekt3d (revision "0")) (package (name "inspekt3d") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1506,7 +1506,7 @@ (define-public librseq (revision "2")) (package (name "librseq") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2060,7 +2060,7 @@ (define-public audmes (uri (git-reference (url "https://github.com/ben-strasser/fast-cpp-csv-parser") (commit commit))) - (file-name (git-file-name "csv.h" (git-version "0" "0" commit))) + (file-name (git-file-name "csv.h" (make-git-version "0" "0" commit))) (sha256 (base32 "1y7ads97gkrjg1jc532n8gmjry0qhqxginw1gq7b4lk9s0pyl540")))))) @@ -3014,7 +3014,7 @@ (define-public manifold (revision "0")) (package (name "manifold") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -3279,7 +3279,7 @@ (define-public openscad (revision "0")) (package (name "openscad") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -3308,7 +3308,7 @@ (define-public openscad "-DEXPERIMENTAL=ON" "-DENABLE_PYTHON=ON" (string-append "-DOPENSCAD_VERSION=" - #$version) + #$(package-version this-package)) (string-append "-DOPENSCAD_COMMIT=" #$commit) "-DENABLE_EGL=ON" @@ -3494,7 +3494,7 @@ (define-public ondsel-solver (package (name "ondsel-solver") ;; There's no tagged release - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -3739,7 +3739,7 @@ (define-public libarea (commit "8f8bac811c10f1f01fda0d742a18591f61dd76ee")) (package (name "libarea") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -4036,7 +4036,7 @@ (define-public pcb2gcode (revision "0")) (package (name "pcb2gcode") - (version (git-version "2.5.0" revision commit)) + (version (make-git-version "2.5.0" revision commit)) (source (origin (method git-fetch) @@ -4175,7 +4175,7 @@ (define-public syscall-intercept (revision "0")) (package (name "syscall-intercept") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -4488,7 +4488,7 @@ (define (fix-external-library cmake source) ("libigl-glad" ,(let* ((commit "ead2d21fd1d9f566d8f9a9ce99ddf85829258c7a") (revision "0") - (version (git-version "0.0.0" revision commit))) + (version (make-git-version "0.0.0" revision commit))) (origin (method git-fetch) (uri (git-reference @@ -4509,7 +4509,7 @@ (define (fix-external-library cmake source) ("libigl-predicates" ,(let* ((commit "50c2149e7a520d13cd10e9aeff698bd68edd5a4f") (revision "0") - (version (git-version "0.0.0" revision commit))) + (version (make-git-version "0.0.0" revision commit))) (origin (method git-fetch) (uri (git-reference @@ -4522,7 +4522,7 @@ (define (fix-external-library cmake source) ("libigl-tetgen" ,(let* ((commit "4f3bfba3997f20aa1f96cfaff604313a8c2c85b6") (revision "0") - (version (git-version "0.0.0" revision commit))) + (version (make-git-version "0.0.0" revision commit))) (origin (method git-fetch) (uri (git-reference @@ -4534,7 +4534,7 @@ (define (fix-external-library cmake source) ("libigl-comiso" ,(let* ((commit "562efe333edc8e649dc101469614f43378b1eb55") (revision "0") - (version (git-version "0.0.0" revision commit))) + (version (make-git-version "0.0.0" revision commit))) (origin (method git-fetch) (uri (git-reference @@ -4578,7 +4578,7 @@ (define-public prusa-libbgcode (revision "0")) (package (name "prusa-libbgcode") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -4875,7 +4875,7 @@ (define-public udis86 (revision "0")) (package (name "udis86") - (version (git-version "1.7.2" revision commit)) + (version (make-git-version "1.7.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5170,7 +5170,7 @@ (define-public xschem (revision "1")) (package (name "xschem") - (version (git-version "3.0.0" revision commit)) + (version (make-git-version "3.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5279,7 +5279,7 @@ (define-public candle (revision "1")) (package (name "candle") - (version (git-version "1.2b" revision commit)) + (version (make-git-version "1.2b" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5589,7 +5589,7 @@ (define-public orocos-kinematics-dynamics (revision "0")) (package (name "orocos-kinematics-dynamics") - (version (git-version "1.5.2" revision commit)) + (version (make-git-version "1.5.2" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 0e606085d4a..052285f0c28 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -294,7 +294,7 @@ (define-public erlang-yamerl (revision "0")) (package (name "erlang-yamerl") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/esolangs.scm b/gnu/packages/esolangs.scm index 2f84688f9ad..be897a4e882 100644 --- a/gnu/packages/esolangs.scm +++ b/gnu/packages/esolangs.scm @@ -68,7 +68,7 @@ (define-public lolcode-lci (revision "0")) (package (name "lolcode-lci") - (version (git-version "0.11.2" revision commit)) + (version (make-git-version "0.11.2" revision commit)) (source (origin (method git-fetch)