Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.zig.zon
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.{
.name = .ulzig,
.version = "0.3.4",
.version = "0.4.0",
.fingerprint = 0xb86f198a4146b340, // Changing this has security and trust implications.
.minimum_zig_version = "0.15.1",
.minimum_zig_version = "0.16.0",
.dependencies = .{},
.paths = .{
"build.zig",
Expand Down
16 changes: 9 additions & 7 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 4 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{
description = "ulzig";
description = "A Zig library and small command line tool for compressing and decompressing Uxn LZ Format (ULZ) things.";

inputs = {
nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz";
};
inputs.nixpkgs.url = "nixpkgs/nixos-unstable";

outputs = {nixpkgs, ...}: let
systems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
Expand All @@ -18,10 +16,9 @@
devShells.${system}.default = pkgs.mkShell {
packages = with pkgs;
[
elfkickers
zig_0_15
zig
]
++ (pkgs.lib.optionals pkgs.stdenv.isLinux [kcov]);
++ (pkgs.lib.optionals pkgs.stdenv.isLinux [kcov elfkickers]);
};

formatter.${system} = pkgs.alejandra;
Expand Down
43 changes: 22 additions & 21 deletions package.nix
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
{
callPackage,
elfkickers,
lib,
stdenvNoCC,
makeWrapper,
zig_0_15,
}: let
zig_hook = zig_0_15.hook.overrideAttrs {
zig_default_flags = "-Dcpu=baseline -Doptimize=ReleaseSmall --color off";
};
in
stdenvNoCC.mkDerivation (
finalAttrs: {
name = "ulz";
version = "0.3.4";
src = lib.cleanSource ./.;
nativeBuildInputs = [
zig_hook
zig,
}:
stdenvNoCC.mkDerivation (
finalAttrs: {
name = "ulz";
version = "0.4.0";
src = lib.cleanSource ./.;
nativeBuildInputs =
[
zig
makeWrapper
] ++ lib.optionals stdenvNoCC.isLinux [elfkickers];
]
++ lib.optionals stdenvNoCC.isLinux [elfkickers];

meta = {
mainProgram = "ulz";
license = lib.licenses.mit;
};
}
)
zigBuildFlags = [
"-Doptimize=ReleaseSmall"
];

meta = {
mainProgram = "ulz";
license = lib.licenses.mit;
};
}
)
Loading
Loading