Allow overriding weeder package

This commit is contained in:
Zhenya Vinogradov 2020-06-23 07:44:53 +03:00
parent 7f11f514b5
commit a959fce749
No known key found for this signature in database
GPG Key ID: 72DE8A2757FBA938
2 changed files with 5 additions and 3 deletions

View File

@ -11,5 +11,6 @@
''; '';
# generates a script for running weeder # generates a script for running weeder
weeder-script = { local-packages, hs-pkgs }: import ./weeder-script.nix { inherit pkgs local-packages hs-pkgs; }; weeder-script = { local-packages, hs-pkgs, weeder ? pkgs.haskellPackages.weeder }:
import ./weeder-script.nix { inherit pkgs weeder local-packages hs-pkgs; };
} }

View File

@ -1,6 +1,7 @@
{ pkgs, # nixpkgs package set { pkgs, # nixpkgs package set
local-packages, # list of local haskell packages in the project and their subdirectories local-packages, # list of local haskell packages in the project and their subdirectories
hs-pkgs # package set returned by `haskell-nix.stackProject` hs-pkgs, # package set returned by `haskell-nix.stackProject`
weeder # weeder package
}: }:
with rec { with rec {
@ -56,7 +57,7 @@ with rec {
export PATH="${fake-stack}/bin:$PATH" export PATH="${fake-stack}/bin:$PATH"
# run weeder # run weeder
${pkgs.haskellPackages.weeder}/bin/weeder stack.yaml --dist dist-hi ${weeder}/bin/weeder stack.yaml --dist dist-hi
''; '';
}; };