forked from LordMZTE/confgen
chore: update to zig 0.13
This commit is contained in:
parent
10ff95f6dd
commit
f7abe9ee0a
8 changed files with 17 additions and 17 deletions
|
@ -13,7 +13,7 @@ jobs:
|
|||
- name: Setup Zig
|
||||
uses: https://github.com/goto-bus-stop/setup-zig@v2
|
||||
with:
|
||||
version: 0.12.0
|
||||
version: 0.13.0
|
||||
|
||||
- name: Setup Packages
|
||||
run: |
|
||||
|
|
|
@ -10,7 +10,7 @@ jobs:
|
|||
- name: Setup Zig
|
||||
uses: https://github.com/goto-bus-stop/setup-zig@v2
|
||||
with:
|
||||
version: 0.12.0
|
||||
version: 0.13.0
|
||||
|
||||
- name: Setup Packages
|
||||
run: |
|
||||
|
|
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -1,4 +1,4 @@
|
|||
zig-cache/
|
||||
.zig-cache/
|
||||
zig-out/
|
||||
deps.zig
|
||||
result*/
|
||||
|
|
10
build.zig
10
build.zig
|
@ -16,7 +16,7 @@ pub fn build(b: *std.Build) void {
|
|||
}).module("args");
|
||||
|
||||
const libcg = b.createModule(.{
|
||||
.root_source_file = .{ .path = "libcg/main.zig" },
|
||||
.root_source_file = b.path("libcg/main.zig"),
|
||||
.link_libc = true,
|
||||
.target = target,
|
||||
.optimize = optimize,
|
||||
|
@ -28,7 +28,7 @@ pub fn build(b: *std.Build) void {
|
|||
|
||||
const confgen_exe = b.addExecutable(.{
|
||||
.name = "confgen",
|
||||
.root_source_file = .{ .path = "confgen/main.zig" },
|
||||
.root_source_file = b.path("confgen/main.zig"),
|
||||
.target = target,
|
||||
.optimize = optimize,
|
||||
});
|
||||
|
@ -39,7 +39,7 @@ pub fn build(b: *std.Build) void {
|
|||
b.installArtifact(confgen_exe);
|
||||
|
||||
b.installDirectory(.{
|
||||
.source_dir = .{ .path = "share" },
|
||||
.source_dir = b.path("share"),
|
||||
.install_dir = .{ .custom = "share" },
|
||||
.install_subdir = ".",
|
||||
});
|
||||
|
@ -54,7 +54,7 @@ pub fn build(b: *std.Build) void {
|
|||
run_confgen_step.dependOn(&run_confgen_cmd.step);
|
||||
|
||||
const exe_confgen_tests = b.addTest(.{
|
||||
.root_source_file = .{ .path = "confgen/main.zig" },
|
||||
.root_source_file = b.path("confgen/main.zig"),
|
||||
.link_libc = true,
|
||||
.target = target,
|
||||
.optimize = optimize,
|
||||
|
@ -65,7 +65,7 @@ pub fn build(b: *std.Build) void {
|
|||
if (confgenfs) {
|
||||
const confgenfs_exe = b.addExecutable(.{
|
||||
.name = "confgenfs",
|
||||
.root_source_file = .{ .path = "confgenfs/main.zig" },
|
||||
.root_source_file = b.path("confgen/main.zig"),
|
||||
.link_libc = true,
|
||||
.target = target,
|
||||
.optimize = optimize,
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
.dependencies = .{
|
||||
.zig_args = .{
|
||||
.url = "git+https://git.mzte.de/mirrors/zig-args.git#89f18a104d9c13763b90e97d6b4ce133da8a3e2b",
|
||||
.hash = "12203ded54c85878eea7f12744066dcb4397177395ac49a7b2aa365bf6047b623829",
|
||||
.url = "git+https://git.mzte.de/mirrors/zig-args.git#872272205d95bdba33798c94e72c5387a31bc806",
|
||||
.hash = "1220fe6ae56b668cc4a033282b5f227bfbb46a67ede6d84e9f9493fea9de339b5f37",
|
||||
},
|
||||
},
|
||||
|
||||
|
|
6
deps.nix
6
deps.nix
|
@ -2,11 +2,11 @@
|
|||
pkgs.linkFarm "zig-packages" [
|
||||
# zig-args
|
||||
{
|
||||
name = "12203ded54c85878eea7f12744066dcb4397177395ac49a7b2aa365bf6047b623829";
|
||||
name = "1220fe6ae56b668cc4a033282b5f227bfbb46a67ede6d84e9f9493fea9de339b5f37";
|
||||
path = pkgs.fetchgit {
|
||||
url = "https://git.mzte.de/mirrors/zig-args.git";
|
||||
rev = "89f18a104d9c13763b90e97d6b4ce133da8a3e2b";
|
||||
hash = "sha256-JY0UDJSKOh1Cg46/GnhVTNmgr6TJKoHXgt8FponPCPM=";
|
||||
rev = "872272205d95bdba33798c94e72c5387a31bc806";
|
||||
hash = "sha256-H/sT6JHun+jR37fJSbsauE9K3igV/frcnD/w4Pngzc4=";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
"nodes": {
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1716293225,
|
||||
"narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=",
|
||||
"lastModified": 1718530797,
|
||||
"narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916",
|
||||
"rev": "b60ebf54c15553b393d144357375ea956f89e9a9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
dontConfigure = true;
|
||||
|
||||
nativeBuildInputs = with pkgs; [
|
||||
zig_0_12.hook
|
||||
zig_0_13.hook
|
||||
pkg-config
|
||||
luajit
|
||||
fuse3
|
||||
|
|
Loading…
Reference in a new issue