Merge pull request #160634 from SuperSandro2000/manila
This commit is contained in:
commit
55978b0512
3 changed files with 51 additions and 0 deletions
|
@ -1,7 +1,9 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonApplication
|
, buildPythonApplication
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
|
, installShellFiles
|
||||||
, pbr
|
, pbr
|
||||||
|
, openstackdocstheme
|
||||||
, oslo-config
|
, oslo-config
|
||||||
, oslo-log
|
, oslo-log
|
||||||
, oslo-serialization
|
, oslo-serialization
|
||||||
|
@ -9,6 +11,8 @@
|
||||||
, prettytable
|
, prettytable
|
||||||
, requests
|
, requests
|
||||||
, simplejson
|
, simplejson
|
||||||
|
, sphinx
|
||||||
|
, sphinxcontrib-programoutput
|
||||||
, Babel
|
, Babel
|
||||||
, osc-lib
|
, osc-lib
|
||||||
, python-keystoneclient
|
, python-keystoneclient
|
||||||
|
@ -25,6 +29,13 @@ buildPythonApplication rec {
|
||||||
sha256 = "sha256-6iAed0mtEYHguYq4Rlh4YWT8E5hNqBYPcnG9/8RMspo=";
|
sha256 = "sha256-6iAed0mtEYHguYq4Rlh4YWT8E5hNqBYPcnG9/8RMspo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
installShellFiles
|
||||||
|
openstackdocstheme
|
||||||
|
sphinx
|
||||||
|
sphinxcontrib-programoutput
|
||||||
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
pbr
|
pbr
|
||||||
oslo-config
|
oslo-config
|
||||||
|
@ -40,6 +51,12 @@ buildPythonApplication rec {
|
||||||
debtcollector
|
debtcollector
|
||||||
];
|
];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
export PATH=$out/bin:$PATH
|
||||||
|
sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man
|
||||||
|
installManPage doc/build/man/python-manilaclient.1
|
||||||
|
'';
|
||||||
|
|
||||||
# Checks moved to 'passthru.tests' to workaround infinite recursion
|
# Checks moved to 'passthru.tests' to workaround infinite recursion
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,32 @@
|
||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
, sphinx
|
||||||
|
, sphinxcontrib-serializinghtml
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "sphinxcontrib-programoutput";
|
||||||
|
version = "0.17";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "sha256-MA7puMrug1XSXMdLTRx+/RLmCNKtFl4xQdMeb7wVK38=";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
sphinx
|
||||||
|
];
|
||||||
|
|
||||||
|
# fails to import sphinxcontrib.serializinghtml
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "sphinxcontrib.programoutput" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Sphinx extension to include program output";
|
||||||
|
homepage = "https://github.com/NextThought/sphinxcontrib-programoutput";
|
||||||
|
license = licenses.bsd2;
|
||||||
|
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -9358,6 +9358,8 @@ in {
|
||||||
inherit (pkgs) plantuml;
|
inherit (pkgs) plantuml;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
sphinxcontrib-programoutput = callPackage ../development/python-modules/sphinxcontrib-programoutput { };
|
||||||
|
|
||||||
sphinxcontrib-qthelp = callPackage ../development/python-modules/sphinxcontrib-qthelp { };
|
sphinxcontrib-qthelp = callPackage ../development/python-modules/sphinxcontrib-qthelp { };
|
||||||
|
|
||||||
sphinxcontrib-serializinghtml = callPackage ../development/python-modules/sphinxcontrib-serializinghtml { };
|
sphinxcontrib-serializinghtml = callPackage ../development/python-modules/sphinxcontrib-serializinghtml { };
|
||||||
|
|
Loading…
Reference in a new issue