occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

use nixpkgs sphinxcontrib-wavedrom 

Signed-off-by: Florian Agbuya <fa@m-labs.ph>
This commit is contained in:
Florian Agbuya 2024-03-27 17:49:25 +08:00 committed by Sébastien Bourdeauducq
parent bc8bc952d7
commit dc0b803b19
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
flake.nix
View File

@ -335,17 +335,6 @@
paths = [ openocd-fixed bscan_spi_bitstreams-pkg ]; paths = [ openocd-fixed bscan_spi_bitstreams-pkg ];
}; };
sphinxcontrib-wavedrom = pkgs.python3Packages.buildPythonPackage rec {
pname = "sphinxcontrib-wavedrom";
version = "3.0.4";
format = "pyproject";
src = pkgs.python3Packages.fetchPypi {
inherit pname version;
sha256 = "sha256-0zTHVBr9kXwMEo4VRTFsxdX2HI31DxdHfLUHCQmw1Ko=";
};
nativeBuildInputs = [ pkgs.python3Packages.setuptools-scm ];
propagatedBuildInputs = (with pkgs.python3Packages; [ wavedrom sphinx xcffib cairosvg ]);
};
latex-artiq-manual = pkgs.texlive.combine { latex-artiq-manual = pkgs.texlive.combine {
inherit (pkgs.texlive) inherit (pkgs.texlive)
scheme-basic latexmk cmap collection-fontsrecommended fncychap scheme-basic latexmk cmap collection-fontsrecommended fncychap
@ -379,14 +368,14 @@
target = "efc"; target = "efc";
variant = "shuttler"; variant = "shuttler";
}; };
inherit sphinxcontrib-wavedrom latex-artiq-manual; inherit latex-artiq-manual;
artiq-manual-html = pkgs.stdenvNoCC.mkDerivation rec { artiq-manual-html = pkgs.stdenvNoCC.mkDerivation rec {
name = "artiq-manual-html-${version}"; name = "artiq-manual-html-${version}";
version = artiqVersion; version = artiqVersion;
src = self; src = self;
buildInputs = [ buildInputs = with pkgs.python3Packages; [
pkgs.python3Packages.sphinx pkgs.python3Packages.sphinx_rtd_theme sphinx sphinx_rtd_theme
pkgs.python3Packages.sphinx-argparse sphinxcontrib-wavedrom sphinx-argparse sphinxcontrib-wavedrom
]; ];
buildPhase = '' buildPhase = ''
export VERSIONEER_OVERRIDE=${artiqVersion} export VERSIONEER_OVERRIDE=${artiqVersion}
@ -404,11 +393,10 @@
name = "artiq-manual-pdf-${version}"; name = "artiq-manual-pdf-${version}";
version = artiqVersion; version = artiqVersion;
src = self; src = self;
buildInputs = [ buildInputs = with pkgs.python3Packages; [
pkgs.python3Packages.sphinx pkgs.python3Packages.sphinx_rtd_theme sphinx sphinx_rtd_theme
pkgs.python3Packages.sphinx-argparse sphinxcontrib-wavedrom sphinx-argparse sphinxcontrib-wavedrom
latex-artiq-manual ] ++ [ latex-artiq-manual ];
];
buildPhase = '' buildPhase = ''
export VERSIONEER_OVERRIDE=${artiq.version} export VERSIONEER_OVERRIDE=${artiq.version}
export SOURCE_DATE_EPOCH=${builtins.toString self.sourceInfo.lastModified} export SOURCE_DATE_EPOCH=${builtins.toString self.sourceInfo.lastModified}
@ -452,7 +440,7 @@
packages.x86_64-linux.vivado packages.x86_64-linux.vivado
packages.x86_64-linux.openocd-bscanspi packages.x86_64-linux.openocd-bscanspi
pkgs.python3Packages.sphinx pkgs.python3Packages.sphinx_rtd_theme pkgs.python3Packages.sphinx pkgs.python3Packages.sphinx_rtd_theme
pkgs.python3Packages.sphinx-argparse sphinxcontrib-wavedrom latex-artiq-manual pkgs.python3Packages.sphinx-argparse pkgs.python3Packages.sphinxcontrib-wavedrom latex-artiq-manual
]; ];
shellHook = '' shellHook = ''
export LIBARTIQ_SUPPORT=`libartiq-support` export LIBARTIQ_SUPPORT=`libartiq-support`