From f9e45390deced72bc7cc0b75d3a922aa10a33e08 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 18 May 2021 00:47:40 +0200
Subject: [PATCH] scmpuff: use pkgs.scmpuff

---
 modules/programs/scmpuff.nix                | 4 ++--
 tests/modules/programs/scmpuff/bash.nix     | 2 +-
 tests/modules/programs/scmpuff/no-bash.nix  | 2 +-
 tests/modules/programs/scmpuff/no-shell.nix | 4 ++--
 tests/modules/programs/scmpuff/no-zsh.nix   | 2 +-
 tests/modules/programs/scmpuff/zsh.nix      | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/programs/scmpuff.nix b/modules/programs/scmpuff.nix
index 22731e857..d2e6651e1 100644
--- a/modules/programs/scmpuff.nix
+++ b/modules/programs/scmpuff.nix
@@ -11,8 +11,8 @@ in {
 
     package = mkOption {
       type = types.package;
-      default = pkgs.gitAndTools.scmpuff;
-      defaultText = literalExample "pkgs.gitAndTools.scmpuff";
+      default = pkgs.scmpuff;
+      defaultText = literalExample "pkgs.scmpuff";
       description = "Package providing the <command>scmpuff</command> tool.";
     };
 
diff --git a/tests/modules/programs/scmpuff/bash.nix b/tests/modules/programs/scmpuff/bash.nix
index 8011e2d54..ea34373b9 100644
--- a/tests/modules/programs/scmpuff/bash.nix
+++ b/tests/modules/programs/scmpuff/bash.nix
@@ -9,7 +9,7 @@
       assertFileExists home-files/.bashrc
       assertFileContains \
         home-files/.bashrc \
-        'eval "$(${pkgs.gitAndTools.scmpuff}/bin/scmpuff init -s)"'
+        'eval "$(${pkgs.scmpuff}/bin/scmpuff init -s)"'
     '';
   };
 }
diff --git a/tests/modules/programs/scmpuff/no-bash.nix b/tests/modules/programs/scmpuff/no-bash.nix
index 0b67e1f64..e3852b84a 100644
--- a/tests/modules/programs/scmpuff/no-bash.nix
+++ b/tests/modules/programs/scmpuff/no-bash.nix
@@ -9,7 +9,7 @@
     };
 
     nmt.script = ''
-      assertFileNotRegex home-files/.bashrc '${pkgs.gitAndTools.scmpuff}/bin/scmpuff'
+      assertFileNotRegex home-files/.bashrc '${pkgs.scmpuff}/bin/scmpuff'
     '';
   };
 }
diff --git a/tests/modules/programs/scmpuff/no-shell.nix b/tests/modules/programs/scmpuff/no-shell.nix
index 02657e023..df8517671 100644
--- a/tests/modules/programs/scmpuff/no-shell.nix
+++ b/tests/modules/programs/scmpuff/no-shell.nix
@@ -11,8 +11,8 @@
     };
 
     nmt.script = ''
-      assertFileNotRegex home-files/.zshrc '${pkgs.gitAndTools.scmpuff} init -s'
-      assertFileNotRegex home-files/.bashrc '${pkgs.gitAndTools.scmpuff} init -s'
+      assertFileNotRegex home-files/.zshrc '${pkgs.scmpuff} init -s'
+      assertFileNotRegex home-files/.bashrc '${pkgs.scmpuff} init -s'
     '';
   };
 }
diff --git a/tests/modules/programs/scmpuff/no-zsh.nix b/tests/modules/programs/scmpuff/no-zsh.nix
index b2d3eec2b..18480add1 100644
--- a/tests/modules/programs/scmpuff/no-zsh.nix
+++ b/tests/modules/programs/scmpuff/no-zsh.nix
@@ -9,7 +9,7 @@
     };
 
     nmt.script = ''
-      assertFileNotRegex home-files/.zshrc '${pkgs.gitAndTools.scmpuff} init -s'
+      assertFileNotRegex home-files/.zshrc '${pkgs.scmpuff} init -s'
     '';
   };
 }
diff --git a/tests/modules/programs/scmpuff/zsh.nix b/tests/modules/programs/scmpuff/zsh.nix
index 183b0544e..d6f7cc5ed 100644
--- a/tests/modules/programs/scmpuff/zsh.nix
+++ b/tests/modules/programs/scmpuff/zsh.nix
@@ -9,7 +9,7 @@
       assertFileExists home-files/.zshrc
       assertFileContains \
         home-files/.zshrc \
-        'eval "$(${pkgs.gitAndTools.scmpuff}/bin/scmpuff init -s)"'
+        'eval "$(${pkgs.scmpuff}/bin/scmpuff init -s)"'
     '';
   };
 }