Skip to content

ghc: Work around broken pyopenssl on aarch64-darwin #179181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lovesegfault merged 2 commits into from
Jun 27, 2022
Merged

ghc: Work around broken pyopenssl on aarch64-darwin #179181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b75a204
sphinx_offline: init
roberth Jun 26, 2022
7898af7
ghc: Work around broken pyopenssl on aarch64-darwin
roberth Jun 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20864,6 +20864,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;
Expand Down
12 changes: 7 additions & 5 deletions pkgs/top-level/haskell-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ let
# Use this rather than `rec { ... }` below for sake of overlays.
inherit (pkgs.haskell) compiler packages;

sphinx = buildPackages.sphinx_offline;

in {
lib = haskellLibUncomposable;

Expand Down Expand Up @@ -87,7 +89,7 @@ in {
packages.ghc8102Binary
else
packages.ghc865Binary;
inherit (buildPackages.python3Packages) sphinx;
inherit sphinx;
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_7;
llvmPackages = pkgs.llvmPackages_7;
};
Expand All @@ -100,7 +102,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.
Expand All @@ -116,7 +118,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;
Expand All @@ -128,7 +130,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.
Expand All @@ -138,7 +140,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.
Expand Down