Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nix-shell update poetry and add hidapi #13227

Closed
wants to merge 2 commits into from
Closed

Nix-shell update poetry and add hidapi #13227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
244402b
nix: update poetry per requirements.txt
rgoulter Jun 17, 2021
3fcda60
nix-shell: add hidapi
rgoulter Jun 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 110 additions & 24 deletions nix/poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions nix/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ milc = "^1.1.0"
Pygments = "^2.8.0"
dotty-dict = "^1.3.0"
jsonschema = "^3.2.0"
hid = "^1.0.4"
pyusb = "^1.1.1"

[tool.poetry.dev-dependencies]
nose2 = "^0.10.0"
Expand Down
4 changes: 2 additions & 2 deletions shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ let
in
mkShell {
name = "qmk-firmware";

buildInputs = [ clang-tools dfu-programmer dfu-util diffutils git pythonEnv poetry niv ]
buildInputs = [ clang-tools dfu-programmer dfu-util diffutils hidapi git pythonEnv poetry niv ]
++ lib.optional avr [
pkgsCross.avr.buildPackages.binutils
pkgsCross.avr.buildPackages.gcc8
Expand All @@ -46,5 +45,6 @@ mkShell {
# Prevent the avr-gcc wrapper from picking up host GCC flags
# like -iframework, which is problematic on Darwin
unset NIX_CFLAGS_COMPILE_FOR_TARGET
export LD_LIBRARY_PATH=${hidapi}/lib:$LD_LIBRARY_PATH
'';
}