summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--shell.nix4
-rw-r--r--util/nix/poetry.lock (renamed from nix/poetry.lock)0
-rw-r--r--util/nix/pyproject.toml (renamed from nix/pyproject.toml)0
-rw-r--r--util/nix/sources.json (renamed from nix/sources.json)0
-rw-r--r--util/nix/sources.nix (renamed from nix/sources.nix)0
5 files changed, 2 insertions, 2 deletions
diff --git a/shell.nix b/shell.nix
index a04e251b51..74656032a5 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
index 1a1aefe21a..1a1aefe21a 100644
--- a/nix/poetry.lock
+++ b/util/nix/poetry.lock
diff --git a/nix/pyproject.toml b/util/nix/pyproject.toml
index a813361893..a813361893 100644
--- a/nix/pyproject.toml
+++ b/util/nix/pyproject.toml
diff --git a/nix/sources.json b/util/nix/sources.json
index caf5cb7d29..caf5cb7d29 100644
--- a/nix/sources.json
+++ b/util/nix/sources.json
diff --git a/nix/sources.nix b/util/nix/sources.nix
index 1938409ddd..1938409ddd 100644
--- a/nix/sources.nix
+++ b/util/nix/sources.nix