diff --git a/flake.lock b/flake.lock index 1e6803a..5265071 100644 --- a/flake.lock +++ b/flake.lock @@ -15,22 +15,6 @@ "url": "https://git.ocjtech.us/jeff/nixos-bash-prompt-builder.git" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -49,72 +33,6 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "zls", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1694102001, - "narHash": "sha256-vky6VPK1n1od6vXbqzOXnekrQpTL4hbPAwUhT5J9c9E=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "9e21c80adf67ebcb077d75bd5e7d724d21eeafd6", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "langref": { - "flake": false, - "locked": { - "narHash": "sha256-mYdDCBdNEIeMbavdhSo8qXqW+3fqPC8BAich7W3umrI=", - "type": "file", - "url": "https://raw.githubusercontent.com/ziglang/zig/63bd2bff12992aef0ce23ae4b344e9cb5d65f05d/doc/langref.html.in" - }, - "original": { - "type": "file", - "url": "https://raw.githubusercontent.com/ziglang/zig/63bd2bff12992aef0ce23ae4b344e9cb5d65f05d/doc/langref.html.in" - } - }, "make-shell": { "locked": { "lastModified": 1634940815, @@ -150,9 +68,7 @@ "bash": "bash", "flake-utils": "flake-utils", "make-shell": "make-shell", - "nixpkgs": "nixpkgs", - "zig": "zig", - "zls": "zls" + "nixpkgs": "nixpkgs" } }, "systems": { @@ -169,69 +85,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "zig": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1697285248, - "narHash": "sha256-CPV/LWV/2nJKasawkshdCX1bLRsKGtSSiDoy14jix8c=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "ee376d4012e3c853123ca7083af852313235407c", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } - }, - "zls": { - "inputs": { - "flake-utils": "flake-utils_3", - "gitignore": "gitignore", - "langref": "langref", - "nixpkgs": [ - "nixpkgs" - ], - "zig-overlay": [ - "zig" - ] - }, - "locked": { - "lastModified": 1697187644, - "narHash": "sha256-O1u6ysfQXbu2+DOFCLzG8xUNrUxsJ1v1GajTgfWWVm0=", - "owner": "zigtools", - "repo": "zls", - "rev": "8673e747dedf52bd85e165b7be9605a56cb669d5", - "type": "github" - }, - "original": { - "owner": "zigtools", - "repo": "zls", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index a08dbf0..ee96f29 100644 --- a/flake.nix +++ b/flake.nix @@ -14,22 +14,10 @@ make-shell = { url = "github:ursi/nix-make-shell"; }; - zig = { - url = "github:mitchellh/zig-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - zls = { - url = "github:zigtools/zls"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.zig-overlay.follows = "zig"; - }; }; outputs = { self, nixpkgs, flake-utils, bash, ... }@inputs: - let - systems = builtins.attrNames inputs.zig.packages; - in - flake-utils.lib.eachSystem systems ( + flake-utils.lib.eachDefaultSystem ( system: let pkgs = import nixpkgs { @@ -53,8 +41,9 @@ in make-shell { packages = [ - inputs.zig.packages.${system}.master - # inputs.zls.packages.${system}.zls + pkgs.zon2nix + pkgs.zig_0_11 + pkgs.zls ]; env = { PS1 = prompt; diff --git a/src/main.zig b/src/main.zig index fb0e008..b7c7b11 100644 --- a/src/main.zig +++ b/src/main.zig @@ -258,7 +258,7 @@ pub const DateTime = struct { if (self.year < 0) { try writer.writeAll("-"); } - try writer.print("{d:0>4}", .{@abs(self.year)}); + try writer.print("{d:0>4}", .{std.math.absCast(self.year)}); }, .A => try writeTwelveHour(self.hour, .upper),