diff options
author | Nick Brassel <nick@tzarc.org> | 2022-08-28 14:23:01 +1000 |
---|---|---|
committer | Nick Brassel <nick@tzarc.org> | 2022-08-28 14:23:01 +1000 |
commit | 0a3f7e48690bb2b7b008300a54554979a55be19a (patch) | |
tree | 7499d52f20040ed7d5a56496ecb81ed114f80719 /shell.nix | |
parent | fc0bf67f372c38f72c303cdec21b1d4afb5e8cb4 (diff) | |
parent | 9b5b0722555891ba94f240760ef3a6d4c870fd13 (diff) | |
download | qmk_firmware-0a3f7e48690bb2b7b008300a54554979a55be19a.tar.gz qmk_firmware-0a3f7e48690bb2b7b008300a54554979a55be19a.zip |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'shell.nix')
-rw-r--r-- | shell.nix | 22 |
1 files changed, 21 insertions, 1 deletions
@@ -1,9 +1,29 @@ 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 { } +{ pkgs ? import sources.nixpkgs { overlays = [ pythonOverlay ]; } , poetry2nix ? pkgs.callPackage (import sources.poetry2nix) { } , avr ? true , arm ? true |