From patchwork Sat Jul 26 02:39:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43271 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 0027227BC4B; Sat, 26 Jul 2025 03:41:38 +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 9DA5D27BC49 for ; Sat, 26 Jul 2025 03:41:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUqh-00009n-CO; Fri, 25 Jul 2025 22:41:23 -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 1ufUqf-00008L-2q for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:21 -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 1ufUqe-0005Pz-Mr for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:20 -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:Date:From:To:In-Reply-To:References:Subject; bh=ZRGAsSpND4WIfJPBlX70PLZr5++lHyL5dAqYy36MTio=; b=T6FpnvI2XQtoZuNk9rvRTH5HYFSbE0hME6GF7laKl0UTSEA2yHpK14ZAaIt/+GTXXALzoWxjLukoxWxVYgnXqSIyQx9i0tF1Qzg3wn4oLAMo8j8IzNAzkWJxguRUmX6uxlgPRJWrtFEv6OP6c0CbWAVi5+lGWzevxtvaj8NxM1D2B9rIvDZsql0766a8D7Ixm97ltjsi66Gv52M/COrHADlMBDArmimdJv7Q4h9CloJcTt0RT2rkgi8XLCs2qfDgZTz3pvIaH8xpZQFnaFviaPuYv+tnmG5djf54OBFsI4EBkz7cuBuzUU8e/g8TrYwWTW93lJVOfPj4SmzI1KwJPQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqe-0007tB-4L for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:20 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 01/34] gnu: packages: Use git-file-name. References: <20250726023730.10578-1-ngraves@ngraves.fr> In-Reply-To: <20250726023730.10578-1-ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Jul 2025 02:41:19 +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.175349767030243 (code B ref 79099); Sat, 26 Jul 2025 02:41:19 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:41:10 +0000 Received: from localhost ([127.0.0.1]:38118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUqP-0007rK-A2 for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:41:09 -0400 Received: from 7.mo562.mail-out.ovh.net ([46.105.55.234]:59913) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpK-0007dr-W0 for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:30 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqc6lpPz20Bj; Sat, 26 Jul 2025 02:39:56 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79099@debbugs.gnu.org>; Sat, 26 Jul 2025 02:39:56 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.0.122]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqc5Pl2z1xpd; Sat, 26 Jul 2025 02:39:56 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 56136942E1A; Sat, 26 Jul 2025 02:39:56 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-111S005135cda44-186b-4f87-aae2-5dc1fee114ea, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:07 +0200 Message-ID: <20250726023951.11862-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.50.1 MIME-Version: 1.0 X-Ovh-Tracer-Id: 4610560118861587170 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpefgkeegudfghfetkeeukeelgfetvefgkeefueelheehgfekjefgvdegtdegteejvdenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhgohhoghhlvghsohhurhgtvgdrtghomhdpfhhrrghmrghgihhtrdhorhhgpdhkhihlvggrmhdrtghomhdpshhfrdhnvghtpdgsihhtsghutghkvghtrdhorhhgpdhgnhhomhgvrdhorhhgpdgsrhgrnhgthhgrsghlvgdrtghomhdpkhgvrhhnvghlrdhorhhgnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledtleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=ZRGAsSpND4WIfJPBlX70PLZr5++lHyL5dAqYy36MTio=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497597; v=1; b=AxDBitbe4i7dHn8EPksFIqmL+y43LG483Ess4QgfkGcJC3NsVUSaY5ijgzsMD4xNc6eI2t+E YnmwHbr4BArzu4yYHeFnkc6Ncck/td0JSvkFweh+RVDD4SbsimuhcAOjg/scvEP85Zmr9hegtBa 3Gpmcyo0dYeofB7WnMsBUsML/MZ0t8CZb7u8GRK9CDOxA7gdK5zaWuho1iWMZmot34FJhFJgZK6 O/DAW9hVmWM23aySrK5OWZfoxWcdEWF4nlS8WzS6pqbJxaGwStv8SXkvSkr8CbAlFh+RVYI++1Z ojxM6okD7F7uEBRxVCtmb9CHgXkVS5KXaEqcB0cRQlYGw== 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 This is a prerequisite for the git-version proposition rewrite. I ran: find gnu/packages/ -type f -name "*.scm" -exec sed -i 's/(file-name (string-append name "-" version "-checkout"))/(file-name (git-file-name name version))/g' {} + Then I discarded changes when it was not a git-fetch. I don't think it's good idea to call git-file-name for vcs/svn/hg/bzr. * gnu/packages/admin.scm (novena-eeprom) * gnu/packages/algebra.scm (java-la4j) * gnu/packages/audio.scm (filteraudio, noise-repellent) * gnu/packages/bioinformatics.scm (java-htsjdk-latest, java-htsjdk-2.10.1, newick-utils, smithlab-cpp, libstadenio-for-salmon, java-forester, java-biojava-core, java-biojava-core-4.0, sjcount) * gnu/packages/bootloaders.scm (vboot-utils) * gnu/packages/databases.scm (guile-wiredtiger) * gnu/packages/debug.scm (seer-gdb) * gnu/packages/emacs-xyz.scm (emacs-piem) * gnu/packages/embedded.scm (openocd, binutils-vc4, ebusd) * gnu/packages/emulators.scm (exomizer, cc65) * gnu/packages/engineering.scm (openctm) * gnu/packages/fonts.scm (font-blackfoundry-inria) * gnu/packages/gnome.scm (blueprint-compiler, blueprint-compiler-0.4, byzanz) * gnu/packages/graph.scm (r-rbiofabric) * gnu/packages/graphics.scm (brdf-explorer) * gnu/packages/guile.scm (guile-gdbm-ffi, guile-sqlite3) * gnu/packages/idris.scm (idris-bifunctors) * gnu/packages/java.scm (jbr11, jbr17, jbr21, java-testng, java-jeromq): Use git-file-name. * gnu/packages/javascript.scm (js-json2) * gnu/packages/julia.scm (libwhich) * gnu/packages/kodi.scm (crossguid, libdvdnav/kodi, libdvdread/kodi, libdvdcss/kodi, kodi-cli) * gnu/packages/linux.scm (edac-utils) * gnu/packages/machine-learning.scm (fann) * gnu/packages/mail.scm (notmuch-addrlookup-c, dovecot-libsodium-plugin, esmtp) * gnu/packages/maths.scm (reducelcs, minisat) * gnu/packages/messaging.scm (libtoxcore, utox, python-librecaptcha, python-harmony) * gnu/packages/music.scm (libpd, jack-capture, gx-guvnor-lv2, gx-overdriver-lv2, gx-tone-mender-lv2, gx-push-pull-lv2, gx-suppa-tone-bender-lv2, gx-hyperion-lv2, gx-voodoo-fuzz-lv2, gx-super-fuzz-lv2, gx-vintage-fuzz-master-lv2, gx-slow-gear-lv2, gx-switchless-wah-lv2, mod-utilities, sonivox-eas) * gnu/packages/package-management.scm (bffe, guix-build-coordinator, nar-herder) * gnu/packages/pascal.scm (lazarus) * gnu/packages/pumpio.scm (pumpa) * gnu/packages/robotics.scm (enki, aseba) * gnu/packages/ruby-xyz.scm (ruby-minitar, ruby-tdiff, ruby-nokogiri-diff): Use git-file-name. * gnu/packages/scheme.scm (scheme48-rx, stalin, femtolisp) * gnu/packages/selinux.scm (python-setools) * gnu/packages/shells.scm (linenoise, s-shell) * gnu/packages/shellutils.scm (tran) * gnu/packages/sync.scm (casync) * gnu/packages/terminals.scm (cool-retro-term) * gnu/packages/version-control.scm (myrepos, grokmirror) * gnu/packages/vim.scm (vim-neosnippet-snippets, vim-neosnippet, vim-luna, vim-context-filetype, vim-commentary, vim-guile, vim-dhall-vim, vim-mundo, vim-zig, vim-plantuml-syntax) * gnu/packages/vulkan.scm (vkd3d) * gnu/packages/wm.scm (python-i3-py, quickswitch-i3, fbautostart): Use git-file-name. * gnu/packages/xdisorg.scm (xssproxy, xftwidth) * gnu/packages/zile.scm (zile-on-guile): Use git-file-name when equivalent. --- gnu/packages/admin.scm | 2 +- gnu/packages/algebra.scm | 2 +- gnu/packages/audio.scm | 4 ++-- gnu/packages/bioinformatics.scm | 18 ++++++++--------- gnu/packages/bootloaders.scm | 2 +- gnu/packages/databases.scm | 2 +- gnu/packages/debug.scm | 2 +- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/embedded.scm | 6 +++--- gnu/packages/emulators.scm | 4 ++-- gnu/packages/engineering.scm | 2 +- gnu/packages/fonts.scm | 2 +- gnu/packages/gnome.scm | 6 +++--- gnu/packages/graph.scm | 2 +- gnu/packages/graphics.scm | 2 +- gnu/packages/guile.scm | 4 ++-- gnu/packages/idris.scm | 2 +- gnu/packages/java.scm | 10 +++++----- gnu/packages/javascript.scm | 2 +- gnu/packages/julia.scm | 2 +- gnu/packages/kodi.scm | 10 +++++----- gnu/packages/linux.scm | 2 +- gnu/packages/machine-learning.scm | 2 +- gnu/packages/mail.scm | 6 +++--- gnu/packages/maths.scm | 4 ++-- gnu/packages/messaging.scm | 8 ++++---- gnu/packages/music.scm | 30 ++++++++++++++--------------- gnu/packages/package-management.scm | 6 +++--- gnu/packages/pascal.scm | 2 +- gnu/packages/pumpio.scm | 2 +- gnu/packages/robotics.scm | 4 ++-- gnu/packages/ruby-xyz.scm | 6 +++--- gnu/packages/scheme.scm | 6 +++--- gnu/packages/selinux.scm | 2 +- gnu/packages/shells.scm | 4 ++-- gnu/packages/shellutils.scm | 2 +- gnu/packages/sync.scm | 2 +- gnu/packages/terminals.scm | 2 +- gnu/packages/version-control.scm | 4 ++-- gnu/packages/vim.scm | 20 +++++++++---------- gnu/packages/vulkan.scm | 2 +- gnu/packages/wm.scm | 6 +++--- gnu/packages/xdisorg.scm | 4 ++-- gnu/packages/zile.scm | 2 +- 44 files changed, 108 insertions(+), 108 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 0c0139e10f4..cc57b1207ec 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -5704,7 +5704,7 @@ (define-public novena-eeprom (uri (git-reference (url "https://github.com/xobs/novena-eeprom.git") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "00pd71mg0g20v0820ggp3ghf9nyj5s4wavaz9mkmrmsr91hcnf7i")))) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index ae90542fd76..fca970627ee 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -883,7 +883,7 @@ (define-public java-la4j (uri (git-reference (url "https://github.com/vkostyukov/la4j") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1qir8dr978cfvz9k12m2kbdwpyf6cqdf1d0ilb7lnkhbgq5i53w3")))) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index bbfeff0cec4..e5d68b5c4e7 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -5644,7 +5644,7 @@ (define-public filteraudio (uri (git-reference (url "https://github.com/irungentoo/filter_audio") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0hbb290n3wb23f2k692a6bhc23nnqmxqi9sc9j15pnya8wifw64g")))) @@ -5880,7 +5880,7 @@ (define-public noise-repellent (uri (git-reference (url "https://github.com/lucianodato/noise-repellent") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0hb89x9i2knzan46q4nwscf5zmnb2nwf4w13xl2c0y1mx1ls1mwl")))) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c92a5c5298f..0e8f05c8fc8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8888,7 +8888,7 @@ (define-public java-htsjdk-latest (uri (git-reference (url "https://github.com/samtools/htsjdk") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1lmya1fdjy03mz6zmdmd86j9v9vfhqb3952mqq075navx1i6g4bc")))) @@ -8932,7 +8932,7 @@ (define-public java-htsjdk-2.10.1 (uri (git-reference (url "https://github.com/samtools/htsjdk") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1kxh7slm2pm3x9p6jxa1wqsq9a31dhiiflhxnxqcisan4k3rwia2")))) @@ -10531,7 +10531,7 @@ (define-public newick-utils (uri (git-reference (url "https://github.com/tjunier/newick_utils") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1hkw21rq1mwf7xp0rmbb2gqc0i6p11108m69i7mr7xcjl268pxnb")))) @@ -11786,7 +11786,7 @@ (define-public smithlab-cpp (uri (git-reference (url "https://github.com/smithlabcode/smithlab_cpp") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0d476lmj312xk77kr9fzrv7z1bv96yfyx0w7y62ycmnfbx32ll74")))) @@ -17027,7 +17027,7 @@ (define libstadenio-for-salmon (uri (git-reference (url "https://github.com/COMBINE-lab/staden-io_lib") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1x8kxxqxl892vwfbprlbyfwkkv7c34ggkc94892x9x0g37x5nbwx")))) @@ -17584,7 +17584,7 @@ (define-public java-forester (uri (git-reference (url "https://github.com/cmzmasek/forester") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0vxavc1yrf84yrnf20dq26hi0lglidk8d382xrxsy4qmlbjd276z")) @@ -17751,7 +17751,7 @@ (define-public java-biojava-core (uri (git-reference (url "https://github.com/biojava/biojava") (commit (string-append "biojava-" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1bvryh2bpsvash8ln79cmc9sqm8qw72hz4xzwqxcrjm8ssxszhqk")))) @@ -17882,7 +17882,7 @@ (define-public java-biojava-core-4.0 (uri (git-reference (url "https://github.com/biojava/biojava") (commit (string-append "biojava-" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "13675f6y9aqi7bi2lk3s1z7a22ynccjiqwa8izh7p97xi9wsfmd8")))))) @@ -18650,7 +18650,7 @@ (define-public sjcount (uri (git-reference (url "https://github.com/pervouchine/sjcount-full") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0gdgj35j249f04rqgq8ymcc1xg1vi9kzbajnjqpaq2wpbh8bl234")))) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index c4b721c9f56..1321b55df49 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1788,7 +1788,7 @@ (define-public vboot-utils (url (string-append "https://chromium.googlesource.com" "/chromiumos/platform/vboot_reference")) (commit (string-append "release-" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0h0m3l69vp9dr6xrs1p6y7ilkq3jq8jraw2z20kqfv7lvc9l1lxj")) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 5deb363095a..e66b640ce79 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3426,7 +3426,7 @@ (define-public guile-wiredtiger (uri (git-reference (url "https://framagit.org/a-guile-mind/guile-wiredtiger.git") (commit "340ad4bc2ff4dcc6216a2f5c6f9172ca320ac66b"))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "15j36bvxxzil7qpwlmh1rffqpva3ynvrcpqhhqbj2c9208ayz595")))) diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index a0345d82784..f1bda7a1ea7 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -990,7 +990,7 @@ (define-public seer-gdb (uri (git-reference (url "https://github.com/epasveer/seer.git") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0jdvyg2jab1pvf36pvkyrfsg2wyy8zp1qx0v2ksclgrnr1hja6k6")))) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3c9a3c195c5..0c7532a41b4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10855,7 +10855,7 @@ (define-public emacs-piem (uri (git-reference (url "https://git.kyleam.com/piem") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0smdb1iph2q1xvxix5c93llckcxh7kmhg6pxgyrm88j736m4l16q")))) (build-system emacs-build-system) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 999ac1875e0..73a8797aabe 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -982,7 +982,7 @@ (define-public openocd (uri (git-reference (url "https://git.code.sf.net/p/openocd/code") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "09wb11zlmrw6rx1bql3kafgi3ilzp9mhvb6j6rql216by06csing")))) @@ -1439,7 +1439,7 @@ (define-public binutils-vc4 (uri (git-reference (url "https://github.com/puppeh/binutils-vc4") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1kdrz6fki55lm15rwwamn74fnqpy0zlafsida2zymk76n3656c63")))) @@ -1870,7 +1870,7 @@ (define-public ebusd (uri (git-reference (url "https://github.com/john30/ebusd") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1k85vzjhhya7r41nid5yylr7jyvl09455hpny6wrjkipz68icgdf")))) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 1f67e8cd63c..08fdb5f375d 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -4108,7 +4108,7 @@ (define-public exomizer (uri (git-reference (url "https://bitbucket.org/magli143/exomizer.git") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "04795l75nlbz0g5gp1xx8kiwbrm5pv5pj24ja02cnan6mglj7j0w")))) @@ -4293,7 +4293,7 @@ (define-public cc65 (uri (git-reference (url "https://github.com/cc65/cc65.git") (commit (string-append "V" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "01a15yvs455qp20hri2pbg2wqvcip0d50kb7dibi9427hqk9cnj4")))) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 624c092a82e..45b9b2a996a 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3828,7 +3828,7 @@ (define-public openctm (uri (svn-reference (url "https://svn.code.sf.net/p/openctm/code/trunk") (revision revision))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "01wb70m48xh5gwhv60a5brv4sxl0i0rh038w32cgnlxn5x86s9f1")))) (build-system gnu-build-system) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 53707f751c4..82d4d044bb6 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2870,7 +2870,7 @@ (define-public font-blackfoundry-inria (sha256 (base32 "06775y99lyh6hj5hzvrx56iybdck8a8xfqkipqd5c4cldg0a9hh8")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) ;; XXX: There are .ufo directories (the "source") so in theory we should ;; be able to rebuild TTF and OTF files with FontForge. Unfortunately a ;; command like: diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3a02945f114..3be13944cad 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3406,7 +3406,7 @@ (define-public blueprint-compiler (url "https://gitlab.gnome.org/jwestman/blueprint-compiler") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1y40kf9yfrjlfr5ax27j7ksv27fsznl7jhvvkzbfifdymjv10wqn")))) @@ -3459,7 +3459,7 @@ (define-public blueprint-compiler-0.4 (url "https://gitlab.gnome.org/jwestman/blueprint-compiler") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0hj7f4xhwjc4x32r3lswwclbw37fw3spy806g4plkmym25hz4ydy")))) @@ -10616,7 +10616,7 @@ (define-public byzanz (uri (git-reference (url "https://git.gnome.org/browse/byzanz") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1l60myzxf9cav27v5v3nsijlslz9r7ip6d5kiirfpkf9k0w26hz3")))) diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 2549889a11a..d396516bf4e 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -288,7 +288,7 @@ (define-public r-rbiofabric (uri (git-reference (url "https://github.com/wjrl/RBioFabric") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1yahqrcrqpbcywv73y9rlmyz8apdnp08afialibrr93ch0p06f8z")))) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 25fe0729364..1cb48fe21d3 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1995,7 +1995,7 @@ (define-public brdf-explorer (sha256 (base32 "06vzbiajzbi2xl8jlff5d45bc9wd68i3jdndfab1f3jgfrd8bsgx")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 7e82909151a..57cf6a365de 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -727,7 +727,7 @@ (define-public guile-gdbm-ffi (uri (git-reference (url "https://github.com/ijp/guile-gdbm") (commit "fa1d5b6231d0e4d096687b378c025f2148c5f246"))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (patches (search-patches "guile-gdbm-ffi-support-gdbm-1.14.patch")) (sha256 @@ -781,7 +781,7 @@ (define-public guile-sqlite3 (sha256 (base32 "0qqygvlpz63phdi2p5p8ncp80dci230qfa3pwds8yfxqqaablmhb")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs (list autoconf automake guile-3.0 pkg-config)) (inputs (list guile-3.0 sqlite)) diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index 85fb6cc2d2c..1837a8a8152 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -242,7 +242,7 @@ (define-public idris-bifunctors (uri (git-reference (url "https://github.com/HuwCampbell/Idris-Bifunctors") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "02vbsd3rmgnj0l1qq787709qcxjbr9890cbad4ykn27f77jk81h4")))) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 54a9aa9ba0b..c24bb0bdd87 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1864,7 +1864,7 @@ (define-public jbr11 (uri (git-reference (url "https://github.com/JetBrains/JetBrainsRuntime.git") (commit (string-append "jb" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1fnrdx0wb21ghm6jczjzk7b9fz9hbdzd62512xhwpzvca57v2z09")))) @@ -1897,7 +1897,7 @@ (define-public jbr17 (uri (git-reference (url "https://github.com/JetBrains/JetBrainsRuntime.git") (commit (string-append "jbr-release-" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "5bbf5z8faf9sdkig2fwkj06hb7hs9s3bpzzvbqn2i75lbwqk3bln")) @@ -1931,7 +1931,7 @@ (define-public jbr21 (uri (git-reference (url "https://github.com/JetBrains/JetBrainsRuntime.git") (commit (string-append "jbr-release-" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "03xkghbp0b1czc2ags9n8ilprf9sy4bhsma0wf8xfapqn6d2sfyd")) @@ -11089,7 +11089,7 @@ (define-public java-testng (uri (git-reference (url "https://github.com/cbeust/testng") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0y6vq30i5g276kw0v2bhbvci22ijg7ax49ap2611yqlhbs4d6dqv")))) @@ -11878,7 +11878,7 @@ (define-public java-jeromq (uri (git-reference (url "https://github.com/zeromq/jeromq") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1gxkp7lv2ahymgrqdw94ncq54bmp4m4sw5m1x9gkp7l5bxn0xsyj")) diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 9ea7e815e92..29efcfa2e35 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -515,7 +515,7 @@ (define-public js-json2 (uri (git-reference (url "https://github.com/douglascrockford/JSON-js") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1fvb6b2y5sd3sqdgcj683sdxcbxdii34q0ysc9wg0dq1sy81l11v")))) diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 22457dd3f41..370ceb077f6 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -109,7 +109,7 @@ (define-public libwhich (url "https://github.com/vtjnash/libwhich") ;; fixes linux-vdso.so related tests (commit "87cffe10080c98e7b5786c5166e420bf1ada1d41"))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1bpa0fcqpa3ai3hm8mz0p13bf76fsq53wsfcx5qw302zh22108xr")))) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 6e2c2c9a5ec..89f6273f618 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -102,7 +102,7 @@ (define-public crossguid (uri (git-reference (url "https://github.com/graeme-hill/crossguid") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1x3jc4q6di79x3nlx36394s03yv1j1j5k0x6zljyk5iq78y4mfyz")))) @@ -138,7 +138,7 @@ (define libdvdnav/kodi (uri (git-reference (url "https://github.com/xbmc/libdvdnav") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "190wp4czs4594496vc6ifswg24wijd7c1z0whdkjdaf26rff5xha")))) @@ -173,7 +173,7 @@ (define libdvdread/kodi (uri (git-reference (url "https://github.com/xbmc/libdvdread") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0by70r55575xa9rl8dp8594lxhm475splslvafskqid30n9cpq8h")))) @@ -208,7 +208,7 @@ (define libdvdcss/kodi (uri (git-reference (url "https://github.com/xbmc/libdvdcss") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1xvs3vhdjjrm019rk907bd4lw7jh3wb7rh88zqd3xv8iq3apbcg6")))) @@ -533,7 +533,7 @@ (define-public kodi-cli (sha256 (base32 "1xjhasc5gngfxpr1dlzy6q24w0wpdfjx12p43fanjppxw4i49n5p")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system trivial-build-system) (inputs (list bash curl mps-youtube)) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 727269a7720..8a6538a7ee4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -12028,7 +12028,7 @@ (define-public edac-utils (uri (git-reference (url "https://github.com/grondo/edac-utils.git") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "04j686m58wsnyy5di7rz0sw9jahlm4ziwxjmgs31pjb87vzw3xgp")))) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 7ad25e80c65..aa1f88e8137 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -287,7 +287,7 @@ (define-public fann (uri (git-reference (url "https://github.com/libfann/fann") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0ibwpfrjs6q2lijs8slxjgzb2llcl6rk3v2ski4r6215g5jjhg3x")))) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 68611d32f22..08c551d86a2 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1634,7 +1634,7 @@ (define-public notmuch-addrlookup-c (uri (git-reference (url "https://github.com/aperezdc/notmuch-addrlookup-c") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1j3zdx161i1x4w0nic14ix5i8hd501rb31daf8api0k8855sx4rc")))) @@ -2400,7 +2400,7 @@ (define-public dovecot-libsodium-plugin (uri (git-reference (url "https://github.com/LuckyFellow/dovecot-libsodium-plugin") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "13h07l7xy713zchnj2p9fhvq7fdl4zy1ai94li3ygkqjjj8hrgas")))) @@ -2734,7 +2734,7 @@ (define-public esmtp (sha256 (base32 "1ay282rrl92h0m0m8z5zzjnwiiagi7c78aq2qvhia5mw7prwfyw2")) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (patches (search-patches "esmtp-add-lesmtp.patch")))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c6584330e63..5be65120279 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -8126,7 +8126,7 @@ (define-public reducelcs (uri (git-reference (url "https://github.com/gdv/Reduce-Expand-for-LCS") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1rllzcfwc042c336mhq262a8ha90x6afq30kvk60r7i4761j4yjm")))) @@ -9746,7 +9746,7 @@ (define-public minisat (uri (git-reference (url "https://github.com/niklasso/minisat") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "091hf3qkm197s5r7xcr3m07xsdwyz2rqk1hc9kj0hn13imz09irq")) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 4e120c3fad5..0ac125442f1 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1746,7 +1746,7 @@ (define-public libtoxcore (uri (git-reference (url "https://github.com/irungentoo/toxcore") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "11lqra4yd7v293cp286ynff5lqz1pprzg8vn3wq6vryj08g88zqb")))) @@ -1809,7 +1809,7 @@ (define-public utox (url "https://github.com/uTox/uTox") (commit (string-append "v" version)) (recursive? #t))) ;; Needed for 'minini' git submodule. - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "01rvlf94d4rkrygnnjak3cg16hrrqyi1rn9nx65y17qk2nbyh68g")))) @@ -3620,7 +3620,7 @@ (define-public python-librecaptcha (uri (git-reference (url "https://github.com/taylordotfish/librecaptcha") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0r35ws6vdf31j01kpacvpjplddm254r0cgy0npmhgnfxd5kpjf3s")))) @@ -3641,7 +3641,7 @@ (define-public python-harmony (uri (git-reference (url "https://github.com/taylordotfish/harmony.git") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1bm9xcnzpnpj6rlhbrnl2abwclzl7ivgh1vb5644y9mnhcs489js")))) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index d11099d0c5f..680f8d488e8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3127,7 +3127,7 @@ (define-public libpd (url "https://github.com/libpd/libpd") (commit version) (recursive? #t))) ; for the 'pure-data' submodule - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1bc1bqwviqddhh44cp2y2v2i6dnj92hwx8ld7bwcxgyp2zmlhiaz")))) @@ -3625,7 +3625,7 @@ (define-public jack-capture (uri (git-reference (url "https://github.com/kmatheussen/jack_capture") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0jcqky96q8xgya6wqv1p8pj9fkf2wh7ynl67ah7x5bn3basgfclf")))) @@ -4715,7 +4715,7 @@ (define-public gx-guvnor-lv2 (uri (git-reference (url "https://github.com/brummer10/GxGuvnor.lv2") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1wa5070j40p7f0b3kr259pzm99xb6cf2badr2capayjvgayd6gnm")))) @@ -4797,7 +4797,7 @@ (define-public gx-overdriver-lv2 (sha256 (base32 "13j614jh525fbkby79nnzwj0z1ac0c9wclyn5pfqvkmx6a7j24r8")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (home-page "https://github.com/brummer10/GxOverDriver.lv2") (synopsis "Overdrive effect with level and tone control") (description "This package provides the LV2 plugin \"GxOverDriver\", an @@ -4817,7 +4817,7 @@ (define-public gx-tone-mender-lv2 (sha256 (base32 "07qdcfsvv2vdnfnjh91pfgvjdcs5y91nvwfm8c0z8fp6b4bk7a9q")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (home-page "https://github.com/brummer10/GxToneMender.lv2") (synopsis "Clean boost with a 3-knob tonestack") (description "This package provides the LV2 plugin \"GxToneMender\", a @@ -4837,7 +4837,7 @@ (define-public gx-push-pull-lv2 (sha256 (base32 "12f5hwck2irph0gjbj8xy8jqcqdwb8l1hlwf29k0clz52h1jhb5q")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (home-page "https://github.com/brummer10/GxPushPull.lv2") (synopsis "Octave up push pull transistor fuzz simulation") (description "This package provides the LV2 plugin \"GxPushPull\", a @@ -4852,7 +4852,7 @@ (define-public gx-suppa-tone-bender-lv2 (uri (git-reference (url "https://github.com/brummer10/GxSuppaToneBender.lv2") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "01x6bjmllkmvxfzc5xwdix7w021j26js71awv728cxsmkxgqw0zy")))) @@ -4891,7 +4891,7 @@ (define-public gx-hyperion-lv2 (uri (git-reference (url "https://github.com/brummer10/GxHyperion.lv2") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1vx79s6s9if117y2g0ppdja2sv2wcny6xcfl3j1z4cipahnildxf")))) @@ -4909,7 +4909,7 @@ (define-public gx-voodoo-fuzz-lv2 (uri (git-reference (url "https://github.com/brummer10/GxVoodoFuzz.lv2") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1v0scphivri1fk4hl20j13f92i48mnx1zsil4hgnadsmm4nsfw43")))) @@ -4929,7 +4929,7 @@ (define-public gx-super-fuzz-lv2 (uri (git-reference (url "https://github.com/brummer10/GxSuperFuzz.lv2") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1jlljd9hlgfflbiizq47lv1xbbgjyx3v835mf24zmh1q5zsw4np4")))) @@ -4949,7 +4949,7 @@ (define-public gx-vintage-fuzz-master-lv2 (uri (git-reference (url "https://github.com/brummer10/GxVintageFuzzMaster.lv2") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "02jb211z8rw2qr5r1z5mdxlqgiw6cbc319xpqplvn6k21c59mskv")))) @@ -4972,7 +4972,7 @@ (define-public gx-slow-gear-lv2 (sha256 (base32 "141mz69zkhk3lm54bb6wgpnghb92zm1ig7fv07240cmhydqji1q1")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (home-page "https://github.com/brummer10/GxSlowGear.lv2") (synopsis "Slow gear audio effect") (description "This package provides the LV2 plugin \"GxSlowGear\", a @@ -4992,7 +4992,7 @@ (define-public gx-switchless-wah-lv2 (sha256 (base32 "04jqfpncmrrqn34p21w4v9m2x5a5wsqwbm4f3byxvq4vcibwxzk2")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (home-page "https://github.com/brummer10/GxSwitchlessWah.lv2") (synopsis "Wah emulation with switchless activation") (description "This package provides the LV2 plugin \"GxSwitchlessWah\", @@ -5038,7 +5038,7 @@ (define-public mod-utilities (uri (git-reference (url "https://github.com/moddevices/mod-utilities") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1v55zmzmlg0ka7341x5lsvb44amy17vk27s669ps1basd1bk5s5v")))) @@ -6013,7 +6013,7 @@ (define-public sonivox-eas (uri (git-reference (url "https://github.com/pedrolcl/Linux-SonivoxEas") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1y67bi2vcwb1avwz18i41q85cmqx9svwx4q3kpmh951l49s9k8vz")))) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 30af5130cda..4ef1cd3ebbb 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1089,7 +1089,7 @@ (define-public bffe (sha256 (base32 "0h1nzlj6k9yhhsc1an72876p19yf8kszs2h7xww5ldcjs8vwxn9c")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs (list pkg-config @@ -1690,7 +1690,7 @@ (define-public guix-build-coordinator (sha256 (base32 "1ffa3bhg4nzif4gk26gydnw4jvm1gfidh3b6r1i36kydy3ms19fw")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments (list @@ -1945,7 +1945,7 @@ (define-public nar-herder (sha256 (base32 "0wd8nj2ji28jvs4wgshhbipxballpfmmwbxx82nk4bypbdpdwd5a")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/pascal.scm b/gnu/packages/pascal.scm index 58b627c4149..5329b9e1179 100644 --- a/gnu/packages/pascal.scm +++ b/gnu/packages/pascal.scm @@ -332,7 +332,7 @@ (define-public lazarus (string-join (string-split version #\.) "_"))))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0hpk6fxmy1h1q0df41jg1vnp8g8vynrg5v5ad43lv229nizfs3wj")))) diff --git a/gnu/packages/pumpio.scm b/gnu/packages/pumpio.scm index dc5e1ec7bb1..c4b70476d1a 100644 --- a/gnu/packages/pumpio.scm +++ b/gnu/packages/pumpio.scm @@ -40,7 +40,7 @@ (define-public pumpa (sha256 (base32 "14072vis539zjgryjr5a77j2cprxii5znyg3p01qbb11lijk9nj7")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm index f95aa2b3255..e8f6e1dee69 100644 --- a/gnu/packages/robotics.scm +++ b/gnu/packages/robotics.scm @@ -48,7 +48,7 @@ (define-public enki (sha256 (base32 "1d1901zzsfml97hb4mb3ah3ab1bk4kh7bn6m7xrj1rv0gk9wkhq7")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) @@ -88,7 +88,7 @@ (define-public aseba (sha256 (base32 "0j31lmc9f0ksvkh0md2fgsz92hcsrwnrqqcynamizs2ah8iwlqi5")) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet ;; Add missing Qt5::Network. diff --git a/gnu/packages/ruby-xyz.scm b/gnu/packages/ruby-xyz.scm index 1a2cd817fd8..b893d444bdd 100644 --- a/gnu/packages/ruby-xyz.scm +++ b/gnu/packages/ruby-xyz.scm @@ -6084,7 +6084,7 @@ (define-public ruby-minitar (uri (git-reference (url "https://github.com/halostatue/minitar") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1iywfx07jgjqcmixzkxk9zdwfmij1fyg1z2jlwzj15cj7s99qlfv")))) @@ -7993,7 +7993,7 @@ (define-public ruby-tdiff (uri (git-reference (url "https://github.com/postmodern/tdiff") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0n3gq8rx49f7ln6zqlshqfg2mgqyy30rsdjlnki5mv307ykc7ad4")))) @@ -8018,7 +8018,7 @@ (define-public ruby-nokogiri-diff (uri (git-reference (url "https://github.com/postmodern/nokogiri-diff") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1ah2sfjh9n1p0ln2wkqzfl448ml7j4zfy6dhp1qgzq2m41php6rf")))) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 2807b317070..81b948f8cf4 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -759,7 +759,7 @@ (define-public scheme48-rx (sha256 (base32 "1bvriavxw5kf2izjbil3999vr983vkk2xplfpinafr86m40b2cci")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -1014,7 +1014,7 @@ (define-public stalin (uri (git-reference (url "https://github.com/barak/stalin") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "15a5gxj9v7jqlgkg0543gdflw0rbrir7fj5zgifnb33m074wiyhn")) @@ -1125,7 +1125,7 @@ (define-public femtolisp (uri (git-reference (url "https://github.com/JeffBezanson/femtolisp") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1fcyiqlqn27nd4wxi27km8mhmlzpzzsxzpwsl1bxbmhraq468njw")))) diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index c72dfa007ba..6a68ce56724 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -310,7 +310,7 @@ (define-public python-setools (uri (git-reference (url "https://github.com/SELinuxProject/setools") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1qvd5j6zwq4fmlahg45swjplhif2z89x7s6pnp07gvcp2fbqdsh5")))) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 2a1fbe0a6cb..84e19254ad9 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -714,7 +714,7 @@ (define-public linenoise (uri (git-reference (url "https://github.com/antirez/linenoise") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "102gwq6bzjq2b1lf55wrpgym58yfhry56hkajbj339m0bs1xijhs")))) @@ -762,7 +762,7 @@ (define-public s-shell (uri (git-reference (url "https://github.com/rain-1/s") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0qiny71ww5nhzy4mnc8652hn0mlxyb67h333gbdxp4j4qxsi13q4")))) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 040a9147264..4d611e7d969 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -736,7 +736,7 @@ (define-public tran (uri (git-reference (url "https://github.com/kilobyte/tran") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1kzr3lfhi5f8wpwjzrzlwkxjv9rasdr9ndjdns9kd16vsh0gl2rd")))) (build-system gnu-build-system) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 6bb754a079a..568f2e3de06 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -530,7 +530,7 @@ (define-public casync (sha256 (base32 "139g82rkwv1kzss6crfmw3p01xnyjzz66b1ckprpbfncxb24047w")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system meson-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index aa8aee0df29..0579ddb22af 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -698,7 +698,7 @@ (define-public cool-retro-term (version "1.2.0") (source (origin (method git-fetch) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (uri (git-reference (url (string-append "https://github.com/Swordfish90/" name)) (commit version) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 3b96d4f15e0..06d042a519d 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3542,7 +3542,7 @@ (define-public myrepos (uri (git-reference (url "git://myrepos.branchable.com/myrepos") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0jphw61plm8cgklja6hs639xhdvxgvjwbr6jpvjwpp7hc5gmhms5")))) (build-system gnu-build-system) @@ -3592,7 +3592,7 @@ (define-public grokmirror (url (string-append "https://git.kernel.org/pub/scm/" "utils/grokmirror/grokmirror.git")) (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0c6nnfzzyl247r1dcjnsyx16d34nyra9ikjjhi0xzlrbiwnb0w32")))) (build-system python-build-system) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 89a001b51cd..ccd950d9c91 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -357,7 +357,7 @@ (define-public vim-neosnippet-snippets (uri (git-reference (url "https://github.com/Shougo/neosnippet-snippets") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "151wpvbj6jb9jdkbhj3b77f5sq7y328spvwfbqyj1y32rg4ifmc6")))) @@ -385,7 +385,7 @@ (define-public vim-neosnippet (uri (git-reference (url "https://github.com/Shougo/neosnippet.vim/") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0k80syscmpnj38ks1fq02ds59g0r4jlg9ll7z4qc048mgi35alw5")))) @@ -441,7 +441,7 @@ (define-public vim-luna (uri (git-reference (url "https://github.com/notpratheek/vim-luna") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0ka3qbhsh8lix1vyj4678j7dnchkd8khhirrnn3aylxxf8fpqyg8")))) @@ -467,7 +467,7 @@ (define-public vim-context-filetype (uri (git-reference (url "https://github.com/Shougo/context_filetype.vim") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0alvrfhmd91zkd9h83s8wvgyq4iakcf6rybsyjd369qbgpcqky89")))) @@ -1671,7 +1671,7 @@ (define-public vim-commentary (uri (git-reference (url "https://github.com/tpope/vim-commentary") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "09kzc89iwkgsi4wvjxk56fis462kkz5chcl9sl4hdbmpa1f41wy0")))) (build-system vim-build-system) @@ -1701,7 +1701,7 @@ (define-public vim-guile (uri (git-reference (url "https://github.com/HiPhish/guile.vim") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1pqlhssdnpd8ngjc5bssma7ddjhffvh8hj67gchmyyxr5jfxwdq9")))) (build-system vim-build-system) @@ -1729,7 +1729,7 @@ (define-public vim-dhall-vim (uri (git-reference (url "https://github.com/vmchale/dhall-vim") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0lwna4kcq7davfvh3535n8wl9jxkjm7cg6jgpisd17kvagihh8qw")))) (build-system vim-build-system) @@ -1755,7 +1755,7 @@ (define-public vim-mundo (uri (git-reference (url "https://github.com/simnalamburt/vim-mundo") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1dwrarcxrh8in78igm036lpvyww60c93vmmlk8h054i3v2p8vv59")))) (build-system vim-build-system) @@ -1779,7 +1779,7 @@ (define-public vim-zig (uri (git-reference (url "https://github.com/ziglang/zig.vim") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1nxwjyn3ps3c2abffai5cql3czl4kah4cin0g30damy1k99ypncb")))) (build-system vim-build-system) @@ -1805,7 +1805,7 @@ (define-public vim-plantuml-syntax (uri (git-reference (url "https://github.com/aklt/plantuml-syntax") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0d2frv6knkj4bjavq2c2kx8qdnmcq0d8l04a5z7bpqwkmrrhd31f")))) (build-system vim-build-system) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 1df4e9d1c5d..2b1629f8715 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -546,7 +546,7 @@ (define-public vkd3d (sha256 (base32 "1n4a622drgnprvz5hjxzyzcsg2lp5rlf1sajki2vzf5gsx6fdpk8")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-spirv-tools") diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 52642760e0a..a660798e858 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -792,7 +792,7 @@ (define-public python-i3-py (sha256 (base32 "1nm719dc2xqlll7vj4c4m7mpjb27lpn3bg3c66gajvnrz2x1nmxs")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system python-build-system) (arguments `(#:tests? #f ; no tests yet @@ -976,7 +976,7 @@ (define-public quickswitch-i3 (base32 "0447077sama80jcdg5p64zjsvafmz5rbdrirhm1adcdjhkh6iqc5")) (patches (search-patches "quickswitch-fix-dmenu-check.patch")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system python-build-system) (arguments `(#:tests? #f ; no tests yet @@ -1440,7 +1440,7 @@ (define-public fbautostart (uri (git-reference (url "https://github.com/paultag/fbautostart.git") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "13h6j5khi5axqhflzhayzgvyhxylmk5vsgin235ji440mzd516gz")))) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 0af511d4bb5..c396cf7c992 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2084,7 +2084,7 @@ (define-public xssproxy (uri (git-reference (url "https://github.com/vincentbernat/xssproxy") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "19i5npmbd2kbs96wp2bb79crlwkcf9n0n8cd4v1myvczb0iwbz1q")))) @@ -2532,7 +2532,7 @@ (define-public xftwidth (sha256 (base32 "1jwl25785li24kbp0m1wxfwk4dgxkliynn03nsj813cjr34kq16h")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs `(("freetype" ,freetype) ("libx11" ,libx11) diff --git a/gnu/packages/zile.scm b/gnu/packages/zile.scm index 3adf470853b..eae263694bc 100644 --- a/gnu/packages/zile.scm +++ b/gnu/packages/zile.scm @@ -122,7 +122,7 @@ (define-public zile-on-guile (sha256 (base32 "0wlli8hqal9ikmbl3a49kyhzyf164jk6mdbir3bclq2gxszs532d")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (inputs (modify-inputs (package-inputs zile) (prepend guile-2.0)))