From 85b065c6fce7c1e9a6c2cd24392b8113a4a66903 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 23 Jan 2023 18:39:05 +0200 Subject: [PATCH] gnu: zig: Update to 0.10.1. * gnu/packages/zig.scm (zig-0.10): New variable. (zig-0.9): Rename from zig. Inherit from zig-0.10. (zig): Define as zig-0.10. * gnu/packages/ncdu.scm (ncdu)[native-inputs]: Use zig-0.9. * gnu/packages/zig-xyz.scm (zig-zls)[inputs]: Use zig-0.9. --- gnu/packages/ncdu.scm | 2 +- gnu/packages/zig-xyz.scm | 2 +- gnu/packages/zig.scm | 123 +++++++++++++++++++++++++++++---------- 3 files changed, 94 insertions(+), 33 deletions(-) diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm index feea8f8819..7e47314351 100644 --- a/gnu/packages/ncdu.scm +++ b/gnu/packages/ncdu.scm @@ -97,7 +97,7 @@ (define-public ncdu (when tests? (invoke "zig" "test" "build.zig"))))))) (native-inputs - (list perl zig)))) + (list perl zig-0.9)))) (define-public ncdu-2 (deprecated-package "ncdu2" ncdu)) diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm index 3812aa0125..fd42c21638 100644 --- a/gnu/packages/zig-xyz.scm +++ b/gnu/packages/zig-xyz.scm @@ -41,7 +41,7 @@ (define-public zig-zls (base32 "1hhs7dz9rpshfd1a7x5swmix2rmh53vsqskh3mzqlrj2lgb3cnii")))) (build-system gnu-build-system) - (inputs (list zig python)) + (inputs (list zig-0.9 python)) (arguments (list #:phases #~(modify-phases %standard-phases (delete 'configure) diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm index cda93bed2e..5414b5ba6e 100644 --- a/gnu/packages/zig.scm +++ b/gnu/packages/zig.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2021 Liliana Marie Prikler ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021 Calum Irwin -;;; Copyright © 2022 Efraim Flashner +;;; Copyright © 2022, 2023 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,10 +25,97 @@ (define-module (gnu packages zig) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cmake) #:use-module (gnu packages) + #:use-module (gnu packages compression) #:use-module (gnu packages llvm)) -(define-public zig +(define-public zig-0.10 (package + (name "zig") + (version "0.10.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ziglang/zig.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1sh5xjsksl52i4cfv1qj36sz5h0ln7cq4pdhgs3960mk8a90im7b")))) + (build-system cmake-build-system) + (inputs + (list clang-15 ; Clang propagates llvm. + lld-15 + zlib + (list zstd "lib"))) + ;; Zig compiles fine with GCC, but also needs native LLVM libraries. + (native-inputs + (list llvm-15)) + (arguments + `(#:configure-flags + (list ,@(if (%current-target-system) + '(string-append "-DZIG_TARGET_TRIPLE=" + (%current-target-system)) + '()) + (string-append "-DZIG_LIB_DIR=" (assoc-ref %outputs "out") + "/lib/zig")) + #:validate-runpath? #f ; TODO: zig binary can't find ld-linux. + #:out-of-source? #f ; for tests + #:phases + (modify-phases %standard-phases + (add-after 'configure 'set-cache-dir + (lambda _ + ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'. + (setenv "ZIG_GLOBAL_CACHE_DIR" + (string-append (getcwd) "/zig-cache")))) + (add-after 'patch-source-shebangs 'patch-more-shebangs + (lambda* (#:key inputs #:allow-other-keys) + ;; Zig uses information about /usr/bin/env to determine the + ;; version of glibc and other data. + (substitute* "lib/std/zig/system/NativeTargetInfo.zig" + (("/usr/bin/env") (search-input-file inputs "/bin/env"))))) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key outputs tests? #:allow-other-keys) + (when tests? + (invoke (string-append (assoc-ref outputs "out") "/bin/zig") + "build" "test" + ;; We're not testing the compiler bootstrap chain. + "-Dskip-stage1" + "-Dskip-stage2-tests" + ;; Non-native tests try to link and execute non-native + ;; binaries. + "-Dskip-non-native"))))))) + (native-search-paths + (list + (search-path-specification + (variable "C_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "CPLUS_INCLUDE_PATH") + (files '("include/c++" "include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib" "lib64"))))) + (synopsis "General purpose programming language and toolchain") + (description "Zig is a general-purpose programming language and +toolchain. Among other features it provides +@itemize +@item an Optional type instead of null pointers, +@item manual memory management, +@item generic data structures and functions, +@item compile-time reflection and compile-time code execution, +@item integration with C using zig as a C compiler, and +@item concurrency via async functions. +@end itemize") + (home-page "https://github.com/ziglang/zig") + ;; Currently building zig can take up to 10GB of RAM for linking stage1: + ;; https://github.com/ziglang/zig/issues/6485 + (supported-systems %64bit-supported-systems) + (license license:expat))) + +(define-public zig-0.9 + (package + (inherit zig-0.10) (name "zig") (version "0.9.1") (source @@ -41,7 +128,6 @@ (define-public zig (sha256 (base32 "0nfvgg23sw50ksy0z0ml6lkdsvmd0278mq29m23dbb2jsirkhry7")) (patches (search-patches "zig-use-system-paths.patch")))) - (build-system cmake-build-system) (inputs (list clang-13 ; Clang propagates llvm. lld-13)) @@ -76,31 +162,6 @@ (define-public zig "-Dskip-stage2-tests" ;; Non-native tests try to link and execute non-native ;; binaries. - "-Dskip-non-native"))))))) - (native-search-paths - (list - (search-path-specification - (variable "C_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "CPLUS_INCLUDE_PATH") - (files '("include/c++" "include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64"))))) - (synopsis "General purpose programming language and toolchain") - (description "Zig is a general-purpose programming language and -toolchain. Among other features it provides -@itemize -@item an Optional type instead of null pointers, -@item manual memory management, -@item generic data structures and functions, -@item compile-time reflection and compile-time code execution, -@item integration with C using zig as a C compiler, and -@item concurrency via async functions. -@end itemize") - (home-page "https://github.com/ziglang/zig") - ;; Currently building zig can take up to 10GB of RAM for linking stage1: - ;; https://github.com/ziglang/zig/issues/6485 - (supported-systems %64bit-supported-systems) - (license license:expat))) + "-Dskip-non-native"))))))))) + +(define-public zig zig-0.10)