diff options
Diffstat (limited to 'nixpkgs/pkgs/development/haskell-modules/configuration-ghc-head.nix')
-rw-r--r-- | nixpkgs/pkgs/development/haskell-modules/configuration-ghc-head.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-head.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-head.nix index ca455a7c8929..e1e3f2c99884 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -11,7 +11,7 @@ with haskellLib; self: super: { - llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_10; + llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; # Disable GHC 8.7.x core libraries. array = null; @@ -74,7 +74,4 @@ self: super: { # Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485 stack = doJailbreak super.stack; - # Fix build with ghc 8.6.x. - git-annex = appendPatch super.git-annex ./patches/git-annex-fix-ghc-8.6.x-build.patch; - } |