diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 968773ded98..6d11048cb6d 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -102,7 +102,6 @@ let withPackages = packages: buildPackages.callPackage ./with-packages-wrapper.nix { inherit (self) llvmPackages; - haskellPackages = self; inherit packages; }; diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 6b3d6dfd2b0..3e8fad712bf 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -1,7 +1,6 @@ { lib, targetPlatform, ghc, llvmPackages, packages, symlinkJoin, makeWrapper -, ignoreCollisions ? false, withLLVM ? false +, withLLVM ? false , postBuild ? "" -, haskellPackages , ghcLibdir ? null # only used by ghcjs, when resolving plugins }: @@ -45,7 +44,7 @@ let paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages); hasLibraries = lib.any (x: x.isHaskellLibrary) paths; # CLang is needed on Darwin for -fllvm to work: - # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/code-generators.html + # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm llvm = lib.makeBinPath ([ llvmPackages.llvm ] ++ lib.optional targetPlatform.isDarwin llvmPackages.clang); @@ -58,7 +57,6 @@ symlinkJoin { name = ghc.name + "-with-packages"; paths = paths ++ [ghc]; extraOutputsToInstall = [ "out" "doc" ]; - inherit ignoreCollisions; postBuild = '' . ${makeWrapper}/nix-support/setup-hook @@ -132,6 +130,5 @@ symlinkJoin { passthru = { preferLocalBuild = true; inherit (ghc) version meta; - inherit haskellPackages; }; }