callCabal2nix: Take advantage of new hpack support.

NixOS · Dec 7, 2017 · 42519a0 · 42519a0
1 parent bed3695
commit 42519a0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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