diff options
| author | Joel Challis <git@zvecr.com> | 2021-08-25 15:27:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-25 15:27:48 +0100 |
| commit | 527b1e52aa0c87d49b90ea18d7d3ca9728aaa9c2 (patch) | |
| tree | 24666f21008a6d27a2b9ae10e40f9283d16ebd8a | |
| parent | a84de5e22be25e2059dfee732f5cca3ec0953a35 (diff) | |
Move nix folder alongside vagrant (#14132)
| -rw-r--r-- | shell.nix | 4 | ||||
| -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
@@ -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 |