Move nix folder alongside vagrant (qmk#14132)

4pplet · Aug 25, 2021 · 527b1e5 · 527b1e5
1 parent a84de5e
commit 527b1e5
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 2 deletions.
diff --git a/shell.nix b/shell.nix
@@ -1,7 +1,7 @@
 { avr ? true, arm ? true, teensy ? true }:
 let
  # 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 { };
 
  poetry2nix = pkgs.callPackage (import sources.poetry2nix) { };
@@ -11,7 +11,7 @@ let
  # --lock" etc. in the nix folder to adjust the contents of those
  # files if the requirements*.txt files change
  pythonEnv = poetry2nix.mkPoetryEnv {
- projectDir = ./nix;
+ projectDir = ./util/nix;
  };
 in
 

diff --git a/nix/poetry.lock → util/nix/poetry.lock b/nix/poetry.lock → util/nix/poetry.lock
diff --git a/nix/pyproject.toml → util/nix/pyproject.toml b/nix/pyproject.toml → util/nix/pyproject.toml
diff --git a/nix/sources.json → util/nix/sources.json b/nix/sources.json → util/nix/sources.json
diff --git a/nix/sources.nix → util/nix/sources.nix b/nix/sources.nix → util/nix/sources.nix