diff options
author | Hilton Chain <hako@ultrarare.space> | 2024-11-11 10:48:46 +0800 |
---|---|---|
committer | Hilton Chain <hako@ultrarare.space> | 2024-12-31 10:54:11 +0800 |
commit | 813ac2ec3c56785ffb147a12daf380ee3aa5c86d (patch) | |
tree | e23fb5a436c9add1fb1179e9c376eae27be35c66 | |
parent | fdc28705431a921df3bdffefdd667073c17f510d (diff) | |
download | guix-813ac2ec3c56785ffb147a12daf380ee3aa5c86d.tar.gz guix-813ac2ec3c56785ffb147a12daf380ee3aa5c86d.zip |
gnu: Add zig-0.10.0-747.
* gnu/packages/patches/zig-0.10.0-747-CallOptions.patch: New file.
* gnu/local.mk (dist_patch_DATA): Regisiter it.
* gnu/packages/zig.scm (zig-0.10.0-747): New variable.
Change-Id: I06e3255cbb3a4ddea28a7d663c8f72040ce993af
-rw-r--r-- | gnu/local.mk | 1 | ||||
-rw-r--r-- | gnu/packages/patches/zig-0.10.0-747-CallOptions.patch | 28 | ||||
-rw-r--r-- | gnu/packages/zig.scm | 34 |
3 files changed, 63 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 2aea9ffe0b..eed2bc766e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2421,6 +2421,7 @@ dist_patch_DATA = \ %D%/packages/patches/zig-0.10-use-system-paths.patch \ %D%/packages/patches/zig-0.10.0-610-bootstrap-resolve-conflicts.patch \ %D%/packages/patches/zig-0.10.0-675-TypeOf-hack.patch \ + %D%/packages/patches/zig-0.10.0-747-CallOptions.patch \ %D%/packages/patches/zsh-egrep-failing-test.patch \ %D%/packages/patches/zuo-bin-sh.patch diff --git a/gnu/packages/patches/zig-0.10.0-747-CallOptions.patch b/gnu/packages/patches/zig-0.10.0-747-CallOptions.patch new file mode 100644 index 0000000000..78c2244603 --- /dev/null +++ b/gnu/packages/patches/zig-0.10.0-747-CallOptions.patch @@ -0,0 +1,28 @@ +From 27f2553c1c53ec417181dfe30104df993dffdab1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt> +Date: Tue, 5 Nov 2024 06:20:19 +0200 +Subject: [PATCH] 0.10.0-747-g7b2a936173 CallOptions + zig2-only + +--- + CMakeLists.txt | 19 ------------------- + lib/std/builtin.zig | 5 +++++ + 2 files changed, 5 insertions(+), 19 deletions(-) + +diff --git a/lib/std/builtin.zig b/lib/std/builtin.zig +index eb1212607d..5278906d43 100644 +--- a/lib/std/builtin.zig ++++ b/lib/std/builtin.zig +@@ -1,5 +1,10 @@ + const builtin = @import("builtin"); + ++pub const CallOptions = struct { ++ modifier: CallModifier = .auto, ++ stack: ?[]align(std.Target.stack_align) u8 = null, ++}; ++ + /// `explicit_subsystem` is missing when the subsystem is automatically detected, + /// so Zig standard library has the subsystem detection logic here. This should generally be + /// used rather than `explicit_subsystem`. +-- +2.44.1 + diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm index b54e3c4622..ec01109ce6 100644 --- a/gnu/packages/zig.scm +++ b/gnu/packages/zig.scm @@ -440,4 +440,38 @@ toolchain. Among other features it provides (prepend zstd) (replace "zig" `(,base "zig1"))))))) +;; Supply zig2, build zig1.wasm, install zig1.wasm. +(define zig-0.10.0-747 + (let ((commit "7b2a936173165002105ba5e76bed69654e132fea") + (revision "747") + (base zig-0.10.0-722)) + (package + (inherit base) + (name "zig") + (version (git-version "0.10.0" revision commit)) + (source + (origin + (inherit (zig-source + version commit + "1z5ndywk4d1dcv2k3bw3n2zgjr3ysf3bi2ac4jhwqgnmzsw498wd")) + (patches (search-patches "zig-0.10.0-747-CallOptions.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments zig-0.10.0-722) + ;; zig1.wasm is architecture-independent. + ((#:target _ #f) #f) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (replace 'build-zig1 + (lambda _ + (invoke "zig2" "build" "--zig-lib-dir" "lib" + "update-zig1" "--verbose"))) + (delete 'prepare-source) + (delete 'configure) + (delete 'build) + (delete 'install))))) + (native-inputs + (modify-inputs (package-native-inputs base) + (replace "zig" `(,base "out")) + (delete "zstd")))))) + (define-public zig zig-0.10) |