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

This fixes some attribute paths to match recent changes in Nixpkgs.
---
 modules/programs/gh.nix                   | 2 +-
 tests/modules/programs/gh/config-file.nix | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/modules/programs/gh.nix b/modules/programs/gh.nix
index 41d6aa1de..a4f4e17c9 100644
--- a/modules/programs/gh.nix
+++ b/modules/programs/gh.nix
@@ -45,7 +45,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ pkgs.gitAndTools.gh ];
+    home.packages = [ pkgs.gh ];
 
     xdg.configFile."gh/config.yml".text =
       builtins.toJSON { inherit (cfg) aliases editor gitProtocol; };
diff --git a/tests/modules/programs/gh/config-file.nix b/tests/modules/programs/gh/config-file.nix
index 0c0186942..8d8f95fdd 100644
--- a/tests/modules/programs/gh/config-file.nix
+++ b/tests/modules/programs/gh/config-file.nix
@@ -8,13 +8,8 @@
       editor = "vim";
     };
 
-    nixpkgs.overlays = [
-      (self: super: {
-        gitAndTools = super.gitAndTools // {
-          gh = pkgs.writeScriptBin "dummy-gh" "";
-        };
-      })
-    ];
+    nixpkgs.overlays =
+      [ (self: super: { gh = pkgs.writeScriptBin "dummy-gh" ""; }) ];
 
     nmt.script = ''
       assertFileExists home-files/.config/gh/config.yml