diff options
author | Peter Simons <simons@cryp.to> | 2017-04-03 14:23:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-03 14:23:34 +0200 |
commit | 04e3cf80057eeed4a16f73aed2e9f3d570b04936 (patch) | |
tree | 55961f1a1fd67cbde66f41a06a610bc30fb8d147 | |
parent | e9a636648c94cf22b869414604d913ca06fef766 (diff) | |
parent | 1feca4cae3bf243c1efe11918067cec269a8bfb2 (diff) | |
download | nixpkgs-04e3cf80057eeed4a16f73aed2e9f3d570b04936.tar nixpkgs-04e3cf80057eeed4a16f73aed2e9f3d570b04936.tar.gz nixpkgs-04e3cf80057eeed4a16f73aed2e9f3d570b04936.tar.bz2 nixpkgs-04e3cf80057eeed4a16f73aed2e9f3d570b04936.tar.lz nixpkgs-04e3cf80057eeed4a16f73aed2e9f3d570b04936.tar.xz nixpkgs-04e3cf80057eeed4a16f73aed2e9f3d570b04936.tar.zst nixpkgs-04e3cf80057eeed4a16f73aed2e9f3d570b04936.zip |
Merge pull request #24591 from shlevy/haskell-export-2nix
haskellPackages: Export haskellSrc2nix and hackage2nix
-rw-r--r-- | pkgs/development/haskell-modules/default.nix | 6 |
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); |