summary refs log tree commit diff
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2017-04-03 07:55:49 -0400
committerShea Levy <shea@shealevy.com>2017-04-03 08:13:07 -0400
commit1feca4cae3bf243c1efe11918067cec269a8bfb2 (patch)
tree55961f1a1fd67cbde66f41a06a610bc30fb8d147
parente9a636648c94cf22b869414604d913ca06fef766 (diff)
downloadnixpkgs-1feca4cae3bf243c1efe11918067cec269a8bfb2.tar
nixpkgs-1feca4cae3bf243c1efe11918067cec269a8bfb2.tar.gz
nixpkgs-1feca4cae3bf243c1efe11918067cec269a8bfb2.tar.bz2
nixpkgs-1feca4cae3bf243c1efe11918067cec269a8bfb2.tar.lz
nixpkgs-1feca4cae3bf243c1efe11918067cec269a8bfb2.tar.xz
nixpkgs-1feca4cae3bf243c1efe11918067cec269a8bfb2.tar.zst
nixpkgs-1feca4cae3bf243c1efe11918067cec269a8bfb2.zip
haskellPackages: Export haskellSrc2nix and hackage2nix
Allows using a different haskell package set to generate the nix
expressions (during eval time) than the one used to actually build the
package (at build time).
-rw-r--r--pkgs/development/haskell-modules/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 8242990fe74..694556123ab 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -80,12 +80,12 @@ let
     in
       import ./hackage-packages.nix { inherit pkgs stdenv callPackage; } self // {
 
-        inherit mkDerivation callPackage;
+        inherit mkDerivation callPackage haskellSrc2nix hackage2nix;
 
-        callHackage = name: version: self.callPackage (hackage2nix name version);
+        callHackage = name: version: self.callPackage (self.hackage2nix name version);
 
         # Creates a Haskell package from a source package by calling cabal2nix on the source.
-        callCabal2nix = name: src: self.callPackage (haskellSrc2nix { inherit src name; });
+        callCabal2nix = name: src: self.callPackage (self.haskellSrc2nix { inherit src name; });
 
         ghcWithPackages = selectFrom: withPackages (selectFrom self);