diff options
author | Robert Schütz <nix@dotlambda.de> | 2023-02-25 12:13:52 -0800 |
---|---|---|
committer | Robert Schütz <github@dotlambda.de> | 2023-02-25 14:11:58 -0800 |
commit | 79768df602978e03a77a13a52bd122f37d33f484 (patch) | |
tree | 8b8d34cc8be45680d7648e98d246132247822ad7 /pkgs/os-specific/linux/kernel/htmldocs.nix | |
parent | 7f8086c7a145a52a54feecb7f154c7580d0e2d54 (diff) | |
download | nixpkgs-79768df602978e03a77a13a52bd122f37d33f484.tar nixpkgs-79768df602978e03a77a13a52bd122f37d33f484.tar.gz nixpkgs-79768df602978e03a77a13a52bd122f37d33f484.tar.bz2 nixpkgs-79768df602978e03a77a13a52bd122f37d33f484.tar.lz nixpkgs-79768df602978e03a77a13a52bd122f37d33f484.tar.xz nixpkgs-79768df602978e03a77a13a52bd122f37d33f484.tar.zst nixpkgs-79768df602978e03a77a13a52bd122f37d33f484.zip |
linux-doc: remove Python overrides
The build used to fail with Found duplicated packages in closure for dependency 'docutils': docutils 0.19 (/nix/store/y1ifaaf1pfh8pz4qfqvc5gdk3a7s1563-python3.10-docutils-0.19/lib/python3.10/site-packages) docutils 0.16 (/nix/store/f2rd8fjdjzy0kpqd2x0gw5lwbxwmzzm6-python3.10-docutils-0.16/lib/python3.10/site-packages)
Diffstat (limited to 'pkgs/os-specific/linux/kernel/htmldocs.nix')
-rw-r--r-- | pkgs/os-specific/linux/kernel/htmldocs.nix | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/pkgs/os-specific/linux/kernel/htmldocs.nix b/pkgs/os-specific/linux/kernel/htmldocs.nix index 4e42288aff8..ef2abefb377 100644 --- a/pkgs/os-specific/linux/kernel/htmldocs.nix +++ b/pkgs/os-specific/linux/kernel/htmldocs.nix @@ -10,35 +10,6 @@ , which }: -let - py = python3.override { - packageOverrides = final: prev: rec { - docutils_old = prev.docutils.overridePythonAttrs (oldAttrs: rec { - version = "0.16"; - src = final.fetchPypi { - pname = "docutils"; - inherit version; - sha256 = "sha256-wt46YOnn0Hvia38rAMoDCcIH4GwQD5zCqUkx/HWkePw="; - }; - }); - - sphinx = (prev.sphinx.override rec { - alabaster = prev.alabaster.override { inherit pygments; }; - docutils = docutils_old; - pygments = prev.pygments.override { docutils = docutils_old; }; - }).overridePythonAttrs { - # fails due to duplicated packages - doCheck = false; - }; - - sphinx-rtd-theme = prev.sphinx-rtd-theme.override { - inherit sphinx; - docutils = docutils_old; - }; - }; - }; -in - stdenv.mkDerivation { pname = "linux-kernel-latest-htmldocs"; @@ -58,8 +29,8 @@ stdenv.mkDerivation { graphviz imagemagick perl - py.pkgs.sphinx - py.pkgs.sphinx-rtd-theme + python3.pkgs.sphinx + python3.pkgs.sphinx-rtd-theme which ]; |