This commit is contained in:
Jeffrey C. Ollie 2024-12-08 14:54:09 -06:00
parent 262b9a6c5d
commit b009ce9ee1
Signed by: jeff
GPG key ID: 6F86035A6D97044E
2 changed files with 6 additions and 44 deletions

View file

@ -18,40 +18,24 @@
"type": "github" "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1718541509, "lastModified": 1720542800,
"narHash": "sha256-TmC5TxW5WPAfmovDzi1hLe1i4qqND79s9SH9UOKcSvo=", "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ba06293cdba1c94af9710024abf3b94cf8d76349", "rev": "feb2849fdeb70028c70d73b848214b00d324a497",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-unstable-small", "ref": "nixos-unstable",
"type": "indirect" "type": "indirect"
} }
}, },
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"make-shell": "make-shell",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
}, },

View file

@ -3,23 +3,11 @@
inputs = { inputs = {
nixpkgs = { nixpkgs = {
url = "nixpkgs/nixos-unstable-small"; url = "nixpkgs/nixos-unstable";
}; };
flake-utils = { flake-utils = {
url = "github:numtide/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 = { outputs = {
@ -27,27 +15,17 @@
flake-utils, flake-utils,
... ...
} @ inputs: let } @ inputs: let
overlays = [
# (
# final: prev: {
# zigpkgs = inputs.zig.packages.${prev.system};
# }
# )
];
# systems = builtins.attrNames inputs.zig.packages;
in in
flake-utils.lib.eachDefaultSystem ( flake-utils.lib.eachDefaultSystem (
system: let system: let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit overlays system; inherit system;
}; };
in { in {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
nativeBuildInputs = [ nativeBuildInputs = [
pkgs.hidapi pkgs.hidapi
pkgs.zig_0_13 pkgs.zig_0_13
# inputs.zig.packages.${system}.master
# inputs.zls.packages.${system}.zls
]; ];
buildInputs = [ buildInputs = [
pkgs.hidapi pkgs.hidapi