JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #41330 from obsidiansystems/haskellSrc2nix-overriding

Browse Source 
haskell infra: Allow overriding `haskellSrc2nix`
This commit is contained in:
John Ericson 2018-05-31 16:42:16 -04:00 committed by GitHub
commit ecabdfd12f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/make-package-set.nix
View File

@ -162,7 +162,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
filter = path: type: filter = path: type:
pkgs.lib.hasSuffix "${name}.cabal" path || pkgs.lib.hasSuffix "${name}.cabal" path ||
baseNameOf path == "package.yaml"; baseNameOf path == "package.yaml";
expr = haskellSrc2nix { expr = self.haskellSrc2nix {
inherit name; inherit name;
src = if pkgs.lib.canCleanSource src src = if pkgs.lib.canCleanSource src
then pkgs.lib.cleanSourceWith { inherit src filter; } then pkgs.lib.cleanSourceWith { inherit src filter; }