From 6d54f34513f895026e8e7ba2083c13a75b597a5e Mon Sep 17 00:00:00 2001
From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
Date: Wed, 22 Jan 2025 19:02:53 +0800
Subject: [PATCH] gnu: nvc: Improve package style.

* gnu/packages/fpga.scm (nvc)[source]: Use git-file-name. Remove .git to fix
the redirection.
[arguments]: Use G-expressions.

Change-Id: I44115f13503ae5b3f82cc50cb2fc31168ea3a714
---
 gnu/packages/fpga.scm | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index 25f10f3b7902f58283df2a5aa72b44a6b23851cd..79c4ab9e074577c2e98f04450fe262dd06e86edb 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2023 Simon South <simon@simonsouth.net>
 ;;; Copyright © 2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2024 Jakob Kirsch <jakob.kirsch@web.de>
+;;; Copyright © 2025 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -558,22 +559,20 @@ automated testing of HDL code.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/nickg/nvc.git")
-                     (commit (string-append "r" version))))
-              (file-name (string-append name "-" version "-checkout"))
+                    (url "https://github.com/nickg/nvc")
+                    (commit (string-append "r" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "1bcilpdd6qg0vwvbwjb4rcs0j051sc53yalxsgz8r8gm123ck40j"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:out-of-source? #t
-       #:configure-flags
-       '("--enable-vhpi")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'clean-up
-           (lambda _
-             (delete-file "autogen.sh"))))))
+     (list #:out-of-source? #t
+           #:configure-flags #~(list "--enable-vhpi")
+           #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'clean-up
+                          (lambda _
+                            (delete-file "autogen.sh"))))))
     (native-inputs
      (list automake
            autoconf