diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 271d571a5314dd..a8de9a4ddec85d 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { ] ++ (with python3.pkgs; [ setuptools-scm sphinx - sphinxcontrib_newsfeed + sphinxcontrib-newsfeed ]); propagatedBuildInputs = with python3.pkgs;[ @@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec { --fish <(_KHAL_COMPLETE=fish_source $out/bin/khal) # man page - PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib_newsfeed ])}/bin:$PATH" \ + PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib-newsfeed ])}/bin:$PATH" \ make -C doc man installManPage doc/build/man/khal.1 diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index bd29d493ebb8cf..8696a266b15396 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -184,6 +184,11 @@ in { }; } ./setuptools-rust-hook.sh) {}; + setuptoolsLegacyNamespaceHook = callPackage ({ makePythonHook }: + makePythonHook { + name = "setuptools-legacy-namespace-hook"; + } ./setuptools-legacy-namespace-hook.sh) {}; + unittestCheckHook = callPackage ({ makePythonHook }: makePythonHook { name = "unittest-check-hook"; diff --git a/pkgs/development/interpreters/python/hooks/setuptools-legacy-namespace-hook.sh b/pkgs/development/interpreters/python/hooks/setuptools-legacy-namespace-hook.sh new file mode 100644 index 00000000000000..7f0de364949727 --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/setuptools-legacy-namespace-hook.sh @@ -0,0 +1,28 @@ +# Setup hook for setuptools. +echo "Sourcing setuptools-legacy-namespace-hook" + +setuptoolsLegacyNamespaceFixupPhase() { + echo "Executing setuptoolsLegacyNamespaceFixupPhase" + + # We are going to delete every *-nspkg.pth file, which is generated by + # setuptools when a package uses the legacy namespace package code path + # (when using the namespace_packages keyword in setup.{cfg,py}). + # + # These files can cause subtle problems when used alongside packages that + # use a more modern code path that no longer generates those files. See: + # + # https://github.com/pypa/setuptools/discussions/3991 + # + SETUPTOOLS_NSPKG_PTH_FILES="$(find "$out/lib" -type f -name '*-nspkg.pth')" + if [[ -n "$SETUPTOOLS_NSPKG_PTH_FILES" ]]; then + find "$out/lib" -type f -name '*-nspkg.pth' -delete + else + echo "No nspkg.pth file is generated anymore. Please remove the setuptoolsLegacyNamespaceHook hook." + exit 1 + fi + + echo "Finished executing setuptoolsLegacyNamespaceFixupPhase" +} + +echo "Using setuptoolsLegacyNamespaceFixupPhase" +preFixupPhases+=" setuptoolsLegacyNamespaceFixupPhase" diff --git a/pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch b/pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch deleted file mode 100644 index 805e724d0c8c1d..00000000000000 --- a/pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 181617387841b695ee77b162babf9fb177002fcb Mon Sep 17 00:00:00 2001 -From: toonn -Date: Mon, 20 Sep 2021 11:39:46 +0200 -Subject: [PATCH] test-images: Use normalization equivalent character -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -One of the test images used a combining character `ä` that can be -encoded multiple ways. This means the file's name can end up encoded -differently depending on whether/which normal form the filesystem uses. - -For Nix this causes a different hash for a FOD depending on the -filesystem where it is evaluated. This is problematic because hashes -fail to match up when evaluating the FOD across multiple platforms. ---- - tests/roots/test-images/index.rst | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/roots/test-images/index.rst b/tests/roots/test-images/index.rst -index 14a2987..219842e 100644 ---- a/tests/roots/test-images/index.rst -+++ b/tests/roots/test-images/index.rst -@@ -13,7 +13,7 @@ test-image - - The caption of img - --.. image:: testimäge.png -+.. image:: testimæge.png - - .. image:: rimg.png - :target: https://www.sphinx-doc.org/ --- -2.17.2 (Apple Git-113) - diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index eb559c41486002..b6efdf1e3b0968 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -30,29 +30,29 @@ # check phase , cython +, filelock , html5lib , pytestCheckHook -, typed-ast }: buildPythonPackage rec { pname = "sphinx"; - version = "5.3.0"; + version = "7.0.1"; format = "pyproject"; - - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "sphinx-doc"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-80bVg1rfBebgSOKbWkzP84vpm39iLgM8lWlVD64nSsQ="; postFetch = '' - cd $out - mv tests/roots/test-images/testimäge.png \ - tests/roots/test-images/testimæge.png - patch -p1 < ${./0001-test-images-Use-normalization-equivalent-character.patch} + # Change ä to æ in file names, since ä can be encoded multiple ways on different + # filesystems, leading to different hashes on different platforms. + cd "$out"; + mv tests/roots/test-images/{testimäge,testimæge}.png + sed -i 's/testimäge/testimæge/g' tests/{test_build*.py,roots/test-images/index.rst} ''; + hash = "sha256-DUUdHvmuxWw06ycH6qFE2LZ9GTzOqdvdPnye8cvVBOQ="; }; nativeBuildInputs = [ @@ -60,8 +60,8 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - babel alabaster + babel docutils imagesize jinja2 @@ -84,67 +84,20 @@ buildPythonPackage rec { importlib-metadata ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ cython + filelock html5lib pytestCheckHook - ] ++ lib.optionals (pythonOlder "3.8") [ - typed-ast ]; preCheck = '' - export HOME=$(mktemp -d) + export HOME=$TMPDIR ''; - disabledTests = [ - # requires network access - "test_anchors_ignored" - "test_defaults" - "test_defaults_json" - "test_latex_images" - - # requires imagemagick (increases build closure size), doesn't - # test anything substantial - "test_ext_imgconverter" - - # fails with pygments 2.14 - # TODO remove for sphinx 6 - "test_viewcode" - "test_additional_targets_should_be_translated" - "test_additional_targets_should_not_be_translated" - - # sphinx.errors.VersionRequirementError: The alabaster extension - # used by this project needs at least Sphinx v1.6; it therefore - # cannot be built with this version. - "test_needs_sphinx" - - # Likely due to pygments 2.14 update - # AssertionError: assert '5:11:17\u202fAM' == '5:11:17 AM' - "test_format_date" - ] ++ lib.optionals stdenv.isDarwin [ - # Due to lack of network sandboxing can't guarantee port 7777 isn't bound - "test_inspect_main_url" - "test_auth_header_uses_first_match" - "test_linkcheck_allowed_redirects" - "test_linkcheck_request_headers" - "test_linkcheck_request_headers_no_slash" - "test_follows_redirects_on_HEAD" - "test_get_after_head_raises_connection_error" - "test_invalid_ssl" - "test_connect_to_selfsigned_with_tls_verify_false" - "test_connect_to_selfsigned_with_tls_cacerts" - "test_connect_to_selfsigned_with_requests_env_var" - "test_connect_to_selfsigned_nonexistent_cert_file" - "test_TooManyRedirects_on_HEAD" - "test_too_many_requests_retry_after_int_del" - "test_too_many_requests_retry_after_HTTP_date" - "test_too_many_requests_retry_after_without_header" - "test_too_many_requests_user_timeout" - "test_raises_for_invalid_status" - "test_auth_header_no_match" - "test_follows_redirects_on_GET" - "test_connect_to_selfsigned_fails" - ] ++ lib.optionals isPyPy [ + disabledTests = lib.optionals isPyPy [ # PyPy has not __builtins__ which get asserted # https://doc.pypy.org/en/latest/cpython_differences.html#miscellaneous "test_autosummary_generate_content_for_module" diff --git a/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix index 32470e98b4e0f3..1e85c546af3229 100644 --- a/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptoolsLegacyNamespaceHook , sphinx , actdiag , blockdiag @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-PFXUVP/Due/nwg8q2vAiGZuCVhLTLyAL6KSXqofg+B8="; }; + nativeBuildInputs = [ + setuptoolsLegacyNamespaceHook + ]; + propagatedBuildInputs = [ actdiag blockdiag diff --git a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix index 53080347861412..16dfbef4c5f6d3 100644 --- a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptoolsLegacyNamespaceHook , pbr }: @@ -18,6 +19,10 @@ buildPythonPackage rec { rm test-requirements.txt requirements.txt ''; + nativeBuildInputs = [ + setuptoolsLegacyNamespaceHook + ]; + propagatedBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix index ef7a50382c6e29..98c07b07829c7f 100644 --- a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix @@ -1,19 +1,23 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, setuptools }: buildPythonPackage rec { pname = "sphinxcontrib-applehelp"; - version = "1.0.2"; - disabled = isPy27; + version = "1.0.4"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58"; + hash = "sha256-go+GeUW745gXwhChq/0bxIlci3P8qt5W1FNXo0igfX4="; }; + nativeBuildInputs = [ + setuptools + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; diff --git a/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix b/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix index 8589689ec8d17a..f3ba31a526c607 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptoolsLegacyNamespaceHook , sphinx , sphinxcontrib-tikz }: @@ -15,6 +16,10 @@ buildPythonPackage rec { hash = "sha256-+M+K8WzQqxQUGgAgGPK+isf3gKK7HOrdI6nNW/V8Wv0="; }; + nativeBuildInputs = [ + setuptoolsLegacyNamespaceHook + ]; + propagatedBuildInputs = [ sphinx sphinxcontrib-tikz ]; # No tests diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 4a0dcda2388727..ea6e74672d4522 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptoolsLegacyNamespaceHook , oset , pybtex , pybtex-docutils @@ -11,6 +12,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-bibtex"; version = "2.5.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-cbQuXbDi4oTyQ4dTJr+ZNqqadjKCJ311BIgm/vWwDqo="; }; + nativeBuildInputs = [ + setuptoolsLegacyNamespaceHook + ]; + propagatedBuildInputs = [ oset pybtex diff --git a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix index 8d22c5806764ea..7c8b97fed378d4 100644 --- a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptoolsLegacyNamespaceHook , unittestCheckHook , mock , sphinx-testing @@ -11,12 +12,17 @@ buildPythonPackage rec { pname = "sphinxcontrib-blockdiag"; version = "3.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "aa49bf924516f5de8a479994c7be81e077df5599c9da2a082003d5b388e1d450"; + hash = "sha256-qkm/kkUW9d6KR5mUx76B4HffVZnJ2ioIIAPVs4jh1FA="; }; + nativeBuildInputs = [ + setuptoolsLegacyNamespaceHook + ]; + buildInputs = [ mock sphinx-testing ]; propagatedBuildInputs = [ sphinx blockdiag ]; @@ -33,5 +39,4 @@ buildPythonPackage rec { maintainers = with maintainers; [ ]; license = licenses.bsd2; }; - } diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index 5830ff0caf572d..10af6aae440e87 100644 --- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -1,26 +1,29 @@ { lib , buildPythonPackage , fetchPypi -, docutils +, flit-core , sphinx , requests -, jinja2 }: buildPythonPackage rec { pname = "sphinxcontrib-confluencebuilder"; - version = "2.0.0"; + version = "2.1.1"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-RyShQt/t8tnE5ZHM0WDQ+jrvXem3y24tCpj3s6Thq+g="; + pname = "sphinxcontrib_confluencebuilder"; + inherit version; + hash = "sha256-+gan96ZtaPsb5VBH3UFlSVqsHHZVIAEaijGxoQmCdQI="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ - docutils sphinx requests - jinja2 ]; # Tests are disabled due to a circular dependency on Sphinx diff --git a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix index 293f4c856ef539..213ce377738ea4 100644 --- a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix @@ -1,17 +1,23 @@ { lib , buildPythonPackage , fetchPypi +, setuptoolsLegacyNamespaceHook }: buildPythonPackage rec { pname = "sphinxcontrib-devhelp"; version = "1.0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4"; + hash = "sha256-/38a+nuWQucGA3k2CmfpxB6PMSHyzpFkJm9hufSzOOQ="; }; + nativeBuildInputs = [ + setuptoolsLegacyNamespaceHook + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; diff --git a/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix b/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix index e48b24c3644f79..4a0596d44be339 100644 --- a/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix @@ -1,20 +1,28 @@ { lib , buildPythonPackage , fetchPypi -, sphinx +, docutils +, jinja2 , openpyxl +, sphinx }: buildPythonPackage rec { pname = "sphinxcontrib-excel-table"; version = "1.0.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256:1q79byn3k3ribvwqafbpixwabjhymk46ns8ym0hxcn8vhf5nljzd"; + hash = "sha256-7Utqi4MbWdYhqB5pa8isHsqleI93OYX5XjGPOaxf6eA="; }; - propagatedBuildInputs = [ sphinx openpyxl ]; + propagatedBuildInputs = [ + docutils + jinja2 + openpyxl + sphinx + ]; pythonImportsCheck = [ "sphinxcontrib.excel_table" ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix b/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix index 57535c6f137c79..7d3819e9f983bd 100644 --- a/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix @@ -1,23 +1,31 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, sphinx, pbr }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptoolsLegacyNamespaceHook +, sphinx +, pbr +}: buildPythonPackage rec { pname = "sphinxcontrib-fulltoc"; version = "1.2.0"; - - # pkgutil namespaces are broken in nixpkgs (because they can't scan multiple - # directories). But python2 is EOL, so not supporting it, should be ok. - disabled = pythonOlder "3"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "1nbwflv9szyh37yr075xhck8b4gg2c7g3sa38mfi7wv7qhpxcif8"; + hash = "sha256-yEXWL8Rn8xNdRUPp8Q4T75GFJoO9HJD9GdB/nTZ1fNk="; }; - nativeBuildInputs = [ pbr ]; + nativeBuildInputs = [ + pbr + setuptoolsLegacyNamespaceHook + ]; + propagatedBuildInputs = [ sphinx ]; # There are no unit tests doCheck = false; + # Ensure package importing works pythonImportsCheck = [ "sphinxcontrib.fulltoc" ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 901132176ed9d1..caf9b1d2960a3a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -1,19 +1,23 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, setuptools }: buildPythonPackage rec { pname = "sphinxcontrib-htmlhelp"; - version = "2.0.0"; - disabled = isPy27; + version = "2.0.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2"; + hash = "sha256-DL3TAoFTMAWEIrmKETGVySSYJdaB4Y8R6LH3ii8R7/8="; }; + nativeBuildInputs = [ + setuptools + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; diff --git a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix b/pkgs/development/python-modules/sphinxcontrib-httpdomain/default.nix similarity index 76% rename from pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix rename to pkgs/development/python-modules/sphinxcontrib-httpdomain/default.nix index ae4a571f0bb53d..3423ecc07deb80 100644 --- a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-httpdomain/default.nix @@ -1,18 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, setuptoolsLegacyNamespaceHook , sphinx }: buildPythonPackage rec { pname = "sphinxcontrib-httpdomain"; version = "1.8.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; hash = "sha256-bC3+bKKC119m3zM4absM5zMcAbR122gJ/50Qe3zf4Es="; }; + nativeBuildInputs = [ + setuptoolsLegacyNamespaceHook + ]; + propagatedBuildInputs = [ sphinx ]; # Check is disabled due to this issue: @@ -21,8 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Provides a Sphinx domain for describing RESTful HTTP APIs"; - homepage = "https://bitbucket.org/birkenfeld/sphinx-contrib"; + homepage = "https://github.com/sphinx-contrib/httpdomain"; license = licenses.bsd0; }; - } diff --git a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix index da630c6ee96dd5..640b0462a4b1a6 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix @@ -1,19 +1,23 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, setuptoolsLegacyNamespaceHook }: buildPythonPackage rec { pname = "sphinxcontrib-jsmath"; version = "1.0.1"; - disabled = isPy27; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"; + hash = "sha256-qZJeSkWHJH7SGRoi319pcGVsuMor1ihDCVePIVPgxLg="; }; + nativeBuildInputs = [ + setuptoolsLegacyNamespaceHook + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; diff --git a/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix b/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix index 867d5acc9bae90..04cacf74e1f5f2 100644 --- a/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix @@ -1,4 +1,9 @@ -{ lib, buildPythonPackage, fetchFromGitHub, sphinx }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptoolsLegacyNamespaceHook +, sphinx +}: buildPythonPackage rec { pname = "sphinxcontrib-log-cabinet"; @@ -9,9 +14,13 @@ buildPythonPackage rec { owner = "davidism"; repo = "sphinxcontrib-log-cabinet"; rev = "refs/tags/${version}"; - sha256 = "03cxspgqsap9q74sqkdx6r6b4gs4hq6dpvx4j58hm50yfhs06wn1"; + hash = "sha256-wXIDNHQelApRkaTv2wyGRD+yTDa9TazJwekqjd/VnQ0="; }; + nativeBuildInputs = [ + setuptoolsLegacyNamespaceHook + ]; + propagatedBuildInputs = [ sphinx ]; pythonImportsCheck = [ "sphinxcontrib.log_cabinet" ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix b/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix index 0a283dd81a4d5b..020b75bd8ace2d 100644 --- a/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptoolsLegacyNamespaceHook , sphinx , mscgen }: @@ -18,6 +19,10 @@ buildPythonPackage rec { hash = "sha256-AXfSWRq3CepT/jNOgHxiYT7vkdKZejPu/LeUqxZ8T5A="; }; + nativeBuildInputs = [ + setuptoolsLegacyNamespaceHook + ]; + propagatedBuildInputs = [ mscgen sphinx diff --git a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix b/pkgs/development/python-modules/sphinxcontrib-newsfeed/default.nix similarity index 59% rename from pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix rename to pkgs/development/python-modules/sphinxcontrib-newsfeed/default.nix index a298025f8ba3bb..6c4f920e46f128 100644 --- a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-newsfeed/default.nix @@ -1,24 +1,29 @@ { lib , buildPythonPackage , fetchPypi +, setuptoolsLegacyNamespaceHook , sphinx }: buildPythonPackage rec { pname = "sphinxcontrib-newsfeed"; version = "0.1.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "1d7gam3mn8v4in4p16yn3v10vps7nnaz6ilw99j4klij39dqd37p"; + hash = "sha256-Bdz4fCWTRRYqUEzj3+4PcTifUHw3l3mNxTHHdImVtOs="; }; + nativeBuildInputs = [ + setuptoolsLegacyNamespaceHook + ]; + propagatedBuildInputs = [ sphinx ]; meta = with lib; { description = "Extension for adding a simple Blog, News or Announcements section to a Sphinx website"; - homepage = "https://bitbucket.org/prometheus/sphinxcontrib-newsfeed"; + homepage = "https://github.com/prometheusresearch/sphinxcontrib-newsfeed"; license = licenses.bsd2; }; - } diff --git a/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix index 47573ad609a8f7..248ddda01f8faf 100644 --- a/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix @@ -4,6 +4,7 @@ , fetchPypi , nwdiag , pythonOlder +, setuptoolsLegacyNamespaceHook , sphinx }: @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-bula1DutRv6NwfZRhciZfLHRZmXu42p+qvbeExN/+Fk="; }; + nativeBuildInputs = [ + setuptoolsLegacyNamespaceHook + ]; + propagatedBuildInputs = [ blockdiag nwdiag diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index 1486372b02abab..6d041b9eb05d47 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -3,33 +3,37 @@ , deepmerge , fetchPypi , fetchpatch -, isPy27 , setuptools-scm +, setuptoolsLegacyNamespaceHook , jsonschema , picobox , pyyaml , sphinx-mdinclude -, sphinxcontrib_httpdomain +, sphinxcontrib-httpdomain }: buildPythonPackage rec { pname = "sphinxcontrib-openapi"; version = "0.8.1"; - disabled = isPy27; + format = "setuptools"; src = fetchPypi { inherit pname version; hash = "sha256-BPz4fCWTRRYqUEzj3+4PcTifUHw3l3mNxTHHdImVtOs="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + setuptoolsLegacyNamespaceHook + ]; + propagatedBuildInputs = [ deepmerge jsonschema picobox pyyaml sphinx-mdinclude - sphinxcontrib_httpdomain + sphinxcontrib-httpdomain ]; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index b5d58792477dba..ecf475bd748300 100644 --- a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptoolsLegacyNamespaceHook , sphinx , plantuml , pythonOlder @@ -18,6 +19,10 @@ buildPythonPackage rec { hash = "sha256-j95THZLRz8KBf+Nkez8tB+dmgsSoSInASlPoMffFRDI="; }; + nativeBuildInputs = [ + setuptoolsLegacyNamespaceHook + ]; + propagatedBuildInputs = [ sphinx plantuml diff --git a/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix index 17f2d5dcbe6458..6deb838e37d17a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptoolsLegacyNamespaceHook , sphinx , sphinxcontrib-serializinghtml }: @@ -14,6 +15,10 @@ buildPythonPackage rec { hash = "sha256-MA7puMrug1XSXMdLTRx+/RLmCNKtFl4xQdMeb7wVK38="; }; + nativeBuildInputs = [ + setuptoolsLegacyNamespaceHook + ]; + buildInputs = [ sphinx ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix index 4364fcb99dc6f0..2f06311566894a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -1,24 +1,27 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, setuptoolsLegacyNamespaceHook }: buildPythonPackage rec { pname = "sphinxcontrib-qthelp"; version = "1.0.3"; - disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72"; + hash = "sha256-TDN2fuBYtw26iab8XBiSwNV6VL5n3dPnh1oY0Uy6WnI="; }; + nativeBuildInputs = [ + setuptoolsLegacyNamespaceHook + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; meta = with lib; { - description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document."; + description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document"; homepage = "https://github.com/sphinx-doc/sphinxcontrib-qthelp"; license = licenses.bsd0; maintainers = teams.sphinx.members; diff --git a/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix index cc3a96086e4e86..d107059ec9144b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptoolsLegacyNamespaceHook , seqdiag , sphinx }: @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-QH5IeXZz9x2Ujp/6BHFsrB2ZqeyPYW3jdk1C0DNBZXQ="; }; + nativeBuildInputs = [ + setuptoolsLegacyNamespaceHook + ]; + propagatedBuildInputs = [ blockdiag seqdiag diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix index 85ed3cdc596dbd..282a6b771e3a79 100644 --- a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -1,19 +1,23 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, setuptoolsLegacyNamespaceHook }: buildPythonPackage rec { pname = "sphinxcontrib-serializinghtml"; version = "1.1.5"; - disabled = isPy27; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952"; + hash = "sha256-ql9t5d/fgJ71BcSJXlHvXJ6sF9Dyh5M+tJ7ElSgLaVI="; }; + nativeBuildInputs = [ + setuptoolsLegacyNamespaceHook + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index e5e92b8b038e0c..3c389f2bafeae4 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -5,7 +5,7 @@ , importlib-metadata , sphinx , pyenchant -, pbr +, setuptools }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pbr + setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index 62e7df21ab8c3d..4b8fcb8a73a2c9 100644 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptoolsLegacyNamespaceHook , sphinx , pdf2svg , texLive @@ -21,6 +22,10 @@ buildPythonPackage rec { --replace "system(['pdf2svg'" "system(['${pdf2svg}/bin/pdf2svg'" ''; + nativeBuildInputs = [ + setuptoolsLegacyNamespaceHook + ]; + propagatedBuildInputs = [ sphinx ]; # no tests in package diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix index 45027ba15c43c9..14fddf3ded118f 100644 --- a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix @@ -1,26 +1,33 @@ { lib , buildPythonPackage , fetchPypi +, setuptoolsLegacyNamespaceHook , sphinxcontrib-serializinghtml -, six }: buildPythonPackage rec { pname = "sphinxcontrib-websupport"; version = "1.2.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "4edf0223a0685a7c485ae5a156b6f529ba1ee481a1417817935b20bde1956232"; + hash = "sha256-Tt8CI6BoWnxIWuWhVrb1Kboe5IGhQXgXk1sgveGVYjI="; }; - propagatedBuildInputs = [ six sphinxcontrib-serializinghtml ]; + nativeBuildInputs = [ + setuptoolsLegacyNamespaceHook + ]; + + propagatedBuildInputs = [ + sphinxcontrib-serializinghtml + ]; doCheck = false; meta = { description = "Sphinx API for Web Apps"; - homepage = "http://sphinx-doc.org/"; + homepage = "https://github.com/sphinx-doc/sphinxcontrib-websupport"; license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix b/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix index 795556797b931c..8d426fe9b2abfb 100644 --- a/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-youtube"; - version = "1.2.0"; + version = "1.3.0"; format = "pyproject"; nativeBuildInputs = [ flit-core ]; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sphinx-contrib"; repo = "youtube"; rev = "v${version}"; - hash = "sha256-SUnnrzYJ6cOktE0IdnRWTvPGcL/eVS9obtHBMpS2s4A="; + hash = "sha256-/mu/OGMc+iP7DV36fmE8pb5y6MMOQ0fmzT8R7RP/tjM="; }; propagatedBuildInputs = [ sphinx requests ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 116aea4c82209a..90c80bd879b2ca 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -340,7 +340,9 @@ mapAliases ({ SPARQLWrapper = sparqlwrapper; sphinx-jquery = sphinxcontrib-jquery; # added 2023-02-24 sphinx_rtd_theme = sphinx-rtd-theme; # added 2022-08-03 - sphinxcontrib-autoapi = sphinx-autoapi; # added 2023-02=28 + sphinxcontrib-autoapi = sphinx-autoapi; # added 2023-02-28 + sphinxcontrib_httpdomain = sphinxcontrib-httpdomain; # added 2023-07-20 + sphinxcontrib_newsfeed = sphinxcontrib-newsfeed; # added 2023-07-20 sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02 sphinx-navtree = throw "sphinx-navtree has been removed since it is not compatible with sphinx 3.3 and unmaintained"; # added 2023-07-03 sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e4c091721af2e..8de3e176552cab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11936,7 +11936,7 @@ self: super: with self; { sphinxcontrib-htmlhelp = callPackage ../development/python-modules/sphinxcontrib-htmlhelp { }; - sphinxcontrib_httpdomain = callPackage ../development/python-modules/sphinxcontrib_httpdomain { }; + sphinxcontrib-httpdomain = callPackage ../development/python-modules/sphinxcontrib-httpdomain { }; sphinxcontrib-jquery = callPackage ../development/python-modules/sphinxcontrib-jquery { }; @@ -11952,7 +11952,7 @@ self: super: with self; { sphinxcontrib-nwdiag = callPackage ../development/python-modules/sphinxcontrib-nwdiag { }; - sphinxcontrib_newsfeed = callPackage ../development/python-modules/sphinxcontrib_newsfeed { }; + sphinxcontrib-newsfeed = callPackage ../development/python-modules/sphinxcontrib-newsfeed { }; sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { };