diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix index 60fbc917f7d9..cd97c2b5697c 100644 --- a/pkgs/development/python-modules/furo/default.nix +++ b/pkgs/development/python-modules/furo/default.nix @@ -4,11 +4,12 @@ , fetchPypi , sphinx , beautifulsoup4 +, sphinx-basic-ng }: buildPythonPackage rec { pname = "furo"; - version = "2022.4.7"; + version = "2022.6.21"; format = "wheel"; disable = pythonOlder "3.6"; @@ -16,12 +17,13 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - sha256 = "sha256-fz49L7l3SDWQ+Oyyws1RG9gmYbecGO+yTelVi8nN8tc="; + sha256 = "sha256-Bhto4yM0Xif8ugJM8zoed/Pf2NmYdBC+gidJpwbirdY="; }; propagatedBuildInputs = [ sphinx beautifulsoup4 + sphinx-basic-ng ]; installCheckPhase = '' diff --git a/pkgs/development/python-modules/sphinx-basic-ng/default.nix b/pkgs/development/python-modules/sphinx-basic-ng/default.nix new file mode 100644 index 000000000000..df55a1316fbb --- /dev/null +++ b/pkgs/development/python-modules/sphinx-basic-ng/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, fetchpatch +, sphinx +}: + +buildPythonPackage rec { + pname = "sphinx-basic-ng"; + version = "0.0.1.a11"; + disable = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pradyunsg"; + repo = "sphinx-basic-ng"; + rev = version; + sha256 = "sha256-Eur3CadC2NTuBXosG4SN9t2L0qkqN+Q79bcvhvlG/f8="; + }; + + patches = [ + (fetchpatch { + name = "fix-import-error.patch"; + url = "https://github.com/pradyunsg/sphinx-basic-ng/pull/32/commits/323a0085721b908aa11bc3c36c51e16f517ee023.patch"; + sha256 = "sha256-/G1wLG/08u2s3YENSKSYekLrV1fUkxDAlxc3crTQNHk="; + }) + ]; + + propagatedBuildInputs = [ + sphinx + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "sphinx_basic_ng" ]; + + meta = with lib; { + description = "A modernised skeleton for Sphinx themes"; + homepage = "https://sphinx-basic-ng.readthedocs.io/en/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ffa21b26996..ab184d0d67e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10014,6 +10014,8 @@ in { sphinx-autobuild = callPackage ../development/python-modules/sphinx-autobuild { }; + sphinx-basic-ng = callPackage ../development/python-modules/sphinx-basic-ng { }; + sphinx-copybutton = callPackage ../development/python-modules/sphinx-copybutton { }; sphinx-inline-tabs = callPackage ../development/python-modules/sphinx-inline-tabs { };