From 8f24ed4c7f8b14660093d9b472fdea0a2c9bf7f3 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 20 Jan 2021 18:58:17 +0100
Subject: [PATCH] git: fix attribute paths

This fixes some attribute paths to match recent changes in Nixpkgs.
---
 modules/programs/git.nix           | 13 ++++++-------
 tests/modules/programs/git/git.nix |  6 ++----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index 78346c6a..4b2912e6 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -348,13 +348,12 @@ in {
     })
 
     (mkIf cfg.delta.enable {
-      programs.git.iniContent =
-        let deltaCommand = "${pkgs.gitAndTools.delta}/bin/delta";
-        in {
-          core.pager = deltaCommand;
-          interactive.diffFilter = "${deltaCommand} --color-only";
-          delta = cfg.delta.options;
-        };
+      programs.git.iniContent = let deltaCommand = "${pkgs.delta}/bin/delta";
+      in {
+        core.pager = deltaCommand;
+        interactive.diffFilter = "${deltaCommand} --color-only";
+        delta = cfg.delta.options;
+      };
     })
   ]);
 }
diff --git a/tests/modules/programs/git/git.nix b/tests/modules/programs/git/git.nix
index 981d1934..5417f7ea 100644
--- a/tests/modules/programs/git/git.nix
+++ b/tests/modules/programs/git/git.nix
@@ -82,10 +82,8 @@ in {
     nixpkgs.overlays = [
       (self: super: {
         git-lfs = pkgs.writeScriptBin "dummy-git-lfs" "";
-        gitAndTools = super.gitAndTools // {
-          delta = pkgs.writeScriptBin "dummy-delta" "" // {
-            outPath = "@delta@";
-          };
+        delta = pkgs.writeScriptBin "dummy-delta" "" // {
+          outPath = "@delta@";
         };
       })
     ];