masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move nix folder alongside vagrant (#14132)

This commit is contained in:
Joel Challis 2021-08-25 15:27:48 +01:00 committed by GitHub
parent a84de5e22b
commit 527b1e52aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell.nix
View File

@ -1,7 +1,7 @@
{ avr ? true, arm ? true, teensy ? true }: { avr ? true, arm ? true, teensy ? true }:
let let
# We specify sources via Niv: use "niv update nixpkgs" to update nixpkgs, for example. # We specify sources via Niv: use "niv update nixpkgs" to update nixpkgs, for example.
sources = import ./nix/sources.nix { }; sources = import ./util/nix/sources.nix { };
pkgs = import sources.nixpkgs { }; pkgs = import sources.nixpkgs { };
poetry2nix = pkgs.callPackage (import sources.poetry2nix) { }; poetry2nix = pkgs.callPackage (import sources.poetry2nix) { };
@ -11,7 +11,7 @@ let
# --lock" etc. in the nix folder to adjust the contents of those # --lock" etc. in the nix folder to adjust the contents of those
# files if the requirements*.txt files change # files if the requirements*.txt files change
pythonEnv = poetry2nix.mkPoetryEnv { pythonEnv = poetry2nix.mkPoetryEnv {
projectDir = ./nix; projectDir = ./util/nix;
}; };
in in

0
nix/poetry.lock → util/nix/poetry.lock generated
View File

0
nix/pyproject.toml → util/nix/pyproject.toml
View File

0
nix/sources.json → util/nix/sources.json
View File

0
nix/sources.nix → util/nix/sources.nix
View File