Browse Source

move manual to artiq-full

master
Sebastien Bourdeauducq 8 months ago
parent
commit
c5ade34066
5 changed files with 53 additions and 51 deletions
  1. 1
    5
      artiq-fast/default.nix
  2. 1
    43
      artiq-fast/pkgs/python-deps.nix
  3. 5
    0
      artiq-full.nix
  4. 3
    3
      artiq-full/manual.nix
  5. 43
    0
      artiq-full/python-deps.nix

+ 1
- 5
artiq-fast/default.nix View File

@@ -22,10 +22,6 @@ let
boardBinaries = boardBinaries;
};
}) {} boards;
manualPackages = import ./pkgs/artiq-manual.nix {
inherit stdenv lib fetchgit git python3Packages texlive texinfo;
inherit (pythonDeps) sphinxcontrib-wavedrom;
};
mainPackages = rec {
inherit (pythonDeps) asyncserial levenshtein pythonparser quamash pyqtgraph-qt5 misoc migen microscope jesd204b lit outputcheck wavedrom sphinxcontrib-wavedrom;
binutils-or1k = callPackage ./pkgs/binutils-or1k.nix {};
@@ -41,7 +37,7 @@ let
artiq-env = (pkgs.python3.withPackages(ps: [ artiq ])).overrideAttrs (oldAttrs: { name = "${pkgs.python3.name}-artiq-env-${artiq.version}"; });
openocd = callPackage ./pkgs/openocd.nix {};
conda-artiq = import ./conda-artiq.nix { inherit pkgs; };
} // boardPackages // manualPackages;
} // boardPackages;
extraPackages = import ./artiq-extras.nix { inherit pkgs; inherit (mainPackages) asyncserial artiq; };
in
mainPackages // extraPackages

+ 1
- 43
artiq-fast/pkgs/python-deps.nix View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, python, python3Packages }:
{ stdenv, fetchFromGitHub, python3Packages }:

rec {
# User dependencies
@@ -199,46 +199,4 @@ rec {
license = licenses.bsd3;
};
};


# Documentation building dependencies
wavedrom = python3Packages.buildPythonPackage rec {
pname = "wavedrom";
version = "0.1";

src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "006w683zlmmwcw5xz1n5dwg34ims5jg3gl2700ql4wr0myjz6710";
};

buildInputs = [ python3Packages.setuptools_scm ];
propagatedBuildInputs = with python3Packages; [ svgwrite attrdict ];
doCheck = false;

meta = with stdenv.lib; {
description = "WaveDrom compatible Python module and command line";
homepage = "https://pypi.org/project/wavedrom/";
license = licenses.mit;
};
};

sphinxcontrib-wavedrom = python3Packages.buildPythonPackage rec {
pname = "sphinxcontrib-wavedrom";
version = "2.0.0";

src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "0nk36zqq5ipxqx9izz2iazb3iraasanv3nm05bjr21gw42zgkz22";
};

buildInputs = [ python3Packages.setuptools_scm ];
propagatedBuildInputs = [ wavedrom ] ++ (with python3Packages; [ sphinx xcffib cairosvg ]);
doCheck = false;

meta = with stdenv.lib; {
description = "A Sphinx extension that allows including WaveDrom diagrams";
homepage = "https://pypi.org/project/sphinxcontrib-wavedrom/";
license = licenses.mit;
};
};
}

+ 5
- 0
artiq-full.nix View File

@@ -107,6 +107,11 @@ let
}
EOF
'';
pythonDeps = import ./artiq-full/pythonDeps.nix { inherit pkgs; };
manualPackages = import ./artiq-full/manual.nix {
inherit (pkgs) stdenv lib fetchgit git python3Packages texlive texinfo;
inherit (pythonDeps) sphinxcontrib-wavedrom;
};
jobs = builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) (import generatedNix { inherit pkgs; }) // {
# This is in the example in the ARTIQ manual - precompile it to speed up
# installation for users.

artiq-fast/pkgs/artiq-manual.nix → artiq-full/manual.nix View File

@@ -1,7 +1,7 @@
{ stdenv, lib, fetchgit, git, python3Packages, texlive, texinfo, sphinxcontrib-wavedrom }:

let
artiqVersion = import ./artiq-version.nix { inherit stdenv fetchgit git; };
artiqVersion = import <artiq-fast/artiq-version.nix> { inherit stdenv fetchgit git; };

isLatexPdfTarget = target: builtins.match "latexpdf.*" target != null;

@@ -16,7 +16,7 @@ let
name = "artiq-manual-${target}-${version}";
version = artiqVersion;

src = import ./artiq-src.nix { inherit fetchgit; };
src = import <artiq-fast/artiq-src.nix> { inherit fetchgit; };
buildInputs = [
python3Packages.sphinx python3Packages.sphinx_rtd_theme
python3Packages.sphinx-argparse sphinxcontrib-wavedrom
@@ -26,7 +26,7 @@ let

preBuild = ''
export VERSIONEER_OVERRIDE=${artiqVersion}
export SOURCE_DATE_EPOCH=${import ./artiq-timestamp.nix { inherit stdenv fetchgit git; }}
export SOURCE_DATE_EPOCH=${import <artiq-fast/artiq-timestamp.nix> { inherit stdenv fetchgit git; }}
cd doc/manual
'';
makeFlags = [ target ];

+ 43
- 0
artiq-full/python-deps.nix View File

@@ -0,0 +1,43 @@
{ pkgs }:

rec {
wavedrom = pkgs.python3Packages.buildPythonPackage rec {
pname = "wavedrom";
version = "0.1";

src = pkgs.python3Packages.fetchPypi {
inherit pname version;
sha256 = "006w683zlmmwcw5xz1n5dwg34ims5jg3gl2700ql4wr0myjz6710";
};

buildInputs = [ pkgs.python3Packages.setuptools_scm ];
propagatedBuildInputs = with pkgs.python3Packages; [ svgwrite attrdict ];
doCheck = false;

meta = with pkgs.stdenv.lib; {
description = "WaveDrom compatible Python module and command line";
homepage = "https://pypi.org/project/wavedrom/";
license = licenses.mit;
};
};

sphinxcontrib-wavedrom = pkgs.python3Packages.buildPythonPackage rec {
pname = "sphinxcontrib-wavedrom";
version = "2.0.0";

src = pkgs.python3Packages.fetchPypi {
inherit pname version;
sha256 = "0nk36zqq5ipxqx9izz2iazb3iraasanv3nm05bjr21gw42zgkz22";
};

buildInputs = [ pkgs.python3Packages.setuptools_scm ];
propagatedBuildInputs = [ wavedrom ] ++ (with pkgs.python3Packages; [ sphinx xcffib cairosvg ]);
doCheck = false;

meta = with pkgs.stdenv.lib; {
description = "A Sphinx extension that allows including WaveDrom diagrams";
homepage = "https://pypi.org/project/sphinxcontrib-wavedrom/";
license = licenses.mit;
};
};
}

Loading…
Cancel
Save