diff options
| -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 @@ | |||
| 1 | { avr ? true, arm ? true, teensy ? true }: | 1 | { avr ? true, arm ? true, teensy ? true }: |
| 2 | let | 2 | let |
| 3 | # We specify sources via Niv: use "niv update nixpkgs" to update nixpkgs, for example. | 3 | # We specify sources via Niv: use "niv update nixpkgs" to update nixpkgs, for example. |
| 4 | sources = import ./nix/sources.nix { }; | 4 | sources = import ./util/nix/sources.nix { }; |
| 5 | pkgs = import sources.nixpkgs { }; | 5 | pkgs = import sources.nixpkgs { }; |
| 6 | 6 | ||
| 7 | poetry2nix = pkgs.callPackage (import sources.poetry2nix) { }; | 7 | poetry2nix = pkgs.callPackage (import sources.poetry2nix) { }; |
| @@ -11,7 +11,7 @@ let | |||
| 11 | # --lock" etc. in the nix folder to adjust the contents of those | 11 | # --lock" etc. in the nix folder to adjust the contents of those |
| 12 | # files if the requirements*.txt files change | 12 | # files if the requirements*.txt files change |
| 13 | pythonEnv = poetry2nix.mkPoetryEnv { | 13 | pythonEnv = poetry2nix.mkPoetryEnv { |
| 14 | projectDir = ./nix; | 14 | projectDir = ./util/nix; |
| 15 | }; | 15 | }; |
| 16 | in | 16 | in |
| 17 | 17 | ||
diff --git a/nix/poetry.lock b/util/nix/poetry.lock index 1a1aefe21..1a1aefe21 100644 --- a/nix/poetry.lock +++ b/util/nix/poetry.lock | |||
diff --git a/nix/pyproject.toml b/util/nix/pyproject.toml index a81336189..a81336189 100644 --- a/nix/pyproject.toml +++ b/util/nix/pyproject.toml | |||
diff --git a/nix/sources.json b/util/nix/sources.json index caf5cb7d2..caf5cb7d2 100644 --- a/nix/sources.json +++ b/util/nix/sources.json | |||
diff --git a/nix/sources.nix b/util/nix/sources.nix index 1938409dd..1938409dd 100644 --- a/nix/sources.nix +++ b/util/nix/sources.nix | |||