Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

git: fix attribute paths

Browse source 
This fixes some attribute paths to match recent changes in Nixpkgs.
This commit is contained in:
Robert Helgesson 2021-01-20 18:58:17 +01:00
parent 3fe2a57b95
commit 8f24ed4c7f
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/programs/git.nix
View file

@ -348,13 +348,12 @@ in {
}) })
(mkIf cfg.delta.enable { (mkIf cfg.delta.enable {
programs.git.iniContent = programs.git.iniContent = let deltaCommand = "${pkgs.delta}/bin/delta";
let deltaCommand = "${pkgs.gitAndTools.delta}/bin/delta"; in {
in { core.pager = deltaCommand;
core.pager = deltaCommand; interactive.diffFilter = "${deltaCommand} --color-only";
interactive.diffFilter = "${deltaCommand} --color-only"; delta = cfg.delta.options;
delta = cfg.delta.options; };
};
}) })
]); ]);
} }

6
tests/modules/programs/git/git.nix
View file

@ -82,10 +82,8 @@ in {
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (self: super: {
git-lfs = pkgs.writeScriptBin "dummy-git-lfs" ""; git-lfs = pkgs.writeScriptBin "dummy-git-lfs" "";
gitAndTools = super.gitAndTools // { delta = pkgs.writeScriptBin "dummy-delta" "" // {
delta = pkgs.writeScriptBin "dummy-delta" "" // { outPath = "@delta@";
outPath = "@delta@";
};
}; };
}) })
]; ];