From 29999608d3fd39e6565afa8ff75009ceb2cd49ff Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Sun, 8 Feb 2026 21:45:23 -0600 Subject: [PATCH] update flake for Zig 0.16 --- flake.lock | 92 ++++++++++-------------------------------------------- flake.nix | 54 +++++++++++++++++--------------- 2 files changed, 45 insertions(+), 101 deletions(-) diff --git a/flake.lock b/flake.lock index c1ca50a..2b59ca3 100644 --- a/flake.lock +++ b/flake.lock @@ -1,101 +1,43 @@ { "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "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": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", - "type": "github" + "lastModified": 1770537093, + "narHash": "sha256-XV30uo8tXuxdzuV8l3sojmlPRLd/8tpMsOp4lNzLGUo=", + "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre942631.fef9403a3e4d/nixexprs.tar.xz" }, "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" + "type": "tarball", + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" } }, "root": { "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "zig": "zig" } }, - "systems": { - "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" - ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1754741556, - "narHash": "sha256-Oz6tfp+F46PmztcOztfm+iCoxxxo7rZjkvr7ybQfnsQ=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "c679cb6fd22ced1bd303babf4ca9fd499691ebb9", - "type": "github" + "lastModified": 1770573648, + "narHash": "sha256-ZYkW9v9eJUn824JR/JNueSf10S/wZba6XUfAjaF5lSw=", + "ref": "main", + "rev": "7689164de1b681b62fc8ec0b10f4f2e35a436dc6", + "revCount": 1616, + "type": "git", + "url": "https://git.ocjtech.us/jeff/zig-overlay.git" }, "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" + "ref": "main", + "type": "git", + "url": "https://git.ocjtech.us/jeff/zig-overlay.git" } } }, diff --git a/flake.nix b/flake.nix index 7638f29..c0bf85d 100644 --- a/flake.nix +++ b/flake.nix @@ -3,42 +3,44 @@ inputs = { nixpkgs = { - url = "nixpkgs/nixos-unstable"; - }; - flake-utils = { - url = "github:numtide/flake-utils"; - }; - flake-compat = { - url = "github:edolstra/flake-compat"; - flake = false; + url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"; }; zig = { - url = "github:mitchellh/zig-overlay"; + url = "git+https://git.ocjtech.us/jeff/zig-overlay.git?ref=main"; inputs = { nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "flake-utils"; - flake-compat.follows = "flake-compat"; }; }; }; - outputs = { - nixpkgs, - flake-utils, - zig, - ... - }: let - in - flake-utils.lib.eachDefaultSystem ( - system: let - pkgs = import nixpkgs { + outputs = + { + nixpkgs, + zig, + ... + }: + let + packages = + system: + import nixpkgs { inherit system; }; - in { - devShells.default = pkgs.mkShell { + forAllSystems = + function: + nixpkgs.lib.genAttrs [ + "aarch64-linux" + "aarch64-darwin" + "x86_64-darwin" + "x86_64-linux" + ] (system: function (packages system)); + + in + { + devShells = forAllSystems (pkgs: { + default = pkgs.mkShell { name = "zig-hidapi"; nativeBuildInputs = [ - zig.packages.${system}.master + zig.packages.${pkgs.stdenv.hostPlatform.system}.master # pkgs.zig_0_14 # pkgs.hidapi ]; @@ -49,6 +51,6 @@ # # pkgs.hidapi # ]; }; - } - ); + }); + }; } -- knotmirror 0.0.1