~ruther/qmk_firmware

527b1e52aa0c87d49b90ea18d7d3ca9728aaa9c2 — Joel Challis 4 years ago a84de5e
Move nix folder alongside vagrant (#14132)

M shell.nix => shell.nix +2 -2
@@ 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


R nix/poetry.lock => util/nix/poetry.lock +0 -0
R nix/pyproject.toml => util/nix/pyproject.toml +0 -0
R nix/sources.json => util/nix/sources.json +0 -0
R nix/sources.nix => util/nix/sources.nix +0 -0