Merge pull request #160634 from SuperSandro2000/manila

authored by Sandro and committed by GitHub 55978b05 a8b2c90f

+51
+17
pkgs/development/python-modules/python-manilaclient/default.nix
··· 1 1 { lib 2 2 , buildPythonApplication 3 3 , fetchPypi 4 + , installShellFiles 4 5 , pbr 6 + , openstackdocstheme 5 7 , oslo-config 6 8 , oslo-log 7 9 , oslo-serialization ··· 9 11 , prettytable 10 12 , requests 11 13 , simplejson 14 + , sphinx 15 + , sphinxcontrib-programoutput 12 16 , Babel 13 17 , osc-lib 14 18 , python-keystoneclient ··· 25 29 sha256 = "sha256-6iAed0mtEYHguYq4Rlh4YWT8E5hNqBYPcnG9/8RMspo="; 26 30 }; 27 31 32 + nativeBuildInputs = [ 33 + installShellFiles 34 + openstackdocstheme 35 + sphinx 36 + sphinxcontrib-programoutput 37 + ]; 38 + 28 39 propagatedBuildInputs = [ 29 40 pbr 30 41 oslo-config ··· 39 50 python-keystoneclient 40 51 debtcollector 41 52 ]; 53 + 54 + postInstall = '' 55 + export PATH=$out/bin:$PATH 56 + sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man 57 + installManPage doc/build/man/python-manilaclient.1 58 + ''; 42 59 43 60 # Checks moved to 'passthru.tests' to workaround infinite recursion 44 61 doCheck = false;
+32
pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix
··· 1 + { lib 2 + , buildPythonPackage 3 + , fetchPypi 4 + , sphinx 5 + , sphinxcontrib-serializinghtml 6 + }: 7 + 8 + buildPythonPackage rec { 9 + pname = "sphinxcontrib-programoutput"; 10 + version = "0.17"; 11 + 12 + src = fetchPypi { 13 + inherit pname version; 14 + sha256 = "sha256-MA7puMrug1XSXMdLTRx+/RLmCNKtFl4xQdMeb7wVK38="; 15 + }; 16 + 17 + buildInputs = [ 18 + sphinx 19 + ]; 20 + 21 + # fails to import sphinxcontrib.serializinghtml 22 + doCheck = false; 23 + 24 + pythonImportsCheck = [ "sphinxcontrib.programoutput" ]; 25 + 26 + meta = with lib; { 27 + description = "Sphinx extension to include program output"; 28 + homepage = "https://github.com/NextThought/sphinxcontrib-programoutput"; 29 + license = licenses.bsd2; 30 + maintainers = with maintainers; [ SuperSandro2000 ]; 31 + }; 32 + }
+2
pkgs/top-level/python-packages.nix
··· 9358 9358 inherit (pkgs) plantuml; 9359 9359 }; 9360 9360 9361 + sphinxcontrib-programoutput = callPackage ../development/python-modules/sphinxcontrib-programoutput { }; 9362 + 9361 9363 sphinxcontrib-qthelp = callPackage ../development/python-modules/sphinxcontrib-qthelp { }; 9362 9364 9363 9365 sphinxcontrib-serializinghtml = callPackage ../development/python-modules/sphinxcontrib-serializinghtml { };