efraim pushed a commit to branch wip-zig-bootstrap
in repository guix.
commit af76943eb4a3d84bf34cecfcf79032b9e90bef39
Author: Efraim Flashner <[email protected]>
AuthorDate: Mon Nov 11 20:12:14 2024 +0200
FIXUP zig-0.10.0-1638
Change-Id: I9f7a7f51aad5b50e8d256904e1f5d9534440584f
---
gnu/packages/zig.scm | 27 +++++++--------------------
1 file changed, 7 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm
index c9312f5f88..7ef53278de 100644
--- a/gnu/packages/zig.scm
+++ b/gnu/packages/zig.scm
@@ -642,15 +642,9 @@ toolchain. Among other features it provides
(define zig-0.10.0-1637-source
(let ((commit "4e6f21e2cb2c557b5c019f4acf445665a26edcba")
(revision "1637"))
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/ziglang/zig";)
- (commit commit)))
- (file-name (git-file-name "zig" (git-version "0.10.0" revision commit)))
- (sha256
- (base32 "1nd55j2c0br7rqx9fj6bkjyymkf1k6ms2m9f7byrc1ahggdyxrpv"))
- (snippet '(delete-file "stage1/zig1.wasm")))))
+ (zig-source
+ (git-version "0.10.0" revision commit)
+ commit "1nd55j2c0br7rqx9fj6bkjyymkf1k6ms2m9f7byrc1ahggdyxrpv")))
(define-public zig-0.10.0-1638
(let ((commit "7199d7c77715fe06606c5c89595e6852b3fa8c20")
@@ -661,17 +655,10 @@ toolchain. Among other features it provides
(name "zig")
(version (git-version "0.10.0" revision commit))
(source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/ziglang/zig";)
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "15mvfgab9wglm1g5gakvqwb7l33v1vjwjwchb3pmhxmkxkrjkmgq"))
- (patches
- (search-patches "zig-0.10.0-1638-re-add-qualCast.patch"))
- (snippet '(delete-file "stage1/zig1.wasm"))))
+ (inherit (zig-source
+ version commit
+
"15mvfgab9wglm1g5gakvqwb7l33v1vjwjwchb3pmhxmkxkrjkmgq"))
+ (patches (search-patches
"zig-0.10.0-1638-re-add-qualCast.patch"))))
(arguments
(substitute-keyword-arguments %arguments-zig2+zig1
((#:phases phases '%standard-phases)
