Skip to content

Commit

Permalink
Remove source filtering
Browse files Browse the repository at this point in the history
This reverts #57, and resolves #88.
  • Loading branch information
srid committed Feb 22, 2023
1 parent 08e98de commit e0c8f32
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions haskell-project.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,11 @@ in
localPackagesOverlay = self: _:
let
fromSdist = self.buildFromCabalSdist or (builtins.trace "Your version of Nixpkgs does not support hs.buildFromCabalSdist yet." (pkg: pkg));
filterSrc = name: src: lib.cleanSourceWith { inherit src name; filter = path: type: true; };
in
lib.mapAttrs
(name: value:
let
# callCabal2nix does not need a filtered source. It will
# only pick out the cabal and/or hpack file.
pkgProto = self.callCabal2nix name value.root { };
pkgFiltered = pkgs.haskell.lib.overrideSrc pkgProto {
src = filterSrc name value.root;
};
in
fromSdist pkgFiltered)
fromSdist (self.callCabal2nix name value.root { })
)
config.packages;

defaultBuildTools = hp: with hp; {
Expand Down

0 comments on commit e0c8f32

Please sign in to comment.