 7c0e5ce917
			
		
	
	
		7c0e5ce917
		
			
		
	
	
	
	
		
			
			* shell.nix: Update `tomlkit` to 0.11.4 using a Nixpkgs overlay The used Nixpkgs snapshot contains `tomlkit` version 0.7.0, which is affected by https://www.github.com/sdispater/tomlkit/issues/148; that bug is triggered by `pyproject.toml` from `jsonschema` >= 4.11.0, preventing the build of that module. Just adding `tomlkit = "*"` to the `[tool.poetry.dev-dependencies]` section of `nix/pyproject.toml` does not fix the `jsonschema` build, because `makeRemoveSpecialDependenciesHook` inside `poetry2nix` is not affected by `nix/pyproject.toml`. Add a Nixpkgs overlay which updates the `tomlkit` Python module globally, so that `poetry2nix` would also use the updated version internally. * shell.nix: Bump `poetry2nix` to the most recent version The new `poetry2nix` version includes overrides which are required for recent versions of some Python packages (in particular, `jsonschema` and `dotty-dict`). * shell.nix: Bump QMK CLI to 1.1.1; update other Python deps Update `pyproject.toml` to match `requirements*.txt`: - add `pyserial = "*"` - replace `qmk-dotty-dict = "*"` with `dotty-dict = "*"` (#18117, also required for compatibility with `qmk` 1.1.1, where this replacement had already been performed) Add build dependencies of various Python modules to `pyproject.toml`: - `hatchling`, `hatch-vcs`, `hatch-fancy-pypi-readme` (required by `jsonschema` >= 4.11.0) - `pytest` (a newer version is required to solve the dependency conflict with the `hatchling` module due to the upper bound on `pluggy`) - `flit-core` (a more recent version is required to build `tomli`) - `poetry-core` (required for `dotty-dict` >= 1.3.1, and the version from Nixpkgs does not build on Darwin due to NixOS/nix#4758) Update `poetry.lock` to use the most recent versions of Python modules. The complete list of Python module updates as listed in `poetry.lock` (note that other modules might be present in the Python environment, e.g., if they come from Nixpkgs): - `atomicwrites`: none -> 1.4.1 (but this module is not actually used, because the corresponding dependency of `pytest` is win32-only) - `attrs`: 21.4.0 -> 22.1.0 - `colorama`: 0.4.4 -> 0.4.5 - `coverage`: 6.4 -> none - `dotty-dict`: none -> 1.3.1 (used instead of `qmk-dotty-dict`) - `editables`: none -> 0.3 - `flake8`: 4.0.1 -> 5.0.4 - `flake8-polyfill`: 1.0.2 -> none - `flit-core`: none -> 3.7.1 - `hatch-fancy-pypi-readme`: none -> 22.3.0 - `hatch-vcs`: none -> 0.2.0 - `hatchling`: none -> 1.8.0 - `hjson`: 3.0.2 -> 3.1.0 - `importlib-resources`: 5.7.1 -> 5.9.0 - `iniconfig`: none -> 1.1.1 - `jsonschema`: 4.5.1 -> 4.14.0 - `mccabe`: 0.6.1 -> 0.7.0 - `nose2`: 0.11.0 -> 0.12.0 - `packaging`: none -> 21.3 - `pathspec`: none -> 0.9.0 - `pep8-naming`: 0.12.1 -> 0.13.2 - `pillow`: 9.1.1 -> 9.2.0 - `pkgutil-resolve-name`: none -> 1.3.10 - `pluggy`: none -> 1.0.0 - `poetry-core`: none -> 1.0.8 - `py`: none -> 1.11.0 - `pycodestyle`: 2.8.0 -> 2.9.1 - `pyflakes`: 2.4.0 -> 2.5.0 - `pygments`: 2.12.0 -> 2.13.0 - `pyparsing`: none -> 3.0.9 - `pyserial`: none -> 3.5 - `pytest`: none -> 7.1.2 - `qmk`: 1.1.0 -> 1.1.1 - `qmk-dotty-dict`: 1.3.0.post1 -> none (replaced by `dotty-dict`) - `setuptools-scm`: none -> 7.0.5 - `tomli`: none -> 2.0.1 - `typing-extensions`: none -> 4.3.0 - `zipp`: 3.8.0 -> 3.8.1
		
			
				
	
	
		
			88 lines
		
	
	
	
		
			3.3 KiB
		
	
	
	
		
			Nix
		
	
	
	
	
	
			
		
		
	
	
			88 lines
		
	
	
	
		
			3.3 KiB
		
	
	
	
		
			Nix
		
	
	
	
	
	
| let
 | |
|   # We specify sources via Niv: use "niv update nixpkgs" to update nixpkgs, for example.
 | |
|   sources = import ./util/nix/sources.nix { };
 | |
| 
 | |
|   # `tomlkit` >= 0.8.0 is required to build `jsonschema` >= 4.11.0 (older
 | |
|   # version do not support some valid TOML syntax: sdispater/tomlkit#148).  The
 | |
|   # updated `tomlkit` must be used by `makeRemoveSpecialDependenciesHook`
 | |
|   # inside `poetry2nix`, therefore just providing the updated version through
 | |
|   # our `nix/pyproject.toml` does not work, and using an overlay is required.
 | |
|   pythonOverlay = final: prev: {
 | |
|     python3 = prev.python3.override {
 | |
|       packageOverrides = self: super: {
 | |
|         tomlkit = super.tomlkit.overridePythonAttrs(old: rec {
 | |
|           version = "0.11.4";
 | |
|           src = super.fetchPypi {
 | |
|             inherit (old) pname;
 | |
|             inherit version;
 | |
|             sha256 = "sha256-MjWpAQ+uVDI+cnw6wG+3IHUv5mNbNCbjedrsYPvUSoM=";
 | |
|           };
 | |
|         });
 | |
|       };
 | |
|     };
 | |
|   };
 | |
| in
 | |
| # However, if you want to override Niv's inputs, this will let you do that.
 | |
| { pkgs ? import sources.nixpkgs { overlays = [ pythonOverlay ]; }
 | |
| , poetry2nix ? pkgs.callPackage (import sources.poetry2nix) { }
 | |
| , avr ? true
 | |
| , arm ? true
 | |
| , teensy ? true }:
 | |
| 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"
 | |
|   ];
 | |
| 
 | |
|   # 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: {
 | |
|       pillow = super.pillow.overridePythonAttrs(old: {
 | |
|         # Use preConfigure from nixpkgs to fix library detection issues and
 | |
|         # impurities which can break the build process; this also requires
 | |
|         # adding propagatedBuildInputs and buildInputs from the same source.
 | |
|         propagatedBuildInputs = (old.buildInputs or []) ++ pkgs.python3.pkgs.pillow.propagatedBuildInputs;
 | |
|         buildInputs = (old.buildInputs or []) ++ pkgs.python3.pkgs.pillow.buildInputs;
 | |
|         preConfigure = (old.preConfigure or "") + pkgs.python3.pkgs.pillow.preConfigure;
 | |
|       });
 | |
|       qmk = super.qmk.overridePythonAttrs(old: {
 | |
|         # Allow QMK CLI to run "qmk" as a subprocess (the wrapper changes
 | |
|         # $PATH and breaks these invocations).
 | |
|         dontWrapPythonPrograms = true;
 | |
|       });
 | |
|     });
 | |
|   };
 | |
| in
 | |
| mkShell {
 | |
|   name = "qmk-firmware";
 | |
| 
 | |
|   buildInputs = [ clang-tools dfu-programmer dfu-util diffutils git pythonEnv 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
 | |
|   '';
 | |
| }
 |