You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

59 lines
1.8 KiB

Update the nix-shell environment (#13316) * 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 )
2 years ago
3 years ago
  1. { avr ? true, arm ? true, teensy ? true }:
  2. let
  3. # We specify sources via Niv: use "niv update nixpkgs" to update nixpkgs, for example.
  4. sources = import ./util/nix/sources.nix { };
  5. pkgs = import sources.nixpkgs { };
  6. poetry2nix = pkgs.callPackage (import sources.poetry2nix) { };
  7. # Builds the python env based on nix/pyproject.toml and
  8. # nix/poetry.lock Use the "poetry update --lock", "poetry add
  9. # --lock" etc. in the nix folder to adjust the contents of those
  10. # files if the requirements*.txt files change
  11. pythonEnv = poetry2nix.mkPoetryEnv {
  12. projectDir = ./util/nix;
  13. overrides = poetry2nix.overrides.withDefaults (self: super: {
  14. qmk = super.qmk.overridePythonAttrs(old: {
  15. # Allow QMK CLI to run "bin/qmk" as a subprocess (the wrapper changes
  16. # $PATH and breaks these invocations).
  17. dontWrapPythonPrograms = true;
  18. });
  19. });
  20. };
  21. in
  22. with pkgs;
  23. let
  24. avrlibc = pkgsCross.avr.libcCross;
  25. avr_incflags = [
  26. "-isystem ${avrlibc}/avr/include"
  27. "-B${avrlibc}/avr/lib/avr5"
  28. "-L${avrlibc}/avr/lib/avr5"
  29. "-B${avrlibc}/avr/lib/avr35"
  30. "-L${avrlibc}/avr/lib/avr35"
  31. "-B${avrlibc}/avr/lib/avr51"
  32. "-L${avrlibc}/avr/lib/avr51"
  33. ];
  34. in
  35. mkShell {
  36. name = "qmk-firmware";
  37. buildInputs = [ clang-tools dfu-programmer dfu-util diffutils git pythonEnv poetry niv ]
  38. ++ lib.optional avr [
  39. pkgsCross.avr.buildPackages.binutils
  40. pkgsCross.avr.buildPackages.gcc8
  41. avrlibc
  42. avrdude
  43. ]
  44. ++ lib.optional arm [ gcc-arm-embedded ]
  45. ++ lib.optional teensy [ teensy-loader-cli ];
  46. AVR_CFLAGS = lib.optional avr avr_incflags;
  47. AVR_ASFLAGS = lib.optional avr avr_incflags;
  48. shellHook = ''
  49. # Prevent the avr-gcc wrapper from picking up host GCC flags
  50. # like -iframework, which is problematic on Darwin
  51. unset NIX_CFLAGS_COMPILE_FOR_TARGET
  52. '';
  53. }