3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #143186 from sternenseemann/callcabal2nix-no-name-cabal-detection

haskellPackages.callCabal2nixWithOptions: don't guess cabal filename
This commit is contained in:
maralorn 2021-10-27 18:37:30 +02:00 committed by GitHub
commit 23deb3c864
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -205,7 +205,7 @@ in package-set { inherit pkgs lib callPackage; } self // {
callCabal2nixWithOptions = name: src: extraCabal2nixOptions: args:
let
filter = path: type:
pkgs.lib.hasSuffix "${name}.cabal" path ||
pkgs.lib.hasSuffix ".cabal" path ||
baseNameOf path == "package.yaml";
expr = self.haskellSrc2nix {
inherit name extraCabal2nixOptions;