From 5ba8458ebde700ea37c9371fb73a6537b438ac7e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 27 Sep 2018 18:43:59 -0400 Subject: [PATCH] ghcjs-{7.10, 8.0}: Expose the good `.override` The per-version `default.nix`es just fill in default arguments. It is much more useful to have the `.override` from the inner `callPackage`, for finer control. Converting the outer `callPackage` to a plain import makes the inner one the only one, revealing its `.override`. --- pkgs/top-level/haskell-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 69fcc283326..6bdcaf49af9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -80,13 +80,17 @@ in { llvmPackages = pkgs.llvmPackages_5; }; ghcjs = compiler.ghcjs84; - ghcjs710 = packages.ghc7103.callPackage ../development/compilers/ghcjs/7.10 { + # Use `import` because `callPackage inside`. + ghcjs710 = import ../development/compilers/ghcjs/7.10 { bootPkgs = packages.ghc7103; inherit (pkgs) cabal-install; + inherit (buildPackages) fetchgit fetchFromGitHub; }; - ghcjs80 = packages.ghc802.callPackage ../development/compilers/ghcjs/8.0 { + # `import` on purpose; see above. + ghcjs80 = import ../development/compilers/ghcjs/8.0 { bootPkgs = packages.ghc802; inherit (pkgs) cabal-install; + inherit (buildPackages) fetchgit fetchFromGitHub; }; ghcjs82 = callPackage ../development/compilers/ghcjs-ng { bootPkgs = packages.ghc822;