diff --git a/flake.lock b/flake.lock index 35600de..d329141 100644 --- a/flake.lock +++ b/flake.lock @@ -1,57 +1,42 @@ { "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", - "type": "github" + "lastModified": 1772198003, + "narHash": "sha256-UCaQQ8zmHUocQIgCl+53Jj6NuwqrVKtmv7obE9r6wnw=", + "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre955442.dd9b079222d4/nixexprs.tar.xz" }, "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, "root": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "zig": "zig" } }, - "systems": { + "zig": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" + "lastModified": 1772339787, + "narHash": "sha256-GoQhRJV7L+SPc4goVhOF9N9Wd7PA42e40d+h7MVgVCI=", + "ref": "refs/heads/main", + "rev": "05eab00ce62b16af581338ff73d67de55c681d9e", + "revCount": 1629, + "type": "git", + "url": "https://git.ocjtech.us/jeff/zig-overlay.git" }, "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" + "type": "git", + "url": "https://git.ocjtech.us/jeff/zig-overlay.git" } } }, diff --git a/flake.nix b/flake.nix index 2496fa9..114a1b6 100644 --- a/flake.nix +++ b/flake.nix @@ -1,30 +1,46 @@ { inputs = { nixpkgs = { - url = "nixpkgs/nixos-unstable"; + url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"; }; - flake-utils = { - url = "github:numtide/flake-utils"; + zig = { + url = "git+https://git.ocjtech.us/jeff/zig-overlay.git"; + inputs = { + nixpkgs.follows = "nixpkgs"; + }; }; }; - outputs = { - nixpkgs, - flake-utils, - ... - }: - flake-utils.lib.eachDefaultSystem ( - system: let - pkgs = import nixpkgs { + outputs = + { + nixpkgs, + zig, + ... + }: + let + lib = nixpkgs.lib; + platforms = lib.attrNames zig.packages; + makePackages = + system: + import nixpkgs { inherit system; + overlays = [ ]; }; - in { - devShells.default = pkgs.mkShell { + forAllSystems = (function: lib.genAttrs platforms (system: function (makePackages system))); + in + { + devShells = forAllSystems (pkgs: { + default = pkgs.mkShell { nativeBuildInputs = [ - pkgs.zig_0_14 + zig.packages.${pkgs.stdenv.hostPlatform.system}.master + pkgs.pkg-config + pkgs.reuse + pkgs.pinact + ]; + buildInputs = [ pkgs.notmuch ]; }; - } - ); + }); + }; }