From 527b1e52aa0c87d49b90ea18d7d3ca9728aaa9c2 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 25 Aug 2021 15:27:48 +0100
Subject: [PATCH] Move nix folder alongside vagrant (#14132)

---
 shell.nix                        | 4 ++--
 {nix => util/nix}/poetry.lock    | 0
 {nix => util/nix}/pyproject.toml | 0
 {nix => util/nix}/sources.json   | 0
 {nix => util/nix}/sources.nix    | 0
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename {nix => util/nix}/poetry.lock (100%)
 rename {nix => util/nix}/pyproject.toml (100%)
 rename {nix => util/nix}/sources.json (100%)
 rename {nix => util/nix}/sources.nix (100%)

diff --git a/shell.nix b/shell.nix
index a04e251b5..74656032a 100644
--- 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 b/util/nix/poetry.lock
similarity index 100%
rename from nix/poetry.lock
rename to util/nix/poetry.lock
diff --git a/nix/pyproject.toml b/util/nix/pyproject.toml
similarity index 100%
rename from nix/pyproject.toml
rename to util/nix/pyproject.toml
diff --git a/nix/sources.json b/util/nix/sources.json
similarity index 100%
rename from nix/sources.json
rename to util/nix/sources.json
diff --git a/nix/sources.nix b/util/nix/sources.nix
similarity index 100%
rename from nix/sources.nix
rename to util/nix/sources.nix