diff options
| author | Maxim Cournoyer <[email protected]> | 2022-01-25 23:36:11 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2022-01-25 23:48:37 -0500 |
| commit | 0d41fe4855588fb659b8adafe215d5573517a79b (patch) | |
| tree | 38b274bd03375f4fa5b7d3a9fb3f64a19786bef2 /gnu/packages/zig.scm | |
| parent | 7c57821c68d199ad56a8ed750b36eccc7ef238dd (diff) | |
| parent | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (diff) | |
Merge branch 'staging' into core-updates.
With "conflicts" resolved in (mostly in favor of master/staging):
gnu/packages/admin.scm
gnu/packages/gnuzilla.scm
gnu/packages/gtk.scm
gnu/packages/kerberos.scm
gnu/packages/linux.scm
guix/lint.scm
Diffstat (limited to 'gnu/packages/zig.scm')
| -rw-r--r-- | gnu/packages/zig.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm index ea0ec89b0b..b3de72226b 100644 --- a/gnu/packages/zig.scm +++ b/gnu/packages/zig.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Liliana Marie Prikler <[email protected]> ;;; Copyright © 2021 Sarah Morgensen <[email protected]> +;;; Copyright © 2021 Calum Irwin <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,7 +29,7 @@ (define-public zig (package (name "zig") - (version "0.8.1") + (version "0.9.0") (source (origin (method git-fetch) @@ -37,18 +38,18 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "147qx7xgj0r353wh5ragzn6kmm1vrf31i8038z3zqwjnqqgqxi6c")) + (base32 "1zdz5s434c48z3y0c8l9wm2z1gxa7yyzd53zmr68lwj6mcl7by8x")) (patches (search-patches "zig-disable-libc-note-test.patch" "zig-use-system-paths.patch")))) (build-system cmake-build-system) (inputs - (list clang-12 ; Clang propagates llvm. + (list clang-13 ; Clang propagates llvm. lld)) ;; Zig compiles fine with GCC, but also needs native LLVM libraries. (native-inputs - (list llvm-12)) + (list llvm-13)) (arguments `(#:configure-flags (list ,@(if (%current-target-system) |