pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #179506 from SuperSandro2000/pyopenssl-ghc

Revert GHC pyopenssl workarounds

authored by Sandro and committed by GitHub fa3f2e33 f9f65f06

+5 -24
unified split
-17
pkgs/top-level/all-packages.nix
··· 20978 20979 sphinx = with python3Packages; toPythonApplication sphinx; 20980 20981 - # A variation of sphinx that is only suitable for offline use as it excludes 20982 - # pyopenssl, which is broken on aarch64-darwin. 20983 - # https://github.com/NixOS/nixpkgs/issues/175875 20984 - sphinx_offline = 20985 - if !(stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isAarch64) 20986 - then sphinx 20987 - else 20988 - sphinx.override (o: { 20989 - requests = pkgsBuildTarget.python3Packages.requests.override (o: { 20990 - urllib3 = pkgsBuildTarget.python3Packages.urllib3.overrideAttrs (o: { 20991 - # urllib3 adds the optional pyopenssl to propagatedBuildInputs 20992 - # pkgs/development/python-modules/urllib3/default.nix 20993 - propagatedBuildInputs = []; 20994 - }); 20995 - }); 20996 - }); 20997 - 20998 sphinx-autobuild = with python3Packages; toPythonApplication sphinx-autobuild; 20999 21000 sphinx-serve = with python3Packages; toPythonApplication sphinx-serve;
··· 20978 20979 sphinx = with python3Packages; toPythonApplication sphinx; 20980 20981 sphinx-autobuild = with python3Packages; toPythonApplication sphinx-autobuild; 20982 20983 sphinx-serve = with python3Packages; toPythonApplication sphinx-serve;
+5 -7
pkgs/top-level/haskell-packages.nix
··· 49 # Use this rather than `rec { ... }` below for sake of overlays. 50 inherit (pkgs.haskell) compiler packages; 51 52 - sphinx = buildPackages.sphinx_offline; 53 - 54 in { 55 lib = haskellLibUncomposable; 56 ··· 99 packages.ghc8102Binary 100 else 101 packages.ghc865Binary; 102 - inherit sphinx; 103 buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_7; 104 llvmPackages = pkgs.llvmPackages_7; 105 }; ··· 112 packages.ghc8107BinaryMinimal 113 else 114 packages.ghc8107Binary; 115 - inherit sphinx; 116 # Need to use apple's patched xattr until 117 # https://github.com/xattr/xattr/issues/44 and 118 # https://github.com/xattr/xattr/issues/55 are solved. ··· 128 packages.ghc8107BinaryMinimal 129 else 130 packages.ghc8107Binary; 131 - inherit sphinx; 132 inherit (buildPackages.darwin) autoSignDarwinBinariesHook xattr; 133 buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; 134 llvmPackages = pkgs.llvmPackages_12; ··· 140 packages.ghc8107BinaryMinimal 141 else 142 packages.ghc8107Binary; 143 - inherit sphinx; 144 # Need to use apple's patched xattr until 145 # https://github.com/xattr/xattr/issues/44 and 146 # https://github.com/xattr/xattr/issues/55 are solved. ··· 150 }; 151 ghcHEAD = callPackage ../development/compilers/ghc/head.nix { 152 bootPkgs = packages.ghc8107Binary; 153 - inherit sphinx; 154 # Need to use apple's patched xattr until 155 # https://github.com/xattr/xattr/issues/44 and 156 # https://github.com/xattr/xattr/issues/55 are solved.
··· 49 # Use this rather than `rec { ... }` below for sake of overlays. 50 inherit (pkgs.haskell) compiler packages; 51 52 in { 53 lib = haskellLibUncomposable; 54 ··· 97 packages.ghc8102Binary 98 else 99 packages.ghc865Binary; 100 + inherit (buildPackages.python3Packages) sphinx; 101 buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_7; 102 llvmPackages = pkgs.llvmPackages_7; 103 }; ··· 110 packages.ghc8107BinaryMinimal 111 else 112 packages.ghc8107Binary; 113 + inherit (buildPackages.python3Packages) sphinx; 114 # Need to use apple's patched xattr until 115 # https://github.com/xattr/xattr/issues/44 and 116 # https://github.com/xattr/xattr/issues/55 are solved. ··· 126 packages.ghc8107BinaryMinimal 127 else 128 packages.ghc8107Binary; 129 + inherit (buildPackages.python3Packages) sphinx; 130 inherit (buildPackages.darwin) autoSignDarwinBinariesHook xattr; 131 buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; 132 llvmPackages = pkgs.llvmPackages_12; ··· 138 packages.ghc8107BinaryMinimal 139 else 140 packages.ghc8107Binary; 141 + inherit (buildPackages.python3Packages) sphinx; 142 # Need to use apple's patched xattr until 143 # https://github.com/xattr/xattr/issues/44 and 144 # https://github.com/xattr/xattr/issues/55 are solved. ··· 148 }; 149 ghcHEAD = callPackage ../development/compilers/ghc/head.nix { 150 bootPkgs = packages.ghc8107Binary; 151 + inherit (buildPackages.python3Packages) sphinx; 152 # Need to use apple's patched xattr until 153 # https://github.com/xattr/xattr/issues/44 and 154 # https://github.com/xattr/xattr/issues/55 are solved.