diff options
| author | Hilton Chain <hako@ultrarare.space> | 2024-11-20 08:00:54 +0800 |
|---|---|---|
| committer | Hilton Chain <hako@ultrarare.space> | 2024-12-31 10:56:34 +0800 |
| commit | bdff1941e51193437dbcefad80d019fd9d5d0aa9 (patch) | |
| tree | d229690dfa81d125ac2a33ab1acfd2e6568b0e15 /gnu | |
| parent | 5ce59e0413510098f92e4b824d2a24b97ad2e4c9 (diff) | |
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
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/ncdu.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/zig-xyz.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/zig.scm | 2 |
3 files changed, 9 insertions, 4 deletions
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.") | |||
| 72 | "01g5mpvsm78lkd0yin82gyancrl23npy69qcp3d60vmm72yiwirz")))) | 72 | "01g5mpvsm78lkd0yin82gyancrl23npy69qcp3d60vmm72yiwirz")))) |
| 73 | (build-system zig-build-system) | 73 | (build-system zig-build-system) |
| 74 | (arguments | 74 | (arguments |
| 75 | (list #:zig zig-0.12 | 75 | (list #:install-source? #f |
| 76 | #:install-source? #f)) | 76 | #:zig-release-type "safe" |
| 77 | #:zig-build-flags | ||
| 78 | #~(list "-Dpie"))) | ||
| 77 | (inputs (list ncurses `(,zstd "lib"))) | 79 | (inputs (list ncurses `(,zstd "lib"))) |
| 78 | (native-inputs (list pkg-config)) | 80 | (native-inputs (list pkg-config)) |
| 79 | (properties `((tunable? . #t))))) | 81 | (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 @@ | |||
| 53 | (build-system zig-build-system) | 53 | (build-system zig-build-system) |
| 54 | (arguments | 54 | (arguments |
| 55 | (list | 55 | (list |
| 56 | #:zig zig-0.10 | ||
| 56 | #:install-source? #f | 57 | #:install-source? #f |
| 57 | #:phases | 58 | #:phases |
| 58 | #~(modify-phases %standard-phases | 59 | #~(modify-phases %standard-phases |
| @@ -124,7 +125,9 @@ mission-critical safety and performance for financial services.") | |||
| 124 | (build-system zig-build-system) | 125 | (build-system zig-build-system) |
| 125 | (inputs (list zig-0.10 python)) | 126 | (inputs (list zig-0.10 python)) |
| 126 | (arguments | 127 | (arguments |
| 127 | (list #:install-source? #f | 128 | (list #:zig zig-0.10 |
| 129 | #:install-source? #f | ||
| 130 | #:zig-release-type "safe" | ||
| 128 | ;; The tests fail with memory leaks. | 131 | ;; The tests fail with memory leaks. |
| 129 | #:tests? #f)) | 132 | #:tests? #f)) |
| 130 | (synopsis "Zig language server") | 133 | (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 | |||
| 1639 | (properties `((max-silent-time . 9600) | 1639 | (properties `((max-silent-time . 9600) |
| 1640 | ,@(clang-compiler-cpu-architectures "18"))))) | 1640 | ,@(clang-compiler-cpu-architectures "18"))))) |
| 1641 | 1641 | ||
| 1642 | (define-public zig zig-0.10) | 1642 | (define-public zig zig-0.13) |
