b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Revert "ghc: Work around broken pyopenssl on aarch64-darwin"

Browse source 
This reverts commit 7898af7d3a.
This commit is contained in:
Sandro Jäckel 2022-06-29 02:48:12 +02:00
parent 33ca33b0ed
commit 4650f24496
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/top-level/haskell-packages.nix
View file

@ -49,8 +49,6 @@ let
# Use this rather than `rec { ... }` below for sake of overlays.
inherit (pkgs.haskell) compiler packages;
sphinx = buildPackages.sphinx_offline;
in {
lib = haskellLibUncomposable;
@ -99,7 +97,7 @@ in {
packages.ghc8102Binary
else
packages.ghc865Binary;
inherit sphinx;
inherit (buildPackages.python3Packages) sphinx;
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_7;
llvmPackages = pkgs.llvmPackages_7;
};
@ -112,7 +110,7 @@ in {
packages.ghc8107BinaryMinimal
else
packages.ghc8107Binary;
inherit sphinx;
inherit (buildPackages.python3Packages) 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.
@ -128,7 +126,7 @@ in {
packages.ghc8107BinaryMinimal
else
packages.ghc8107Binary;
inherit sphinx;
inherit (buildPackages.python3Packages) sphinx;
inherit (buildPackages.darwin) autoSignDarwinBinariesHook xattr;
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
llvmPackages = pkgs.llvmPackages_12;
@ -140,7 +138,7 @@ in {
packages.ghc8107BinaryMinimal
else
packages.ghc8107Binary;
inherit sphinx;
inherit (buildPackages.python3Packages) 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.
@ -150,7 +148,7 @@ in {
};
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs = packages.ghc8107Binary;
inherit sphinx;
inherit (buildPackages.python3Packages) 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.