diff --git a/flake.lock b/flake.lock index e050546..98cbb51 100644 --- a/flake.lock +++ b/flake.lock @@ -18,40 +18,24 @@ "type": "github" } }, - "make-shell": { - "locked": { - "lastModified": 1634940815, - "narHash": "sha256-P69OmveboXzS+es1vQGS4bt+ckwbeIExqxfGLjGuJqA=", - "owner": "ursi", - "repo": "nix-make-shell", - "rev": "8add91681170924e4d0591b22f294aee3f5516f9", - "type": "github" - }, - "original": { - "owner": "ursi", - "repo": "nix-make-shell", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1718541509, - "narHash": "sha256-TmC5TxW5WPAfmovDzi1hLe1i4qqND79s9SH9UOKcSvo=", + "lastModified": 1720542800, + "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ba06293cdba1c94af9710024abf3b94cf8d76349", + "rev": "feb2849fdeb70028c70d73b848214b00d324a497", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", "type": "indirect" } }, "root": { "inputs": { "flake-utils": "flake-utils", - "make-shell": "make-shell", "nixpkgs": "nixpkgs" } }, diff --git a/flake.nix b/flake.nix index 4df2f7a..e0cb1e6 100644 --- a/flake.nix +++ b/flake.nix @@ -3,23 +3,11 @@ inputs = { nixpkgs = { - url = "nixpkgs/nixos-unstable-small"; + url = "nixpkgs/nixos-unstable"; }; flake-utils = { url = "github:numtide/flake-utils"; }; - make-shell = { - url = "github:ursi/nix-make-shell"; - }; - # zig = { - # url = "github:mitchellh/zig-overlay"; - # }; - # zls = { - # url = "github:zigtools/zls"; - # inputs.nixpkgs.follows = "nixpkgs"; - # inputs.zig-overlay.follows = "zig"; - # inputs.flake-utils.follows = "flake-utils"; - # }; }; outputs = { @@ -27,27 +15,17 @@ flake-utils, ... } @ inputs: let - overlays = [ - # ( - # final: prev: { - # zigpkgs = inputs.zig.packages.${prev.system}; - # } - # ) - ]; - # systems = builtins.attrNames inputs.zig.packages; in flake-utils.lib.eachDefaultSystem ( system: let pkgs = import nixpkgs { - inherit overlays system; + inherit system; }; in { devShells.default = pkgs.mkShell { nativeBuildInputs = [ pkgs.hidapi pkgs.zig_0_13 - # inputs.zig.packages.${system}.master - # inputs.zls.packages.${system}.zls ]; buildInputs = [ pkgs.hidapi