NixOS · tjni · Jan 12, 2023 · Jul 21, 2023 · Jul 21, 2023 · Jul 21, 2023
diff --git 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
@@ -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
@@ -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
-      find "$out/lib" -type f -name '*-nspkg.pth' -delete
+      rm $SETUPTOOLS_NSPKG_PTH_FILES
-      find "$out/lib" -type f -name '*-nspkg.pth' -delete
+      rm $SETUPTOOLS_NSPKG_PTH_FILES
+    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/...pment/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch b/...pment/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch
diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
@@ -30,38 +30,38 @@
 
 # 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 = [
     flit-core
   ];
 
   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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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