瀏覽代碼

Move nix folder alongside vagrant (#14132)

Joel Challis 3 年之前
父節點
當前提交
527b1e52aa
共有 5 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      shell.nix
  2. 0 0
      util/nix/poetry.lock
  3. 0 0
      util/nix/pyproject.toml
  4. 0 0
      util/nix/sources.json
  5. 0 0
      util/nix/sources.nix

+ 2 - 2
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
 

+ 0 - 0
nix/poetry.lock → util/nix/poetry.lock


+ 0 - 0
nix/pyproject.toml → util/nix/pyproject.toml


+ 0 - 0
nix/sources.json → util/nix/sources.json


+ 0 - 0
nix/sources.nix → util/nix/sources.nix