diff --git a/artiq-full/conda-artiq-board.nix b/artiq-full/conda-artiq-board.nix index a758316..7954320 100644 --- a/artiq-full/conda-artiq-board.nix +++ b/artiq-full/conda-artiq-board.nix @@ -40,7 +40,7 @@ let EOF chmod 755 $out/fake-conda/build.sh ''; - conda-artiq-board = import ./fast/conda-build.nix { inherit pkgs; } { + conda-artiq-board = import ./fast/conda/build.nix { inherit pkgs; } { name = "conda-artiq-board-${target}-${variant}"; src = fakeCondaSource; }; diff --git a/artiq-full/extras.nix b/artiq-full/extras.nix index 99b4640..38cc512 100644 --- a/artiq-full/extras.nix +++ b/artiq-full/extras.nix @@ -1,7 +1,7 @@ { pkgs, sipyco, asyncserial, artiq }: let - condaBuild = import ./fast/conda-build.nix { inherit pkgs; }; - condaFakeSource = import ./fast/conda-fake-source.nix { inherit pkgs; }; + condaBuild = import ./fast/conda/build.nix { inherit pkgs; }; + condaFakeSource = import ./fast/conda/fake-source.nix { inherit pkgs; }; dualPackage = ( { name, version, src, pythonOptions ? {}, condaOptions ? {}}: {