diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97407ee29526..69d88939f34e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20893,6 +20893,23 @@ 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; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 68a323099569..54a050be73f8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -49,6 +49,8 @@ let # Use this rather than `rec { ... }` below for sake of overlays. inherit (pkgs.haskell) compiler packages; + sphinx = buildPackages.sphinx_offline; + in { lib = haskellLibUncomposable; @@ -97,7 +99,7 @@ in { packages.ghc8102Binary else packages.ghc865Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit sphinx; buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_7; llvmPackages = pkgs.llvmPackages_7; }; @@ -110,7 +112,7 @@ in { packages.ghc8107BinaryMinimal else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. @@ -126,7 +128,7 @@ in { packages.ghc8107BinaryMinimal else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit sphinx; inherit (buildPackages.darwin) autoSignDarwinBinariesHook xattr; buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; @@ -138,7 +140,7 @@ in { packages.ghc8107BinaryMinimal else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. @@ -148,7 +150,7 @@ in { }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved.