Skip to content

Commit

Permalink
Don't run gitignore-nix in pure-eval mode. (#738)
Browse files Browse the repository at this point in the history
It doesn't work on new Nixes due to trying to hit ~/.gitconfig.

Fixes flake evaluation.
  • Loading branch information
shlevy committed Nov 25, 2022
1 parent 0951b87 commit b7ac5b2
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions nix/pkgs/default.nix
Expand Up @@ -7,8 +7,13 @@
let
inherit (pkgs) stdenv;

gitignore-nix = pkgs.callPackage sources.gitignore-nix { };

gitignore-nix =
if builtins ? currentSystem
then pkgs.callPackage sources.gitignore-nix { }
else {
gitignoreFilter = _: builtins.trace "not running gitignoreFilter in pure-eval mode" (_: _: true);
gitignoreSource = x: builtins.trace "not running gitignoreFilter in pure-eval mode" x;
};
# { index-state, compiler-nix-name, project, projectPackages, packages, extraPackages }
haskell = pkgs.callPackage ./haskell {
inherit gitignore-nix sources;
Expand Down

0 comments on commit b7ac5b2

Please sign in to comment.