From d9f6661fa3c6d57ff162f1be5ff0d9deb2506d73 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 15 Feb 2019 17:25:57 +0800 Subject: [PATCH] consistent naming --- artiq/{conda-board.nix => conda-artiq-board.nix} | 4 ++-- main.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename artiq/{conda-board.nix => conda-artiq-board.nix} (93%) diff --git a/artiq/conda-board.nix b/artiq/conda-artiq-board.nix similarity index 93% rename from artiq/conda-board.nix rename to artiq/conda-artiq-board.nix index 4f17401..5916831 100644 --- a/artiq/conda-board.nix +++ b/artiq/conda-artiq-board.nix @@ -46,10 +46,10 @@ let EOF chmod 755 $out/fake-conda/build.sh ''; - conda-board = import ./conda-build.nix { inherit pkgs; } { + conda-artiq-board = import ./conda-build.nix { inherit pkgs; } { name = "conda-artiq-board-${target}-${variant}"; src = fakeCondaSource; recipe = "fake-conda"; }; in - conda-board + conda-artiq-board diff --git a/main.nix b/main.nix index e609252..ca84ada 100644 --- a/main.nix +++ b/main.nix @@ -31,7 +31,7 @@ let in start // { "artiq-board-${board.target}-${board.variant}" = boardBinaries; - "conda-artiq-board-${board.target}-${board.variant}" = import "${generatedNix}/conda-board.nix" { inherit pkgs; } { + "conda-artiq-board-${board.target}-${board.variant}" = import "${generatedNix}/conda-artiq-board.nix" { inherit pkgs; } { artiqSrc = import "${generatedNix}/pkgs/artiq-src.nix" { fetchgit = pkgs.fetchgit; }; boardBinaries = boardBinaries; target = board.target;