BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

callCabal2nix: Take advantage of new hpack support.

Browse source
This commit is contained in:
Shea Levy 2017-12-07 15:26:51 -05:00
parent bed3695848
commit 42519a0f87
No known key found for this signature in database
GPG key ID: 5C0BD6957D86FE27
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/haskell-modules/make-package-set.nix
View file

@ -151,7 +151,9 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
# `fetchFromGitHub`. # `fetchFromGitHub`.
overrideCabal (self.callPackage (haskellSrc2nix { overrideCabal (self.callPackage (haskellSrc2nix {
inherit name; inherit name;
src = builtins.filterSource (path: type: pkgs.lib.hasSuffix ".cabal" path) src; src = builtins.filterSource (path: type:
pkgs.lib.hasSuffix "${name}.cabal" path || pkgs.lib.hasSuffix "package.yaml" path
) src;
}) args) (_: { inherit src; }); }) args) (_: { inherit src; });
# : Map Name (Either Path VersionNumber) -> HaskellPackageOverrideSet # : Map Name (Either Path VersionNumber) -> HaskellPackageOverrideSet