about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/make-package-set.nix
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2021-10-27 18:17:10 +0200
committersternenseemann <sternenseemann@systemli.org>2021-10-27 18:17:10 +0200
commit5d53087f9b96919eb2175bf44d5669575e24e2f6 (patch)
treefdb90c83a1155b8efcdb808bcd3b7180f9487d49 /pkgs/development/haskell-modules/make-package-set.nix
parenta561e73b9e64752f87c328a561f3ba08540494ac (diff)
downloadnixlib-5d53087f9b96919eb2175bf44d5669575e24e2f6.tar
nixlib-5d53087f9b96919eb2175bf44d5669575e24e2f6.tar.gz
nixlib-5d53087f9b96919eb2175bf44d5669575e24e2f6.tar.bz2
nixlib-5d53087f9b96919eb2175bf44d5669575e24e2f6.tar.lz
nixlib-5d53087f9b96919eb2175bf44d5669575e24e2f6.tar.xz
nixlib-5d53087f9b96919eb2175bf44d5669575e24e2f6.tar.zst
nixlib-5d53087f9b96919eb2175bf44d5669575e24e2f6.zip
haskellPackages.callCabal2nixWithOptions: don't guess cabal filename
cabal only allows one cabal file per directory and cabal2nix will find
the correct file easily. Thus we don't need to know ahead of time which
cabal file to select. One downside of this is of course that we may
include unnecessary files in subdirectories, which could possibly be
fixed by enforcing depth.
Diffstat (limited to 'pkgs/development/haskell-modules/make-package-set.nix')
-rw-r--r--pkgs/development/haskell-modules/make-package-set.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index b79aace9e3b7..d272f7375a82 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -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;