From ffaa3f74ec8d70a0d7810c8ee155f4fd6e0a9e32 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Tue, 9 Jun 2020 16:11:08 +0800
Subject: [PATCH] artiq-full: fix conda paths

---
 artiq-full/conda-artiq-board.nix | 2 +-
 artiq-full/extras.nix            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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 ? {}}:
       {