diff options
| author | Bernardo Meurer <bernardo@meurer.org> | 2022-06-27 10:58:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-27 10:58:58 -0700 |
| commit | 131b7603cc84cd8dc049d902506721af70257e3e (patch) | |
| tree | ea870dc18c63cc2d1ecd369fc8262fbbbd12e02b /pkgs/top-level/haskell-packages.nix | |
| parent | 89c333f759dc290fcfd477b1bc34672dae276faf (diff) | |
| parent | 7898af7d3a134e9741458c335da523f42944d92b (diff) | |
| download | nixlib-131b7603cc84cd8dc049d902506721af70257e3e.tar nixlib-131b7603cc84cd8dc049d902506721af70257e3e.tar.gz nixlib-131b7603cc84cd8dc049d902506721af70257e3e.tar.bz2 nixlib-131b7603cc84cd8dc049d902506721af70257e3e.tar.lz nixlib-131b7603cc84cd8dc049d902506721af70257e3e.tar.xz nixlib-131b7603cc84cd8dc049d902506721af70257e3e.tar.zst nixlib-131b7603cc84cd8dc049d902506721af70257e3e.zip | |
Merge pull request #179181 from hercules-ci/fix-ghc-aarch64-darwin-pyopenssl
ghc: Work around broken pyopenssl on aarch64-darwin
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 12 |
1 files changed, 7 insertions, 5 deletions
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. |