From bdff1941e51193437dbcefad80d019fd9d5d0aa9 Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space>
Date: Wed, 20 Nov 2024 08:00:54 +0800
Subject: gnu: zig: Default to zig-0.13.

* guix/build-system/zig.scm (#:parallel-build?,#:parallel-tests?):
New arguments.
* guix/build/zig-build-system.scm (zig-arguments): New procedure.
(bulid): Use it and honor #:parallel-build?.
(check): Use it and honor #:parallel-tests?.
* gnu/packages/zig.scm (zig): Define as zig-0.13.
* gnu/packages/ncdu.scm (ncdu)[arguments]<#:zig>: Unset.
<#:zig-release-type>: Set to "safe".
<#:zig-build-flags>: Add "-Dpie".
* gnu/packages/zig-xyz.scm (river)[arguments]<#:zig>: Use zig-0.10.
(zig-zls)[arguments]<#:zig>: Use zig-0.10.
<#:zig-release-type>: Set to "safe".

Change-Id: I1f0087ff39ea9fecb2ad911019d0525f1e6285f6
---
 gnu/packages/ncdu.scm    | 6 ++++--
 gnu/packages/zig-xyz.scm | 5 ++++-
 gnu/packages/zig.scm     | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm
index c49fefc077e..bbbb2fea26f 100644
--- a/gnu/packages/ncdu.scm
+++ b/gnu/packages/ncdu.scm
@@ -72,8 +72,10 @@ ncurses installed.")
                 "01g5mpvsm78lkd0yin82gyancrl23npy69qcp3d60vmm72yiwirz"))))
     (build-system zig-build-system)
     (arguments
-     (list #:zig zig-0.12
-           #:install-source? #f))
+     (list #:install-source? #f
+           #:zig-release-type "safe"
+           #:zig-build-flags
+           #~(list "-Dpie")))
     (inputs (list ncurses `(,zstd "lib")))
     (native-inputs (list pkg-config))
     (properties `((tunable? . #t)))))
diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
index 9c86dde5560..e504e50e237 100644
--- a/gnu/packages/zig-xyz.scm
+++ b/gnu/packages/zig-xyz.scm
@@ -53,6 +53,7 @@
     (build-system zig-build-system)
     (arguments
      (list
+      #:zig zig-0.10
       #:install-source? #f
       #:phases
       #~(modify-phases %standard-phases
@@ -124,7 +125,9 @@ mission-critical safety and performance for financial services.")
     (build-system zig-build-system)
     (inputs (list zig-0.10 python))
     (arguments
-     (list #:install-source? #f
+     (list #:zig zig-0.10
+           #:install-source? #f
+           #:zig-release-type "safe"
            ;; The tests fail with memory leaks.
            #:tests? #f))
     (synopsis "Zig language server")
diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm
index 2644516e696..13c8fa421ed 100644
--- a/gnu/packages/zig.scm
+++ b/gnu/packages/zig.scm
@@ -1639,4 +1639,4 @@ toolchain.  Among other features it provides
     (properties `((max-silent-time . 9600)
                   ,@(clang-compiler-cpu-architectures "18")))))
 
-(define-public zig zig-0.10)
+(define-public zig zig-0.13)
-- 
cgit v1.3