mirror of
https://github.com/openstenoproject/qmk
synced 2024-11-14 12:34:39 +00:00
a1866a962c
* Nix: Allow calls to `bin/qmk` even when the build was started by `qmk`
The `$PATH` modifications performed by the Nix wrapper for the `qmk`
executable prevent `bin/qmk` from working properly (the changed `$PATH`
contains a wrong `python3` executable which does not have the needed
Python modules in its module path). As a workaround, disable the
generation of that wrapper for the `qmk` Python package (there is yet
another wrapper generated while building the Python environment, which
would still set the Python module path properly when running `qmk`).
Although `bin/qmk` is officially deprecated, QMK CLI still invokes it in
some cases (at least `qmk doctor` and `qmk pytest`), therefore keeping
these invocations working is useful.
* Nix: Update `util/nix/pyproject.toml` to match `requirements*.txt`
Update the Python dependency information used by Poetry to match the
current state of the qmk_firmware code.
* Nix: Bump QMK CLI dependency to 1.0.0; bump other Python deps
Update Python dependencies for nix-shell to the most recent releases:
- dotty-dict: 1.3.0 -> no longer used
- milc: 1.4.2 -> 1.6.2
- pep8-naming: 0.11.1 -> 0.12.1
- pygments: 2.9.0 -> 2.10.0
- pyrsistent: 0.17.3 -> 0.18.0
- pyusb: 1.1.1 -> 1.2.1
- setuptools-scm: 6.0.1 -> no longer used
- qmk: 0.1.0 -> 1.0.0
- qmk-dotty-dict: not used -> 1.3.0.post1
- yapf: 0.30.0 -> 0.31.0
Note to self: The command to update Python dependencies changed to:
( cd util/nix && nix run 'nixpkgs#poetry' -- update --lock )
59 lines
1.8 KiB
Nix
59 lines
1.8 KiB
Nix
{ avr ? true, arm ? true, teensy ? true }:
|
|
let
|
|
# We specify sources via Niv: use "niv update nixpkgs" to update nixpkgs, for example.
|
|
sources = import ./util/nix/sources.nix { };
|
|
pkgs = import sources.nixpkgs { };
|
|
|
|
poetry2nix = pkgs.callPackage (import sources.poetry2nix) { };
|
|
|
|
# Builds the python env based on nix/pyproject.toml and
|
|
# nix/poetry.lock Use the "poetry update --lock", "poetry add
|
|
# --lock" etc. in the nix folder to adjust the contents of those
|
|
# files if the requirements*.txt files change
|
|
pythonEnv = poetry2nix.mkPoetryEnv {
|
|
projectDir = ./util/nix;
|
|
overrides = poetry2nix.overrides.withDefaults (self: super: {
|
|
qmk = super.qmk.overridePythonAttrs(old: {
|
|
# Allow QMK CLI to run "bin/qmk" as a subprocess (the wrapper changes
|
|
# $PATH and breaks these invocations).
|
|
dontWrapPythonPrograms = true;
|
|
});
|
|
});
|
|
};
|
|
in
|
|
|
|
with pkgs;
|
|
let
|
|
avrlibc = pkgsCross.avr.libcCross;
|
|
|
|
avr_incflags = [
|
|
"-isystem ${avrlibc}/avr/include"
|
|
"-B${avrlibc}/avr/lib/avr5"
|
|
"-L${avrlibc}/avr/lib/avr5"
|
|
"-B${avrlibc}/avr/lib/avr35"
|
|
"-L${avrlibc}/avr/lib/avr35"
|
|
"-B${avrlibc}/avr/lib/avr51"
|
|
"-L${avrlibc}/avr/lib/avr51"
|
|
];
|
|
in
|
|
mkShell {
|
|
name = "qmk-firmware";
|
|
|
|
buildInputs = [ clang-tools dfu-programmer dfu-util diffutils git pythonEnv poetry niv ]
|
|
++ lib.optional avr [
|
|
pkgsCross.avr.buildPackages.binutils
|
|
pkgsCross.avr.buildPackages.gcc8
|
|
avrlibc
|
|
avrdude
|
|
]
|
|
++ lib.optional arm [ gcc-arm-embedded ]
|
|
++ lib.optional teensy [ teensy-loader-cli ];
|
|
|
|
AVR_CFLAGS = lib.optional avr avr_incflags;
|
|
AVR_ASFLAGS = lib.optional avr avr_incflags;
|
|
shellHook = ''
|
|
# Prevent the avr-gcc wrapper from picking up host GCC flags
|
|
# like -iframework, which is problematic on Darwin
|
|
unset NIX_CFLAGS_COMPILE_FOR_TARGET
|
|
'';
|
|
}
|