Browse Source

Move nix folder alongside vagrant (#14132)

pull/12797/head
Joel Challis 2 years ago
committed by GitHub
parent
commit
527b1e52aa
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 2 additions and 2 deletions
  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 View File

@ -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


nix/poetry.lock → util/nix/poetry.lock View File


nix/pyproject.toml → util/nix/pyproject.toml View File


nix/sources.json → util/nix/sources.json View File


nix/sources.nix → util/nix/sources.nix View File


Loading…
Cancel
Save