From 33ca33b0edaef43fd7b821c347691b4aee13148f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 29 Jun 2022 02:48:07 +0200 Subject: [PATCH] Revert "sphinx_offline: init" This reverts commit b75a20420b72fa7bb433c3722377c7212dbb9b2e. --- pkgs/top-level/all-packages.nix | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15eb8b69dfaf..47af97509c00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20967,23 +20967,6 @@ with pkgs; sphinx = with python3Packages; toPythonApplication sphinx; - # A variation of sphinx that is only suitable for offline use as it excludes - # pyopenssl, which is broken on aarch64-darwin. - # https://github.com/NixOS/nixpkgs/issues/175875 - sphinx_offline = - if !(stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isAarch64) - then sphinx - else - sphinx.override (o: { - requests = pkgsBuildTarget.python3Packages.requests.override (o: { - urllib3 = pkgsBuildTarget.python3Packages.urllib3.overrideAttrs (o: { - # urllib3 adds the optional pyopenssl to propagatedBuildInputs - # pkgs/development/python-modules/urllib3/default.nix - propagatedBuildInputs = []; - }); - }); - }); - sphinx-autobuild = with python3Packages; toPythonApplication sphinx-autobuild; sphinx-serve = with python3Packages; toPythonApplication sphinx-serve;