From 4af35d92a0ceee11b8082befccbba2b036f5a536 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 3 Aug 2022 18:30:10 +0200 Subject: [PATCH] python3Packages.sphinx-rtd-theme: rename from sphinx_rtd_theme --- pkgs/applications/audio/exaile/default.nix | 2 +- pkgs/applications/virtualization/qemu/default.nix | 2 +- pkgs/development/compilers/vyper/default.nix | 4 ++-- pkgs/development/libraries/libinput/default.nix | 2 +- pkgs/development/libraries/pipewire/wireplumber.nix | 2 +- pkgs/development/python-modules/imantics/default.nix | 4 ++-- pkgs/development/python-modules/mutagen/default.nix | 4 ++-- pkgs/development/python-modules/pydash/default.nix | 4 ++-- .../{sphinx_rtd_theme => sphinx-rtd-theme}/default.nix | 5 +++-- pkgs/os-specific/linux/kernel/htmldocs.nix | 4 ++-- pkgs/tools/networking/p2p/tahoe-lafs/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 13 files changed, 20 insertions(+), 18 deletions(-) rename pkgs/development/python-modules/{sphinx_rtd_theme => sphinx-rtd-theme}/default.nix (90%) diff --git a/pkgs/applications/audio/exaile/default.nix b/pkgs/applications/audio/exaile/default.nix index eb6dd471055..5ac4e1cbf4b 100644 --- a/pkgs/applications/audio/exaile/default.nix +++ b/pkgs/applications/audio/exaile/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals documentationSupport [ help2man python3.pkgs.sphinx - python3.pkgs.sphinx_rtd_theme + python3.pkgs.sphinx-rtd-theme ] ++ lib.optional translationSupport gettext; buildInputs = [ diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index c3aa3c49553..f9ca6b09372 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ makeWrapper removeReferencesTo pkg-config flex bison meson ninja perl python3 python3Packages.sphinx python3Packages.sphinx_rtd_theme ] + nativeBuildInputs = [ makeWrapper removeReferencesTo pkg-config flex bison meson ninja perl python3 python3Packages.sphinx python3Packages.sphinx-rtd-theme ] ++ lib.optionals gtkSupport [ wrapGAppsHook ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 00d39d6f93e..9ac9e654261 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -9,7 +9,7 @@ , recommonmark , semantic-version , sphinx -, sphinx_rtd_theme +, sphinx-rtd-theme , pytest-runner , setuptools-scm , git @@ -57,7 +57,7 @@ buildPythonPackage rec { # docs recommonmark sphinx - sphinx_rtd_theme + sphinx-rtd-theme ]; checkPhase = '' diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 38deb7fbcc0..0092a8fdc6c 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -32,7 +32,7 @@ let env = python3.withPackages (pp: with pp; [ sphinx recommonmark - sphinx_rtd_theme + sphinx-rtd-theme ]); in # Expose only the sphinx-build binary to avoid contaminating diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index 14b75f770a1..8769587605e 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (enableDocs || enableGI) [ doxygen (python3.withPackages (ps: with ps; - lib.optionals enableDocs [ sphinx sphinx_rtd_theme breathe ] ++ + lib.optionals enableDocs [ sphinx sphinx-rtd-theme breathe ] ++ lib.optionals enableGI [ lxml ] )) ]; diff --git a/pkgs/development/python-modules/imantics/default.nix b/pkgs/development/python-modules/imantics/default.nix index 59eb3afaa0e..3b02ac44034 100644 --- a/pkgs/development/python-modules/imantics/default.nix +++ b/pkgs/development/python-modules/imantics/default.nix @@ -3,7 +3,7 @@ , lib , numpy , opencv3 -, sphinx_rtd_theme +, sphinx-rtd-theme , lxml , xmljson }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy opencv3 - sphinx_rtd_theme + sphinx-rtd-theme lxml xmljson ]; diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix index f0bd0951d81..835a9d8861a 100644 --- a/pkgs/development/python-modules/mutagen/default.nix +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -6,7 +6,7 @@ # docs , python , sphinx -, sphinx_rtd_theme +, sphinx-rtd-theme # tests , hypothesis @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeBuildInputs = [ sphinx - sphinx_rtd_theme + sphinx-rtd-theme ]; postInstall = '' diff --git a/pkgs/development/python-modules/pydash/default.nix b/pkgs/development/python-modules/pydash/default.nix index 7800f3e259d..08e7fe72acf 100644 --- a/pkgs/development/python-modules/pydash/default.nix +++ b/pkgs/development/python-modules/pydash/default.nix @@ -6,7 +6,7 @@ , mock , pytestCheckHook , pythonOlder -, sphinx_rtd_theme +, sphinx-rtd-theme }: buildPythonPackage rec { @@ -26,7 +26,7 @@ buildPythonPackage rec { checkInputs = [ invoke mock - sphinx_rtd_theme + sphinx-rtd-theme pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix similarity index 90% rename from pkgs/development/python-modules/sphinx_rtd_theme/default.nix rename to pkgs/development/python-modules/sphinx-rtd-theme/default.nix index d0c9a3883af..514ce279fe7 100644 --- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix @@ -8,11 +8,12 @@ }: buildPythonPackage rec { - pname = "sphinx_rtd_theme"; + pname = "sphinx-rtd-theme"; version = "1.0.0"; src = fetchPypi { - inherit pname version; + pname = "sphinx_rtd_theme"; + inherit version; sha256 = "0p3abj91c3l72ajj5jwblscsdf1jflrnn0djx2h5y6f2wjbx9ipf"; }; diff --git a/pkgs/os-specific/linux/kernel/htmldocs.nix b/pkgs/os-specific/linux/kernel/htmldocs.nix index 4039dafad55..4e42288aff8 100644 --- a/pkgs/os-specific/linux/kernel/htmldocs.nix +++ b/pkgs/os-specific/linux/kernel/htmldocs.nix @@ -31,7 +31,7 @@ let doCheck = false; }; - sphinx_rtd_theme = prev.sphinx_rtd_theme.override { + sphinx-rtd-theme = prev.sphinx-rtd-theme.override { inherit sphinx; docutils = docutils_old; }; @@ -59,7 +59,7 @@ stdenv.mkDerivation { imagemagick perl py.pkgs.sphinx - py.pkgs.sphinx_rtd_theme + py.pkgs.sphinx-rtd-theme which ]; diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index f50920186df..a47483a11f3 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ appdirs beautifulsoup4 characteristic distro eliot fixtures foolscap future html5lib magic-wormhole netifaces pyasn1 pycrypto pyutil pyyaml recommonmark - service-identity simplejson sphinx_rtd_theme testtools treq twisted zfec + service-identity simplejson sphinx-rtd-theme testtools treq twisted zfec zope_interface ] ++ twisted.optional-dependencies.tls ++ twisted.optional-dependencies.conch; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b5f3a9b39a3..fd465070264 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -174,6 +174,7 @@ mapAliases ({ smart_open = smart-open; # added 2021-03-14 smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 SPARQLWrapper = sparqlwrapper; + sphinx_rtd_theme = sphinx-rtd-theme; # added 2022-08-03 sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02 sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28 SQLAlchemy-ImageAttach = throw "sqlalchemy-imageattach has been removed as it is incompatible with sqlalchemy 1.4 and unmaintained"; # added 2022-04-23 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d2cb3b326d1..5de317091d6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10146,7 +10146,7 @@ in { sphinx_pypi_upload = callPackage ../development/python-modules/sphinx_pypi_upload { }; - sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { }; + sphinx-rtd-theme = callPackage ../development/python-modules/sphinx-rtd-theme { }; sphinx-serve = callPackage ../development/python-modules/sphinx-serve { };