diff --git a/artiq/default.nix b/artiq/default.nix index b5078a4..9adc4f5 100644 --- a/artiq/default.nix +++ b/artiq/default.nix @@ -37,7 +37,7 @@ in llvm-or1k = callPackage ./pkgs/llvm-or1k.nix { inherit llvm-src; }; 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-manual = callPackage ./pkgs/artiq-manual.nix { inherit artiq; }; + artiq-manual = callPackage ./pkgs/artiq-manual.nix { }; openocd = callPackage ./pkgs/openocd.nix {}; conda-artiq = import ./conda-artiq.nix { inherit pkgs; }; } // boardPackages diff --git a/artiq/pkgs/artiq-manual.nix b/artiq/pkgs/artiq-manual.nix index df8e9cf..f04b260 100644 --- a/artiq/pkgs/artiq-manual.nix +++ b/artiq/pkgs/artiq-manual.nix @@ -1,7 +1,6 @@ { stdenv, lib, git, fetchFromGitHub, fetchgit, - python3Packages, texlive, texinfo, - artiq + python3Packages, texlive, texinfo }: with python3Packages; @@ -106,7 +105,6 @@ let buildInputs = [ sphinx sphinx_rtd_theme sphinx-argparse sphinxcontrib-wavedrom - artiq ] ++ lib.optional (isLatexPdfTarget target) latex ++ lib.optional (target == "texinfo") texinfo;