diff options
| author | Shea Levy <shea@shealevy.com> | 2017-12-07 15:26:51 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2017-12-07 15:26:51 -0500 |
| commit | 42519a0f8797e98f576a5e31e5de9de521ff8950 (patch) | |
| tree | 6e07850e8e95017f977d4070d3d1f2f1b7459bba /pkgs/development/haskell-modules/make-package-set.nix | |
| parent | bed3695848c23a2ea98a48c42754e8b5d769e821 (diff) | |
| download | nixlib-42519a0f8797e98f576a5e31e5de9de521ff8950.tar nixlib-42519a0f8797e98f576a5e31e5de9de521ff8950.tar.gz nixlib-42519a0f8797e98f576a5e31e5de9de521ff8950.tar.bz2 nixlib-42519a0f8797e98f576a5e31e5de9de521ff8950.tar.lz nixlib-42519a0f8797e98f576a5e31e5de9de521ff8950.tar.xz nixlib-42519a0f8797e98f576a5e31e5de9de521ff8950.tar.zst nixlib-42519a0f8797e98f576a5e31e5de9de521ff8950.zip | |
callCabal2nix: Take advantage of new hpack support.
Diffstat (limited to 'pkgs/development/haskell-modules/make-package-set.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 61043252155e..7ac0ef509f41 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -151,7 +151,9 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # `fetchFromGitHub`. overrideCabal (self.callPackage (haskellSrc2nix { 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; }); # : Map Name (Either Path VersionNumber) -> HaskellPackageOverrideSet |