M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

remove unnecessary artiq dependency in manual

This commit is contained in:
Sebastien Bourdeauducq 2019-02-26 16:43:51 +08:00
parent d12b4c98c9
commit 8e686e2101
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/default.nix
View File

@ -37,7 +37,7 @@ in
llvm-or1k = callPackage ./pkgs/llvm-or1k.nix { inherit llvm-src; }; llvm-or1k = callPackage ./pkgs/llvm-or1k.nix { inherit llvm-src; };
llvmlite-artiq = callPackage ./pkgs/llvmlite-artiq.nix { inherit llvm-or1k; }; llvmlite-artiq = callPackage ./pkgs/llvmlite-artiq.nix { inherit llvm-or1k; };
artiq = callPackage ./pkgs/artiq.nix { inherit binutils-or1k; inherit llvm-or1k; inherit llvmlite-artiq; }; artiq = callPackage ./pkgs/artiq.nix { inherit binutils-or1k; inherit llvm-or1k; inherit llvmlite-artiq; };
artiq-manual = callPackage ./pkgs/artiq-manual.nix { inherit artiq; }; artiq-manual = callPackage ./pkgs/artiq-manual.nix { };
openocd = callPackage ./pkgs/openocd.nix {}; openocd = callPackage ./pkgs/openocd.nix {};
conda-artiq = import ./conda-artiq.nix { inherit pkgs; }; conda-artiq = import ./conda-artiq.nix { inherit pkgs; };
} // boardPackages } // boardPackages

4
artiq/pkgs/artiq-manual.nix
View File

@ -1,7 +1,6 @@
{ stdenv, lib, { stdenv, lib,
git, fetchFromGitHub, fetchgit, git, fetchFromGitHub, fetchgit,
python3Packages, texlive, texinfo, python3Packages, texlive, texinfo
artiq
}: }:
with python3Packages; with python3Packages;
@ -106,7 +105,6 @@ let
buildInputs = [ buildInputs = [
sphinx sphinx_rtd_theme sphinx sphinx_rtd_theme
sphinx-argparse sphinxcontrib-wavedrom sphinx-argparse sphinxcontrib-wavedrom
artiq
] ++ ] ++
lib.optional (isLatexPdfTarget target) latex ++ lib.optional (isLatexPdfTarget target) latex ++
lib.optional (target == "texinfo") texinfo; lib.optional (target == "texinfo") texinfo;