Skip to content

Commit 16c6622

Browse files
committed
bump zig to 0.15.1
1 parent 3032fcb commit 16c6622

File tree

6 files changed

+48
-54
lines changed

6 files changed

+48
-54
lines changed

build.zig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ pub fn build(b: *std.Build) !void {
3131
test_step.dependOn(&run_tests.step);
3232

3333
const docs_step = b.step("docs", "Build documentation");
34-
const lib = b.addStaticLibrary(.{
34+
35+
const lib = b.addLibrary(.{
3536
.name = "zigplug",
3637
.root_module = zigplug,
3738
});
@@ -91,6 +92,7 @@ pub fn addClap(b: *std.Build, options: Options) !*std.Build.Step.Compile {
9192
const lib = b.addLibrary(.{
9293
.name = try std.fmt.allocPrint(b.allocator, "{s}_clap", .{options.name}),
9394
.linkage = .dynamic,
95+
.use_llvm = true,
9496
.root_module = b.createModule(.{
9597
.target = options.root_module.resolved_target,
9698
.optimize = options.root_module.optimize,

build.zig.zon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.name = .zigplug,
33
.fingerprint = 0x7af14e4424887f89,
44
.version = "0.0.0",
5-
.minimum_zig_version = "0.14.0",
5+
.minimum_zig_version = "0.15.1",
66

77
.dependencies = .{
88
.clap = .{

examples/gain/build.zig.zon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.name = .zigplug_minimal_example,
33
.fingerprint = 0xbe963eb618c4382a,
44
.version = "0.0.0",
5-
.minimum_zig_version = "0.14.0",
5+
.minimum_zig_version = "0.15.1",
66

77
.dependencies = .{
88
.zigplug = .{

examples/sine/build.zig.zon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.name = .zigplug_sine_example,
33
.fingerprint = 0xf2df38f2e9c52259,
44
.version = "0.0.0",
5-
.minimum_zig_version = "0.14.0",
5+
.minimum_zig_version = "0.15.1",
66

77
.dependencies = .{
88
.zigplug = .{

flake.lock

Lines changed: 14 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,37 @@
88
};
99
};
1010

11-
outputs = inputs @ {flake-parts, ...}:
12-
flake-parts.lib.mkFlake {inherit inputs;} {
13-
systems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin"];
14-
perSystem = {
15-
pkgs,
16-
system,
17-
...
18-
}: let
19-
zig' = inputs.zig-overlay.packages.${system}.default;
20-
in {
21-
devShells.default = pkgs.mkShell {
22-
packages = [
23-
zig'
24-
zig'.zls
25-
];
11+
outputs =
12+
inputs@{ flake-parts, ... }:
13+
flake-parts.lib.mkFlake { inherit inputs; } {
14+
systems = [
15+
"x86_64-linux"
16+
"aarch64-linux"
17+
"aarch64-darwin"
18+
"x86_64-darwin"
19+
];
20+
perSystem =
21+
{
22+
pkgs,
23+
system,
24+
...
25+
}:
26+
let
27+
zig = inputs.zig-overlay.packages.${system}."0_15_1";
28+
inherit (zig) zls;
29+
in
30+
{
31+
devShells.default = pkgs.mkShell {
32+
packages = [
33+
zig
34+
zls
35+
];
36+
};
2637
};
27-
};
2838
};
2939

3040
nixConfig = {
31-
extra-substituters = ["https://zigplug.cachix.org"];
32-
extra-trusted-public-keys = ["zigplug.cachix.org-1:RQ1LcVcTwuhlNt0P39IBG46qRfMdPR3WS1Rm7SUu8rw="];
41+
extra-substituters = [ "https://zigplug.cachix.org" ];
42+
extra-trusted-public-keys = [ "zigplug.cachix.org-1:RQ1LcVcTwuhlNt0P39IBG46qRfMdPR3WS1Rm7SUu8rw=" ];
3343
};
3444
}

0 commit comments

Comments
 (0)