urbit · pkova · May 21, 2025 · Jul 15, 2022 · Jul 15, 2022 · Jul 21, 2022
diff --git a/.github/workflows/docker-shared.yml b/.github/workflows/docker-shared.yml
@@ -18,7 +18,7 @@ jobs:
 
       - uses: mlugg/setup-zig@v1
         with:
-          version: 0.13.0
+          version: 0.14.0
 
       #
       # BUILD

diff --git a/.github/workflows/shared.yml b/.github/workflows/shared.yml
@@ -74,7 +74,7 @@ jobs:
 
       - uses: mlugg/setup-zig@v1
         with:
-          version: 0.13.0
+          version: 0.14.0
 
       - name: Build binaries
         run: |

diff --git a/.gitignore b/.gitignore
@@ -9,9 +9,14 @@
 MODULE.bazel
 MODULE.bazel.lock
 
+# Zig
 **/.zig-cache
 **/zig-out
 
+# clangd
+**/.cache
+compile_commands.json
+
 # Swap files.
 *.swo
 *.swp

diff --git a/INSTALL.md b/INSTALL.md
@@ -17,7 +17,7 @@ Additional targets:
 
 ## Prerequisites
 
-Install version 0.13.0 of `zig` with the package manager of your choosing, e.g., `brew install zig`, or download the binary from [here][zig-download].
+Install version 0.14.0 of `zig` with the package manager of your choosing, e.g., `brew install zig`, or download the binary from [here][zig-download].
 
 ### macOS debugger
 

diff --git a/build.zig b/build.zig
@@ -1,21 +1,25 @@
 const std = @import("std");
 
-const VERSION = "3.3";
+const VERSION = "3.4";
 
-const main_targets = .{
+const main_targets: []const std.Target.Query = &[_]std.Target.Query{
     .{ .cpu_arch = .aarch64, .os_tag = .macos, .abi = null },
     .{ .cpu_arch = .x86_64, .os_tag = .macos, .abi = null },
     .{ .cpu_arch = .aarch64, .os_tag = .linux, .abi = .musl },
     .{ .cpu_arch = .x86_64, .os_tag = .linux, .abi = .musl },
 };
 
-const supported_targets: []const std.Target.Query = &(main_targets ++ .{
+const supported_targets: []const std.Target.Query = &[_]std.Target.Query{
+    .{ .cpu_arch = .aarch64, .os_tag = .macos, .abi = null },
+    .{ .cpu_arch = .x86_64, .os_tag = .macos, .abi = null },
+    .{ .cpu_arch = .aarch64, .os_tag = .linux, .abi = .musl },
+    .{ .cpu_arch = .x86_64, .os_tag = .linux, .abi = .musl },
     .{ .cpu_arch = .aarch64, .os_tag = .linux, .abi = .gnu },
     .{ .cpu_arch = .x86_64, .os_tag = .linux, .abi = .gnu },
     .{ .cpu_arch = .x86_64, .os_tag = .linux, .abi = .gnu, .glibc_version = std.SemanticVersion{ .major = 2, .minor = 27, .patch = 0 } },
-});
+};
 
-const targets: []const std.Target.Query = &main_targets;
+const targets: []const std.Target.Query = main_targets;
 
 const BuildCfg = struct {
     version: []const u8,
@@ -395,7 +399,7 @@ fn buildBinary(
     });
     b.getInstallStep().dependOn(&target_output.step);
 
-    if (target.result.isDarwin() and !target.query.isNative()) {
+    if (target.result.os.tag.isDarwin() and !target.query.isNative()) {
         const macos_sdk = b.lazyDependency("macos_sdk", .{
             .target = target,
             .optimize = optimize,
@@ -425,7 +429,7 @@ fn buildBinary(
     urbit.linkLibrary(whereami.artifact("whereami"));
     urbit.linkLibrary(wasm3.artifact("wasm3"));
 
-    if (t.isDarwin()) {
+    if (t.os.tag.isDarwin()) {
         // Requires llvm@18 homebrew installation
         if (cfg.asan or cfg.ubsan)
             urbit.addLibraryPath(.{
@@ -582,7 +586,7 @@ fn buildBinary(
                 .optimize = optimize,
             });
 
-            if (t.isDarwin() and !target.query.isNative()) {
+            if (t.os.tag.isDarwin() and !target.query.isNative()) {
                 const macos_sdk = b.lazyDependency("macos_sdk", .{
                     .target = target,
                     .optimize = optimize,

diff --git a/build.zig.zon b/build.zig.zon
@@ -1,10 +1,11 @@
 .{
-    .name = "urbit",
+    .name = .urbit,
     .version = "0.0.1",
+    .fingerprint = 0x9e228a3003a2736b,
     .dependencies = .{
         .macos_sdk = .{
             .url = "https://github.com/joseluisq/macosx-sdks/releases/download/14.5/MacOSX14.5.sdk.tar.xz",
-            .hash = "122033a9c16c63f66ba4c83d6c61f487b06a6435ed57201eaccb4c5703ce4cdd956e",
+            .hash = "N-V-__8AAKtK4FMzqcFsY_ZrpMg9bGH0h7BqZDXtVyAerMtM",
             .lazy = true,
         },
         .pkg_c3 = .{
@@ -54,7 +55,7 @@
         },
         .zlib = .{
             .url = "https://github.com/allyourcodebase/zlib/archive/0918e87b7629b9c6a50a08edd0ce30d849758faf.tar.gz",
-            .hash = "122034ab2a12adf8016ffa76e48b4be3245ffd305193edba4d83058adbcfa749c107",
+            .hash = "zlib-1.3.1-AAAAACEMAAA0qyoSrfgBb_p25ItL4yRf_TBRk-26TYMF",
         },
         .wasm3 = .{
             .path = "./ext/wasm3",

diff --git a/ext/avahi/build.zig b/ext/avahi/build.zig
@@ -538,7 +538,7 @@ pub fn build(b: *std.Build) void {
     avahi.root_module.addCMacro("HAVE_DBUS_CONNECTION_CLOSE", "0");
     avahi.root_module.addCMacro("HAVE_EXPAT_H", "1");
     avahi.root_module.addCMacro("HAVE_CONFIG_H", "1");
-    if (!t.isGnu())
+    if (!t.isGnuLibC())
         avahi.root_module.addCMacro("HAVE_STRLCPY", "1");
 
     const avahi_config_h = b.addConfigHeader(.{

diff --git a/ext/avahi/build.zig.zon b/ext/avahi/build.zig.zon
@@ -4,15 +4,16 @@
     .dependencies = .{
         .avahi = .{
             .url = "https://github.com/lathiat/avahi/releases/download/v0.8/avahi-0.8.tar.gz",
-            .hash = "1220df62c88bd00f3a397a83b5fc8b4ab657884bbc452a653892790ce213aa6fd900",
+            .hash = "N-V-__8AAOLVeQDfYsiL0A86OXqDtfyLSrZXiEu8RSplOJJ5",
         },
         .dbus = .{
-            .url = "https://src.fedoraproject.org/repo/pkgs/dbus/dbus-1.14.8.tar.xz/sha512/f3dfc73da28cbe20449d15bbe4166c3574f0e551dfd15fca7cce2b8c71e778360ed2dd391ee5c414a7a47ff4b958727b26ef4cabfee70564f8d0a34bf5ad2386/dbus-1.14.8.tar.xz",
-            .hash = "122083df329bed83b1383e11ff9d40038d643730f7d610f002608d9a48c4500719a3",
+            .url = "https://distfiles.alpinelinux.org/distfiles/v3.17/dbus-1.14.8.tar.xz",
+            // .url = "https://src.fedoraproject.org/repo/pkgs/dbus/dbus-1.14.8.tar.xz/sha512/f3dfc73da28cbe20449d15bbe4166c3574f0e551dfd15fca7cce2b8c71e778360ed2dd391ee5c414a7a47ff4b958727b26ef4cabfee70564f8d0a34bf5ad2386/dbus-1.14.8.tar.xz",
+            .hash = "N-V-__8AAEB_jACD3zKb7YOxOD4R_51AA41kNzD31hDwAmCN",
         },
         .expat = .{
             .url = "https://github.com/libexpat/libexpat/releases/download/R_2_5_0/expat-2.5.0.tar.xz",
-            .hash = "1220b1874d568d61688789eb2f1f2fe1ed06f66bb0480000df645c476472e31ae30f",
+            .hash = "N-V-__8AABFoMgCxh01WjWFoh4nrLx8v4e0G9muwSAAA32Rc",
         },
     },
     .paths = .{

diff --git a/ext/backtrace/build.zig b/ext/backtrace/build.zig
@@ -81,7 +81,7 @@ pub fn build(b: *std.Build) void {
         ._POSIX_SOURCE = null,
     });
 
-    if (t.isDarwin()) {
+    if (t.os.tag.isDarwin()) {
         config_h.addValues(.{
             .HAVE_MACH_O_DYLD_H = 1,
         });

diff --git a/ext/backtrace/build.zig.zon b/ext/backtrace/build.zig.zon
@@ -4,7 +4,7 @@
     .dependencies = .{
         .backtrace = .{
             .url = "https://github.com/ianlancetaylor/libbacktrace/archive/4ead348bb45f753121ca0bd44170ff8352d4c514.tar.gz",
-            .hash = "12205a46d567bd07761595d56787a1abb487c321e204bf3148e3657203bb2329160e",
+            .hash = "N-V-__8AADzSKgBaRtVnvQd2FZXVZ4ehq7SHwyHiBL8xSONl",
         },
     },
     .paths = .{

diff --git a/ext/curl/build.zig b/ext/curl/build.zig
@@ -70,12 +70,9 @@ pub fn build(b: *std.Build) void {
     if (target.result.os.tag == .windows) {
         curl.linkSystemLibrary("bcrypt");
     } else {
-        curl.root_module.addCMacro(
-            "CURL_EXTERN_SYMBOL",
-            "__attribute__ ((__visibility__ (\"default\"))"
-        );
+        curl.root_module.addCMacro("CURL_EXTERN_SYMBOL", "__attribute__ ((__visibility__ (\"default\"))");
 
-        const isDarwin = target.result.isDarwin();
+        const isDarwin = target.result.os.tag.isDarwin();
         if (!isDarwin)
             curl.root_module.addCMacro("ENABLE_IPV6", "1");
         curl.root_module.addCMacro("HAVE_ALARM", "1");

diff --git a/ext/curl/build.zig.zon b/ext/curl/build.zig.zon
@@ -4,7 +4,7 @@
     .dependencies = .{
         .curl = .{
             .url = "https://github.com/curl/curl/releases/download/curl-8_9_1/curl-8.9.1.tar.gz",
-            .hash = "1220f36375f7a423b8dc41b14612d685f48e030b25d0f6eb69011179e9b68e4584e0",
+            .hash = "N-V-__8AAFnEQQHzY3X3pCO43EGxRhLWhfSOAwsl0PbraQER",
         },
         .openssl = .{
             .path = "../openssl",

diff --git a/ext/gmp/build.zig.zon b/ext/gmp/build.zig.zon
@@ -3,8 +3,8 @@
     .version = "0.0.1",
     .dependencies = .{
         .gmp = .{
-            .url = "https://ftp.gnu.org/gnu/gmp/gmp-6.3.0.tar.gz",
-            .hash = "1220d46202c17aa35ab5848a7f7a812b797c9f07698f263c8a02b4ad9640a1bbe0e3",
+            .url = "https://ftp.fr.openbsd.org/pub/OpenBSD/distfiles/gmp-6.3.0.tar.xz",
+            .hash = "N-V-__8AAE5fAwHUYgLBeqNatYSKf3qBK3l8nwdpjyY8igK0",
         },
     },
     .paths = .{

diff --git a/ext/h2o/build.zig b/ext/h2o/build.zig
@@ -55,7 +55,7 @@ pub fn build(b: *std.Build) !void {
         .files = &.{"cloexec.c"},
         .flags = &.{
             "-fno-sanitize=all",
-            if (t.isGnu())
+            if (t.isGnuLibC())
                 "-D_GNU_SOURCE"
             else
                 "",

diff --git a/ext/h2o/build.zig.zon b/ext/h2o/build.zig.zon
@@ -4,7 +4,7 @@
     .dependencies = .{
         .h2o = .{
             .url = "https://github.com/h2o/h2o/archive/refs/tags/v2.2.6.tar.gz",
-            .hash = "12206fb50c715a131282752c7cd92abe3f5647f3ac28ae5c56fdd231896c44fdb86d",
+            .hash = "N-V-__8AAFCFqAJvtQxxWhMSgnUsfNkqvj9WR_OsKK5cVv3S",
         },
         .libuv = .{
             .path = "../libuv",
@@ -17,11 +17,11 @@
         },
         .zlib = .{
             .url = "https://github.com/allyourcodebase/zlib/archive/0918e87b7629b9c6a50a08edd0ce30d849758faf.tar.gz",
-            .hash = "122034ab2a12adf8016ffa76e48b4be3245ffd305193edba4d83058adbcfa749c107",
+            .hash = "zlib-1.3.1-AAAAACEMAAA0qyoSrfgBb_p25ItL4yRf_TBRk-26TYMF",
         },
         .sse2neon = .{
             .url = "https://github.com/DLTcollab/sse2neon/archive/refs/tags/v1.5.1.tar.gz",
-            .hash = "1220ced40ef8af4a4565aa1a7de678d43478df9b26483c062db2dbdc58b42c822268",
+            .hash = "N-V-__8AAPihCgDO1A74r0pFZaoafeZ41DR435smSDwGLbLb",
         },
         .patches = .{
             .path = "./patches",

diff --git a/ext/libuv/build.zig.zon b/ext/libuv/build.zig.zon
@@ -4,7 +4,7 @@
     .dependencies = .{
         .libuv = .{
             .url = "https://dist.libuv.org/dist/v1.50.0/libuv-v1.50.0.tar.gz",
-            .hash = "12207ac22e5e40afe515b7c319237785113c97ee84a75f7c66c1a0e7cc6e743debeb",
+            .hash = "N-V-__8AAH34QwB6wi5eQK_lFbfDGSN3hRE8l-6Ep198ZsGg",
         },
     },
     .paths = .{

diff --git a/ext/lmdb/build.zig.zon b/ext/lmdb/build.zig.zon
@@ -4,7 +4,7 @@
     .dependencies = .{
         .lmdb = .{
             .url = "https://github.com/LMDB/lmdb/archive/refs/tags/LMDB_0.9.29.tar.gz",
-            .hash = "122008e42c2b9e46f8251038a22f7968dddc17ad2ec9c278d9032014073c0f584fac",
+            .hash = "N-V-__8AAHEmCAAI5Cwrnkb4JRA4oi95aN3cF60uycJ42QMg",
         },
     },
     .paths = .{

diff --git a/ext/murmur3/build.zig.zon b/ext/murmur3/build.zig.zon
@@ -4,7 +4,7 @@
     .dependencies = .{
         .murmur3 = .{
             .url = "https://github.com/PeterScott/murmur3/archive/dae94be0c0f54a399d23ea6cbe54bca5a4e93ce4.tar.gz",
-            .hash = "12201b70bb970bb8e197936edd9be02fa67699d517515c8077031affc4f25226dcdf",
+            .hash = "N-V-__8AABE5AAAbcLuXC7jhl5Nu3ZvgL6Z2mdUXUVyAdwMa",
         },
     },
     .paths = .{

diff --git a/ext/natpmp/build.zig.zon b/ext/natpmp/build.zig.zon
@@ -3,8 +3,9 @@
     .version = "0.0.1",
     .dependencies = .{
         .natpmp = .{
-            .url = "https://debian.mirror.root.lu/debian/pool/main/libn/libnatpmp/libnatpmp_20230423.orig.tar.gz",
-            .hash = "12203f777796f1df1db24c4194bcc6060d2a7bee2eea88527c2336bbf455d4108239",
+            .url = "https://mirrors.wikimedia.org/ubuntu/ubuntu/pool/main/libn/libnatpmp/libnatpmp_20230423.orig.tar.gz",
+            // .url = "https://debian.mirror.root.lu/debian/pool/main/libn/libnatpmp/libnatpmp_20230423.orig.tar.gz",
+            .hash = "N-V-__8AAKudAQA_d3eW8d8dskxBlLzGBg0qe-4u6ohSfCM2",
         },
     },
     .paths = .{

diff --git a/ext/openssl/build.zig b/ext/openssl/build.zig
@@ -18,9 +18,9 @@ pub fn build(b: *std.Build) !void {
         b,
         target,
         optimize,
-        if (target.result.isDarwin()) &macos_cflags else &linux_cflags,
+        if (target.result.os.tag.isDarwin()) &macos_cflags else &linux_cflags,
     );
-    if (target.result.isDarwin() and !target.query.isNative()) {
+    if (target.result.os.tag.isDarwin() and !target.query.isNative()) {
         const macos_sdk = b.lazyDependency("macos_sdk", .{
             .target = target,
             .optimize = optimize,
@@ -37,7 +37,7 @@ pub fn build(b: *std.Build) !void {
         b,
         target,
         optimize,
-        if (target.result.isDarwin()) &macos_cflags else &linux_cflags,
+        if (target.result.os.tag.isDarwin()) &macos_cflags else &linux_cflags,
     ));
 }
 
@@ -76,13 +76,6 @@ fn libcrypto(
     lib.addIncludePath(dep.path("crypto/modes"));
     lib.addIncludePath(dep.path("include"));
 
-    // lib.root_module.addCMacro("__APPLE__", "");
-    // lib.root_module.addCMacro("__ARMEB__", "");
-    if (t.cpu.arch.isAARCH64())
-        lib.root_module.addCMacro("__ILP32__", "");
-    // lib.root_module.addCMacro("__AARCH64EB__", "");
-    // lib.root_module.addCMacro("__KERNEL__", "");
-
     lib.root_module.addCMacro("L_ENDIAN", "");
     lib.root_module.addCMacro("OPENSSL_PIC", "");
     lib.root_module.addCMacro("OPENSSL_CPUID_OBJ", "");
@@ -113,7 +106,7 @@ fn libcrypto(
     // lib.root_module.addCMacro("OPENSSL_NO_STDIO", "");
     // lib.root_module.addCMacro("OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ", "1");
 
-    if (t.isDarwin() and t.cpu.arch.isAARCH64()) {
+    if (t.os.tag.isDarwin() and t.cpu.arch.isAARCH64()) {
         lib.addIncludePath(b.path("gen/macos-aarch64/include"));
         lib.addIncludePath(b.path("gen/macos-aarch64/include/crypto"));
         lib.addIncludePath(b.path("gen/macos-aarch64/include/openssl"));
@@ -163,7 +156,7 @@ fn libcrypto(
         });
     }
 
-    if (t.isDarwin() and t.cpu.arch == .x86_64) {
+    if (t.os.tag.isDarwin() and t.cpu.arch == .x86_64) {
         lib.addIncludePath(b.path("gen/macos-x86_64/include"));
         lib.addIncludePath(b.path("gen/macos-x86_64/include/crypto"));
         lib.addIncludePath(b.path("gen/macos-x86_64/include/openssl"));
@@ -329,7 +322,7 @@ fn libssl(
     lib.addIncludePath(dep.path("include/internal"));
     lib.addIncludePath(dep.path("include/openssl"));
 
-    if (t.isDarwin() and t.cpu.arch.isAARCH64()) {
+    if (t.os.tag.isDarwin() and t.cpu.arch.isAARCH64()) {
         lib.addIncludePath(b.path("gen/macos-aarch64/include"));
         lib.addIncludePath(b.path("gen/macos-aarch64/include/openssl"));
         lib.installHeadersDirectory(b.path("gen/macos-aarch64/include/openssl"), "openssl", .{});
@@ -341,7 +334,7 @@ fn libssl(
         lib.installHeadersDirectory(b.path("gen/linux-aarch64/include/openssl"), "openssl", .{});
     }
 
-    if (t.isDarwin() and t.cpu.arch == .x86_64) {
+    if (t.os.tag.isDarwin() and t.cpu.arch == .x86_64) {
         lib.addIncludePath(b.path("gen/macos-x86_64/include"));
         lib.addIncludePath(b.path("gen/macos-x86_64/include/openssl"));
         lib.installHeadersDirectory(b.path("gen/macos-x86_64/include/openssl"), "openssl", .{});
@@ -353,8 +346,8 @@ fn libssl(
         lib.installHeadersDirectory(b.path("gen/linux-x86_64/include/openssl"), "openssl", .{});
     }
 
-    lib.defineCMacro("OPENSSLDIR", "\"\"");
-    lib.defineCMacro("ENGINESDIR", "\"\"");
+    lib.root_module.addCMacro("OPENSSLDIR", "\"\"");
+    lib.root_module.addCMacro("ENGINESDIR", "\"\"");
 
     lib.addCSourceFiles(.{
         .root = dep.path(""),

diff --git a/ext/openssl/build.zig.zon b/ext/openssl/build.zig.zon
@@ -1,15 +1,16 @@
 .{
-    .name = "openssl",
+    .name = .openssl,
+    .fingerprint = 0x773a47f1e2d96f2e,
     .version = "0.0.1",
     .dependencies = .{
         .macos_sdk = .{
             .url = "https://github.com/joseluisq/macosx-sdks/releases/download/14.5/MacOSX14.5.sdk.tar.xz",
-            .hash = "122033a9c16c63f66ba4c83d6c61f487b06a6435ed57201eaccb4c5703ce4cdd956e",
+            .hash = "N-V-__8AAKtK4FMzqcFsY_ZrpMg9bGH0h7BqZDXtVyAerMtM",
             .lazy = true,
         },
         .openssl = .{
             .url = "https://github.com/openssl/openssl/releases/download/OpenSSL_1_1_1w/openssl-1.1.1w.tar.gz",
-            .hash = "122042b0a69fc3deee3c603b11046f15693046e5cfcf56858e028b9ea4dc4b78b81a",
+            .hash = "N-V-__8AANidegJCsKafw97uPGA7EQRvFWkwRuXPz1aFjgKL",
         },
     },
     .paths = .{

diff --git a/ext/openssl/gen/macos-aarch64/crypto/chacha/chacha-armv8.S b/ext/openssl/gen/macos-aarch64/crypto/chacha/chacha-armv8.S
@@ -14,7 +14,7 @@ LOPENSSL_armcap_P:
 #ifdef	__ILP32__
 .long	_OPENSSL_armcap_P-.
 #else
-.quad	_OPENSSL_armcap_P-.
+.quad	ARMV7_NEON
 #endif
 .byte	67,104,97,67,104,97,50,48,32,102,111,114,32,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
 .align	2

diff --git a/ext/openssl/gen/macos-aarch64/crypto/poly1305/poly1305-armv8.S b/ext/openssl/gen/macos-aarch64/crypto/poly1305/poly1305-armv8.S
@@ -863,7 +863,7 @@ LOPENSSL_armcap_P:
 #ifdef	__ILP32__
 .long	_OPENSSL_armcap_P-.
 #else
-.quad	_OPENSSL_armcap_P-.
+.quad	ARMV7_NEON
 #endif
 .byte	80,111,108,121,49,51,48,53,32,102,111,114,32,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
 .align	2
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ jobs: @@
           - uses: mlugg/setup-zig@v1
             with:
-              version: 0.13.0
+              version: 0.14.0
           #
           # BUILD
@@ Expand Down @@